1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

670 Commits

Author SHA1 Message Date
Dirk-Willem van Gulik
3ffd24a1f1 Removed email address on request - as obviscation was slammed down on the list - and Google is your friend in any case
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94315 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 19:20:40 +00:00
Jim Jagielski
70bb2575ea The old, legacy (and unused) code in which the scoreboard was totally
and completely contained in a file (SCOREBOARD_FILE) has been
removed. This does not affect scoreboards which are *mapped* to
files using named-shared-memory at all. This implies that scoreboards
must be based, at some level, on native shared memory (mmap, shm_open,
shmget, whatever), but the code has assumed that for quite awhile
now. Having the scoreboard be *based* on a file makes no sense today.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94306 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 14:33:50 +00:00
Cliff Woolley
3e2ce19baf BUCKET FREELISTS
Add an allocator-passing mechanism throughout the bucket brigades API.

From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given
connection is stored in the conn_rec by the create_connection hook.  That
means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's --
the MPM must ensure that no two threads can ever use the same one at the
same time, for instance.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94304 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 08:17:26 +00:00
Brian Pane
769f2f65d3 Document the variable expansion enhancements for mod_include
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94295 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 06:26:03 +00:00
Brian Pane
440d5f0751 Fixes for three problems in mod_include:
* The ctx->tag_length computation in find_end_sequence() was a bit
    broken in cases where there was a "false alarm" match on a partial
    "-->"
  * The ap_ssi_get_tag_and_value() function needs to avoid walking off
    the end of the string.  After debugging this some more, I ended up
    using Cliff's original patch.
  * Infinite loop in is_only_below()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94284 13f79535-47bb-0310-9956-ffa450edef68
2002-03-29 02:14:45 +00:00
Joshua Slive
cb8d76267b Update Redhat layout to v7.
PR: BZ-7422
Submitted by: Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94272 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 19:04:48 +00:00
Doug MacEachern
2abc4bae9b add entry for sslc compat layer changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94241 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 22:57:47 +00:00
Bill Stoddard
7da34b011d Add a new parameter to the quick_handler hook to instruct
quick handlers to optionally do a lookup rather than actually
serve content. This is the first of several changes required fix
several problems with how quick handlers work with subrequests.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94240 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 22:42:16 +00:00
Jeff Trawick
97659630cc worker MPM:
get MaxRequestsPerChild to work again by allowing the main thread of
a child to be interrupted by one of the other threads in the process

this should get graceful termination to work after encountering one of
the various possible error conditions in the listener and worker threads


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94232 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 20:37:32 +00:00
Jim Jagielski
66d315ddc2 Document the APR change that bubbles up
to affect Apache. The default ordering of the accept metux method
has been changed to match 1.3


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94221 13f79535-47bb-0310-9956-ffa450edef68
2002-03-27 14:24:32 +00:00
William A. Rowe Jr
74c77cc134 Up to .35 [no need to call out .35-dev in changes, that's just silly.]
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94191 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 20:41:11 +00:00
William A. Rowe Jr
965709d8f7 Ready for .34 evaluation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94190 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 20:35:51 +00:00
Justin Erenkrantz
345bfe7ad1 Ensure that the build directory is created when using VPATH.
Previously, configure would try to write config_vars.mk into build
without ensuring that that directory existed first.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94188 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 19:43:46 +00:00
Justin Erenkrantz
a83350dc02 Add text/xml, audio/mpeg, video/quicktime support to mime magic file.
(Justin changed the audio/mpeg sequence to match file(1)'s listing.)

Minor style changes in nearby areas.

PR: 7730
Submitted by: Linus Walleij <triad@df.lth.se>
Reviewed by:  Justin Erenkrantz
(forward ported from revision 1.5 of apache-1.3/conf/magic)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94187 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 18:41:14 +00:00
Greg Ames
53298f2bdb make it harder for spammers to harvest this email address in the future.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94184 13f79535-47bb-0310-9956-ffa450edef68
2002-03-26 18:17:57 +00:00
Brian Pane
804f94d21f Changed mod_cgi to not do single-byte reads to consume the
script headers


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94151 13f79535-47bb-0310-9956-ffa450edef68
2002-03-23 23:19:41 +00:00
Graham Leggett
9cb9ca8e3a When a proxied site was being served, Apache was replacing
the original site Server header with it's own, which is not
allowed by RFC2616. Fixed.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94133 13f79535-47bb-0310-9956-ffa450edef68
2002-03-22 18:34:46 +00:00
Jeff Trawick
e410111205 Fix a mod_cgid problem that left daemon processes stranded
in some server restart scenarios.

It relied on getting SIGHUP to die, but it wasn't careful
about establishing the SIGHUP handling it needed so after
apachectl restart, SIGHUP was ignored since the new cgid
daemon process inherited a signal(SIGHUP,SIG_IGN) done by
the MPM during its restart logic.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94116 13f79535-47bb-0310-9956-ffa450edef68
2002-03-22 02:56:56 +00:00
Aaron Bannert
f2ca17ee9a Added exp_foo and rel_foo variables to config_vars.mk for all Apache and
Autoconf path variables (like --sysconfdir, --sbindir, etc). exp_foo is
the "expanded" version, which means that all internal variable references
have been interpolated.  rel_foo is the same as $exp_foo, only relative
to $prefix if they share a common path.

This will be used in apxs.in and apachectl.in to allow Apache installs
to be relocated as long as the same relative directory structure remains.
Currently this is only possible if you use the Apache layout, but not
with other layouts or any overridden --foodir paths.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94108 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 19:40:06 +00:00
Jeff Trawick
4867fb1974 Don't drop connections during graceful restart. Previously, worker
threads could exit even though there were connections waiting in the
queue.

Now, for a graceful restart the worker threads won't exit until they
are told that the queue has been drained and no more connections will
ever be added.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94106 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 19:12:54 +00:00
Graham Leggett
19c0213612 Change the header merging behaviour in proxy, as some headers
(like Set-Cookie) cannot be unmerged due to stray commas in
dates.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94083 13f79535-47bb-0310-9956-ffa450edef68
2002-03-21 12:05:45 +00:00
Jim Jagielski
a65170a84c Bring 2.0 up to parity, a bit, with how much info we provide to
the admin regarding valid values for AcceptMutex. Should also
tell 'em what "default" actually maps to, but that can wait.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94055 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 16:44:13 +00:00
Jeff Trawick
5f8b426d1d Get nph- CGI scripts working again by avoiding filters that can't
possibly deal with a script that generates the protocol header.

PR:       8902, 8907, 9983


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94052 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 13:57:08 +00:00
Brian Pane
1105d412cc Updated version of the PCRE lib under httpd-2.0/srclib
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94049 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 07:10:21 +00:00
Bill Stoddard
e9ec908a01 Final commit to add ap_rset_content_type accessor. Add AddOutputFiltersbyType
filters during call to ap_rset_content_type()


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94028 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 02:05:43 +00:00
Greg Stein
0c4aa3ba41 Bump ap_mmn for the M_INVALID change. Add a note to CHANGES.
Submitted by: Dale Ghent <daleg@elemental.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94023 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 20:40:04 +00:00
Ian Holsman
c71d703e8c my i key is broken
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94019 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 19:01:11 +00:00
Ian Holsman
ad3eabe4f3 remove sock_enable_linger (unused function)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94018 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 18:59:46 +00:00
Brian Pane
f887ea2de3 Forgot to document this when I committed the patch yesterday...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94014 13f79535-47bb-0310-9956-ffa450edef68
2002-03-19 05:30:14 +00:00
Greg Stein
1616923b6e A little mgmt overhead for the mod_dav API change.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94004 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 22:29:49 +00:00
Jeff Trawick
928aff8a02 Fix a hang condition with graceful restart and prefork MPM
in the situation where MaxClients is very high but
much fewer servers are actually started at the time of the
restart.

The way we notify an entire generation to die at once is
changed so that we don't have to use the pod (and deal with
the ease of filling the kernel pipe buffer).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93999 13f79535-47bb-0310-9956-ffa450edef68
2002-03-18 18:24:55 +00:00
Brian Pane
485161a9b5 Added a note about mod_include optimizations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93984 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 17:47:24 +00:00
Brian Pane
e3bfcb1430 Use the "recent time" cache to optimize timestamp generation for
the httpd error log

Background: According to some profile data that we collected on Solaris,
half the run time of ap_log_rerror() was spent in localtime(3).   With
this change, the recent-time cache ensures that the error logger won't
cause more than one localtime() call per second, no matter how high the
error rate is.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93977 13f79535-47bb-0310-9956-ffa450edef68
2002-03-17 05:13:12 +00:00
Ian Holsman
ba2d76faa1 Solaris 8 doesn't have a thundering herd problem
according to the sun experts


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93963 13f79535-47bb-0310-9956-ffa450edef68
2002-03-16 06:35:11 +00:00
Jeff Trawick
0f0bc6e3d7 Allow URIs specifying CGI scripts to include '/' at the end
(e.g., /cgi-bin/printenv/) on AIX and Solaris (and other OSs
which ignore '/' at the end of the names of non-directories).

PR:    10138


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93952 13f79535-47bb-0310-9956-ffa450edef68
2002-03-15 13:35:42 +00:00
Doug MacEachern
97b148c3b5 PR:
Obtained from:
Submitted by:   Madhusudan Mathihalli <madhusudan_mathihalli@hp.com>
Reviewed by:	dougm
implement SSLSessionCache shmht and shmcb based on apr_rmm and apr_shm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93942 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 23:31:23 +00:00
Aaron Bannert
343ec1ebe0 This was fixed last week but I didn't notice the bug report or the STATUS
entry until today. The bug report had to do with recursively removing
all CVS directories from a person's home directory.

PR: 9993


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93937 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 18:54:20 +00:00
Jeff Trawick
3a2b57187a Fix apxs -g handling.
Move config_vars.mk from the top build directory to the build directory.
Get build/rules.mk cleaned up for distclean/extraclean.

PR:     10163
        (This is the 2nd of two commits for that PR.  The first was to
        apxs.in -- rev 1.35.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93923 13f79535-47bb-0310-9956-ffa450edef68
2002-03-14 03:16:50 +00:00
Jeff Trawick
0d850d0b4c Fix some mod_include bugs which broke the evaluation of some expressions.
There are a few instances of the same basic problem which are not yet
fixed and which I have marked with /* XXX.*FUBAR*/.

PR:      10108


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93916 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:32:28 +00:00
Jeff Trawick
5baa83e59f fix the calculation of request time in mod_status
(currently nobody sets the start/stop times so this fix isn't
immediately apparent)

Submitted by:    Stas Bekman
Reviewed by:     Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93901 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 12:40:59 +00:00
Jeff Trawick
d86a35b7e5 Fix the calculation of thread_num in the worker score structure.
Submitted by:   Stas Bekman
Reviewed by:    Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93900 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 12:25:31 +00:00
Bill Stoddard
3b5e58ba6e Enable mod_mem_cache to use apr_atomic operators in managing cache_object
reference counting. Enabled by default via the USE_ATOMICS preproc directive.
This compiles cleanly and serves pages on Windows. Not compiled or tested on
any other OS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93889 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 03:59:21 +00:00
Justin Erenkrantz
19c513285f Add a missing manualdir entry in the Debian layout.
Submitted by:	Thom May <thom@planetarytramp.net>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93818 13f79535-47bb-0310-9956-ffa450edef68
2002-03-09 19:37:09 +00:00
Justin Erenkrantz
0db9f67bf4 Stop copying APR's libtool. And pass enough parameters to apr's subconfig
so that it can figure out where we would like libtool to be installed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93816 13f79535-47bb-0310-9956-ffa450edef68
2002-03-09 19:29:18 +00:00
Graham Leggett
01b5958cf7 New directive ProxyIOBufferSize. Sets the size of the buffer used
when reading from a remote HTTP server in proxy.

Modify receive/send loop in proxy_http and proxy_ftp so that
should it be necessary, the remote server socket is closed before
transmitting the last buffer (set by ProxyIOBufferSize) to the
client. This prevents the backend server from being forced to hang
around while the last few bytes are transmitted to a slow client.
Fix the case where no error checking was performed on the final
brigade in the loop.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93811 13f79535-47bb-0310-9956-ffa450edef68
2002-03-09 07:15:33 +00:00
Graham Leggett
de8942eb9f Scrap CacheMaxExpireMin and CacheDefaultExpireMin. Change
CacheMaxExpire and CacheDefaultExpire to use seconds rather than
hours.
PR:
Obtained from:
Submitted by:
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93810 13f79535-47bb-0310-9956-ffa450edef68
2002-03-09 06:59:28 +00:00
Ian Holsman
0536b99534 new directive SSIUndefinedEcho.
this allows webadmins to change the default '(none)' to something
a bit more presentable (eg <!-- undef -->)
PR:
Obtained from: Rex (the hack he had to fix this was so ugly I was forced to do this)
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93788 13f79535-47bb-0310-9956-ffa450edef68
2002-03-08 04:14:26 +00:00
Jeff Trawick
1151bac94b implement a common function for getting a socket and trying to connect
to the target host; use that common function for proxy HTTP and proxy
CONNECT

In that new function, fix this problem:

     Proxy HTTP and CONNECT: Keep trying other addresses from the DNS
     when we can't get a socket in the specified address family.  We may
     have gotten back an IPv6 address first and yet our system is not
     configured to allow IPv6 sockets.

An example host is www.ipv6.org.  The first address I get back is
an IPv6 address, but my machine may not be configured to allow an
AF_INET6 socket.

Before the fix: The apr_socket() failure was fatal.
After the fix:  When apr_socket() fails, we go to the next address from
                the resolver, successfully create a socket in the
                specified family (AF_INET), and all is well.

(an unrelated fix in this commit was to pass a server_rec in a broken
ap_log_error() call)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93787 13f79535-47bb-0310-9956-ffa450edef68
2002-03-08 02:03:47 +00:00
Aaron Bannert
9fcf393360 It is bad to recursively remove every CVS directory in a person's
home directory. Bad bad bad. Make sure the variable was set to
something before cd-ing to blank and ending up in their $HOME.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93767 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 15:09:36 +00:00
Aaron Bannert
65a8207820 Mention adding a missing errordir entry in the Debian config.layout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93765 13f79535-47bb-0310-9956-ffa450edef68
2002-03-07 14:59:32 +00:00