1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00

4589 Commits

Author SHA1 Message Date
(no author)
ad2dd84025 This commit was manufactured by cvs2svn to create branch 'RSE'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/RSE@88989 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 21:54:25 +00:00
Ralf S. Engelschall
f83672781d Initial revision
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88988 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 21:54:25 +00:00
Jeff Trawick
498c91aa40 add some more analysis for a couple of current problems...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88987 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 18:49:28 +00:00
Jeff Trawick
7ed1b10217 Build (and do so cleanly) when !APR_HAS_OTHER_CHILD.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88986 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 18:42:51 +00:00
Joshua Slive
cbbb07650c Remove useless cruft.
Submitted by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88984 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 00:01:18 +00:00
Doug MacEachern
84714e4b1d another nit caught by C::Scan: change request_rec param name from 's' to 'r' in ap_log_rerror()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88983 13f79535-47bb-0310-9956-ffa450edef68
2001-05-03 23:39:43 +00:00
Joshua Slive
7303c9354d Conversion to XHTML.
The plan is to continue converting the rest of the docs to XHTML, so if you
have any objections, please voice them now on apache-docs.

Submitted by:	James Sutherland <jas88@cam.ac.uk>
Reviewed by:	Joshua Slive, William A. Rowe, Jr.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88982 13f79535-47bb-0310-9956-ffa450edef68
2001-05-03 22:33:41 +00:00
William A. Rowe Jr
bab1a0bedc A couple of new options for sysadmins. Still waiting on opinions between
replacing the image on docroot/index.html.* with 2.0, or 2.0 animated.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88981 13f79535-47bb-0310-9956-ffa450edef68
2001-05-03 04:30:36 +00:00
William A. Rowe Jr
afec1645f6 Damnable casts
Submitted by:  Jessie Oberreuter <jessieo@westside.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88980 13f79535-47bb-0310-9956-ffa450edef68
2001-05-03 04:15:21 +00:00
Bill Stoddard
91a89a9056 Set the conn_rec->aborted flag when we detect a whacked connection on the
write path.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88978 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 20:15:56 +00:00
Jeff Trawick
9fba321f34 Add a missing backslash in the install-other code so that the httpd.dll
logic isn't displayed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88977 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 19:09:21 +00:00
Greg Ames
7a38f2b341 simplify the MaxRequestPerChild logic in worker_thread's hot path
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88976 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 17:46:34 +00:00
Jeff Trawick
58e376a83c Prevent a hang when a cgi handled by mod_cgid tries to read a
request body from its stdin but no reqest body is being written to
the cgi.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88975 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 16:58:21 +00:00
Bill Stoddard
cebc827303 mod_log_config: %c connection status incorrectly logged
as "-" (non-keepalive) when MaxKeepAliveRequests is set to 0.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88974 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 13:37:22 +00:00
Jeff Trawick
1cd0a094f0 account for the recent apr_pool_*abort changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88973 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 02:27:29 +00:00
Ryan Bloom
d807de8879 Fix the logic for saving data onto the heap before sending it. Basically,
we have to use nbytes+flen when figuring out how much data we have,
and when looking at the fact that we have a buffer to save aside before
sending it, we also need to look at the length, to ensure that we aren't
saving too much.
Submitted by:	Bill Stoddard and Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88972 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 21:59:26 +00:00
Graham Leggett
410db6c7ce Fixed a problem with directory listing corruption in the
PROXY_DIR filter.
PR:
Obtained from:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88971 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 21:30:07 +00:00
Ryan Bloom
d25aa600d2 AP_MIN_BYTES_TO_WRITE currently equals APR_BUCKET_BUFF_SIZE, so we
have to use <=


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88970 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 19:40:14 +00:00
Greg Stein
10ead4521a Add a comment about an assumption we make in our keepalive buffering.
Delay the check for "too many items in an iovec" until we actually try to
put something in there. This allows that N+1 bucket to be an EOS, FLUSH,
FILE, or zero-length bucket without triggering a split. Only if that next
bucket has iovec data will a split be made.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88969 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 18:43:09 +00:00
Jeff Trawick
21f5255073 Initialize a local variable to prevent a gcc warning about
possible use before set.  The code was fine but it is best
to keep gcc quiet lest we stop paying attention.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88968 13f79535-47bb-0310-9956-ffa450edef68
2001-05-01 11:17:07 +00:00
Greg Ames
6bdbef62ad document my understanding of why the pipe_of_death_mutex is a Good Thing
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88967 13f79535-47bb-0310-9956-ffa450edef68
2001-04-30 19:24:24 +00:00
Jeff Trawick
c27ecd5aee fix my APR_STATUS_IS_EAGAIN() usage
Submitted by:	Bernhard Schrenk <b.schrenk@improx.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88966 13f79535-47bb-0310-9956-ffa450edef68
2001-04-30 11:23:51 +00:00
Doug MacEachern
d2c7c8ef9b C::Scan strikes again; include argument name in ap_invoke_handler prototype
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88965 13f79535-47bb-0310-9956-ffa450edef68
2001-04-30 06:04:33 +00:00
Ryan Bloom
fa2595bb24 Create Files, and thus MMAPs, out of the request pool, not the
connection pool.  This solves a small resource leak that had us
not closing files until a connection was closed.  In order to do
this, at the end of the core_output_filter, we loop through the
brigade and convert any data we have into a single HEAP bucket
that we know will survive clearing the request_rec.

Submitted by:	Ryan Bloom, Justin Erenkrantz <jerenkrantz@ebuilt.com>,
                Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88964 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 17:05:49 +00:00
Brian Havard
baa865bddf OS/2: fix "make install" to install shared core & programs with a .exe
extension.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88963 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 08:25:52 +00:00
Roy T. Fielding
fedbb1b510 Remove some obsolete macros and rename one that wasn't name protected.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88962 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 06:45:35 +00:00
Roy T. Fielding
e1d8823ee3 All of this stuff about apxs is bogus right now -- does anyone feel
inclined to update apxs?


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88961 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:30:21 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
William A. Rowe Jr
6a6e54f29e Pass the perms arg to apr_dbm_open
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88959 13f79535-47bb-0310-9956-ffa450edef68
2001-04-28 00:26:38 +00:00
Doug MacEachern
e53345bacc threaded and prefork mpms are properly handling SIGTERM now; woohoo!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88958 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 21:10:39 +00:00
Doug MacEachern
446ad419be backing out this part of the recent apxs change
otherwise `apxs -q INCLUDEDIR' is broken using the default layout
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88957 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 20:57:38 +00:00
Jeff Trawick
d685f0a8e5 Allow module names to be hyphenated in the --enable-mods-shared
argument.  Previously, we passed through a user-specified hyphen into
the name of the shell variable, yielding an invalid variable name.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88956 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 18:29:11 +00:00
Jeff Trawick
464de0abc1 Get mod_tls to compile/work better on Windows.
PR:           7612
Submitted by: Bernhard Schrenk <b.schrenk@improx.com>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88955 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 18:02:21 +00:00
Bill Stoddard
afefe6fa3a Date the 2.0.17 roll
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88952 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 15:54:22 +00:00
Martin Kraemer
3aa010a8a0 Fix APXS: treat sbindir as expected, fix "link" command.
Submitted by:	GOMEZ Henri <hgomez@slib.fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88951 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 15:30:21 +00:00
Martin Kraemer
7bb4bfdf69 Prevent a core dump (openssl_state_machine.c is completely infected with
assert()s in place of sensible error handling) when a server-root-relative
certificate path is given (which is what most users are going to try first).
  assertion "n > 0" failed: file "openssl_state_machine.c", line 142
That does NOT fix the openssl_state_machine.c though., So, never try to
use invalid certs, missing keys or other fancy "1st time user" stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88950 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 15:16:41 +00:00
Martin Kraemer
7926991129 Not that it matters, but the compiler complains (suggest parentheses around ...)
and we had a coding style once.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88949 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 14:41:54 +00:00
Martin Kraemer
894bc9675a This is C, not C++ (yet ;-).
Submitted by:	Jean-Frederic Clere <JFrederic.Clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88947 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 12:25:42 +00:00
Ken Coar
282c326324 Add the 'last-modified' field and details on the translation status..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88946 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 11:42:11 +00:00
Ken Coar
e66af616cb Move the STATUS file to the top of the tree
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88945 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 10:52:05 +00:00
Martin Kraemer
87abf2a9d0 Search for OpenSSL in the "standard locations" .../include and .../lib
which are ubiquitous after openSSL's "make install". The old logic relied
on a common directory for both include files and libraries (very non-standard).

Submitted by:	Clere Jean-Frederic <JFrederic.Clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88944 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 08:41:01 +00:00
Greg Stein
8271967b17 fast-path some cases, primarily to avoid an allocation when it isn't needed.
for a "nice" piece of cdata which is in one chunk, this can usually avoid an
allocation.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88943 13f79535-47bb-0310-9956-ffa450edef68
2001-04-27 05:27:00 +00:00
Jeff Trawick
f706c5a618 note a problem with cgid cleanup, even with Greg's latest commit to
threaded


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88942 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 19:08:55 +00:00
Greg Ames
cae8227ded Fix shutdown/restart hangs in the threaded MPM.
After removing mod_cgid from my build (thanks, Jeff), I can do:
* apachectl graceful, followed by
* apachectl restart, followed by
* apachectl stop

...and get the results you would expect.

Submitted by: Jeff Trawick, Greg Ames, Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88941 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 18:52:29 +00:00
Martin Kraemer
56f7ece1a9 Make mod_tls compile. Fix supplied by Jean-Frederic Clere
Submitted by:	Jean-Frederic Clere <JFrederic.Clere@fujitsu-siemens.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88939 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 11:21:38 +00:00
Roy T. Fielding
a529c242fa Removed the keptalive boolean from conn_rec because it is now only
used by a single routine and can be replaced by a local variable.

Submitted by:	Greg Stein, Ryan Bloom, Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88938 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 00:33:14 +00:00
David Reid
ef3cb6e212 This stops some systems from barfing...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88937 13f79535-47bb-0310-9956-ffa450edef68
2001-04-26 00:28:13 +00:00
Cliff Woolley
27ff4e58c0 Fix a reference to "ctx" in mod_include's CREATE_ERROR_BUCKET macro
to "cntx", which is the actual name of the argument to that macro.  It
accidentally worked before because all of the callers of the macro happen
to be passing in a variable named "ctx".  If one of them were to ever try
to pass in a context named something else, bad things would happen.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88936 13f79535-47bb-0310-9956-ffa450edef68
2001-04-25 17:07:40 +00:00
Paul J. Reder
19334bbf9f Yeah, well, like the entry says, fixed prefork to handle signals
properly (mostly SIGTERN).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88935 13f79535-47bb-0310-9956-ffa450edef68
2001-04-25 13:53:43 +00:00
Paul J. Reder
2cb6a383dd This patch puts enough of the signal processing back in so that the signals
are all handled properly now. My previous patch fixed the deadlock race
condition, but broke the user directed signal handling. This fixes it to work
the it did before (primarily SIGTERM is now working).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88934 13f79535-47bb-0310-9956-ffa450edef68
2001-04-25 13:42:38 +00:00