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

566 Commits

Author SHA1 Message Date
Ryan Bloom
bc6842137c We are tagged, so bump the numbers everywhere.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89519 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 02:55:35 +00:00
Ryan Bloom
815897922b Update to prepare for 2.0.20 release
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89518 13f79535-47bb-0310-9956-ffa450edef68
2001-07-09 02:51:20 +00:00
Ryan Bloom
1f4f4c5942 Bump after the tag/roll
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89469 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 05:33:05 +00:00
Ryan Bloom
354c688711 Bump a couple things for the tag and roll!!!!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89467 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 05:15:07 +00:00
Roy T. Fielding
2bb1fb4a72 bump and grind for another beta
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89451 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 23:37:00 +00:00
William A. Rowe Jr
a7a28bd8c0 Here, finally are a few cleanups of my fat fingers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89444 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:57:14 +00:00
William A. Rowe Jr
8ba66cccaf Move duplicated rnew cloning from apr_ap_sub_req_lookup_*() functions,
and add an ap_sub_req_lookup_dirent() to create a subrequest from the
  results of an apr_dir_read() for mod_negotiation and mod_autoindex.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89437 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 20:09:24 +00:00
William A. Rowe Jr
7a5c5c4965 Add additional query datum to the MPMs.
Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89433 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 17:43:51 +00:00
Ben Laurie
7e5f12306c Documentation updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89377 13f79535-47bb-0310-9956-ffa450edef68
2001-06-17 14:34:14 +00:00
Greg Stein
e5640cedcc Define a hook for fetching management/status items.
This patch was submitted by Ian Holsman. Greg revised some names, applied
the Apache style, and namespace-prefixed the public symbols. Minor bugfix in
the use of the hook implementation macro.

Submitted by: Ian Holsman <IanH@cnet.com>
Reviewed by: Greg Stein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89364 13f79535-47bb-0310-9956-ffa450edef68
2001-06-13 20:11:45 +00:00
Ryan Bloom
66a61c359d Add a pool to the ap_save_brigade prototype. This removes a todo from
the comments that is really necessary before the setaside stuff will
work properly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89362 13f79535-47bb-0310-9956-ffa450edef68
2001-06-13 13:44:40 +00:00
William A. Rowe Jr
0ba63f0532 Was certain I had committed this. Position the scoreboard members such
that the size and members can be derrived by the most stable elements,
  followed by derived elements.  [Harrie Hazewinkel]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89326 13f79535-47bb-0310-9956-ffa450edef68
2001-06-10 00:37:59 +00:00
Victor J. Orlikowski
08ce0bc1b2 Updating docs to change around the order of extern and
AP[RU]_DECLARE_DATA. If this is incorrect, please yell.
However, the vast majority of the code follows the convention
documented in this patch.
If this is in error, I will gladly back it out.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89324 13f79535-47bb-0310-9956-ffa450edef68
2001-06-09 11:33:07 +00:00
Greg Stein
0c0d157331 Convert the filter and brigade writing functions to return status values,
not byte counts.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89305 13f79535-47bb-0310-9956-ffa450edef68
2001-06-08 11:00:14 +00:00
Ryan Bloom
931fe85b8d First pass at the pipe_of_death logic for the prefork MPM. This does
pass some initial testing, but it needs to be banged on more.  It looks
like if the server gets a lot of requests to restart all at once, there
are potential problems, but other than that this does seem to solve our
current restart issues.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89282 13f79535-47bb-0310-9956-ffa450edef68
2001-06-07 00:09:16 +00:00
Ryan Bloom
06ca840aa4 Add a new request phase, for allowing management modules to forward
error logs to their management agents.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89281 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 22:24:54 +00:00
Jeff Trawick
7135d12e6c get rid of util_date.c/util_date.h and associated test program
test_date.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89278 13f79535-47bb-0310-9956-ffa450edef68
2001-06-06 19:37:15 +00:00
Ben Laurie
9b7d636ba9 Doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89261 13f79535-47bb-0310-9956-ffa450edef68
2001-06-03 11:59:18 +00:00
Ben Laurie
102fde2e91 Doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89235 13f79535-47bb-0310-9956-ffa450edef68
2001-05-28 15:32:50 +00:00
Jeff Trawick
5e23c1edc6 include/ap_compat.h tested and set APR_COMPAT_H instead of AP_COMPAT_H.
This prevented the inclusion of apr_compat.h.

PR:           7773
Submitted by: Oleg Broytmann <phd@phd.pp.ru>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89217 13f79535-47bb-0310-9956-ffa450edef68
2001-05-23 13:56:34 +00:00
Roy T. Fielding
2898ad6b42 Moved to the apr-util library.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89200 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 02:07:22 +00:00
Roy T. Fielding
43b9634ceb Moved util_uri to apr-util/uri/apr_uri, which means adding the apr_
prefix to all of the uri functions (yuck), changing some includes,
and using APR error codes instead of HTTP-specific error codes.

Other notes to test this patch:
- You need to delete the util_uri.h file - exports picks up on this.
- I'd like to remove the apr_uri.h from httpd.h, but that might
  increase the complexity of this patch even further.  Once this patch
  is accepted (in some form), then I can focus on removing apr_uri.h
  from httpd.h entirely.  I need baby steps (heh) right now.
- I imagine that this might break a bunch of stuff in Win32 or other OS
  builds with foreign dependency files.  Any help here is appreciated.

This is a start...  -- justin

Submitted by:	Justin Erenkrantz
Reviewed by:	Roy Fielding


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89198 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 01:31:12 +00:00
Ben Laurie
eb517580bd More cleanup.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89179 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 15:26:18 +00:00
Ben Laurie
883a3b25bf AP_ function for optional hooks.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89178 13f79535-47bb-0310-9956-ffa450edef68
2001-05-20 14:13:33 +00:00
Bill Stoddard
6c51b19679 On to 2.0.19-dev
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89155 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 16:34:06 +00:00
Bill Stoddard
78433b6dfd Preparing for the tag and roll of 2.0.18.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89152 13f79535-47bb-0310-9956-ffa450edef68
2001-05-18 16:02:15 +00:00
Paul J. Reder
768f9e72e4 Ooops. Didn't remove *all* of the new_scoreboard stuff. This was harmless,
but should be consistent and complete. It is now completely removed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89117 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 13:41:27 +00:00
Paul J. Reder
1b2262dd30 Make first phase changes to the scoreboard data structures in
preparation for the rewriting of the scoreboard per my posted
design notes. [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89115 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 02:38:17 +00:00
Jeff Trawick
03962d5f86 Separate enablement of AP_DEBUG code from enablement of code
which depends on the compiler supporting designated initializers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89103 13f79535-47bb-0310-9956-ffa450edef68
2001-05-13 12:21:25 +00:00
Greg Stein
ab9d00b0c4 Implement Jeff's idea for an autoconf-defined symbol to enable the special
command function prototype stuff. AP_DEBUG is always set in maintainer mode
and AP_DEBUG_HAVE_GCC is set when the compiler is GCC.

Submitted by: Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89102 13f79535-47bb-0310-9956-ffa450edef68
2001-05-13 10:37:06 +00:00
Victor J. Orlikowski
a3d0750230 Fix up some of the definitions, based on Ian's patch.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89088 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 18:21:27 +00:00
Chuck Murcko
86154b12b2 Add the AP_DECLARE()/AP_CORE_DECLARE macros on the return types of
functions used by mod_proxy for export in DLL
Submitted by:	Ian Holsman <IanH@cnet.com>
Reviewed by:	Chuck murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89078 13f79535-47bb-0310-9956-ffa450edef68
2001-05-11 04:35:41 +00:00
Jeff Trawick
e4fad412b8 minor scoreboard/status improvements:
. get the SS field in extended status output formatted correctly
  (seconds since beginning of request shouldn't be a huge
  negative number :) )
. use APR_OS_PID_T_FMT and pid_t where appropriate in mod_status
  to avoid casting, some of which may have been broken on some
  architectures


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89048 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 16:24:14 +00:00
Jeff Trawick
99ba37d329 Get rid of some Apache 1.x OPTIMIZE_TIMEOUTS cruft. Other logic
in 1.3 which used this stuff would send SIGALRM to children in
certain circumstances.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89047 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 15:49:42 +00:00
Ryan Bloom
1c98aabbf1 Back out the recent change to ap_get_brigade, to make it use indirection
again.  The problem is that the amount of data read from the network,
is not necessarily the amount of data returned from the filters.  It is
possible for input filters to add bytes to the data read from the network.

To fix the original bug, I just removed the line from ap_get_client_block
that decremented r->remaining, we allow the http_filter to do that for
us.

I have also removed an incorrect comment.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89041 13f79535-47bb-0310-9956-ffa450edef68
2001-05-06 23:27:14 +00:00
Greg Stein
5cba6d7345 Fix a bug in the input handling. ap_http_filter() was modifying *readbytes
which corresponded to r->remaining (in ap_get_client_block). However,
ap_get_client_block was *also* adjusting r->remaining. Net result was that
PUT (and probably POST) was broken. (at least on large inputs)

To fix it, I simply removed the indirection on "readbytes" for input
filters. There is no reason for them to return data (the brigade length is
the return length). This also simplifies a number of calls where people
needed to do &zero just to pass zero.

I also added a number of comments about operations and where things could be
improved, or are (semi) broken.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89008 13f79535-47bb-0310-9956-ffa450edef68
2001-05-05 11:18:01 +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
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
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
Greg Ames
c196a6ab1f back out my quiesce limit change altogether from the threaded mpm until it
learns how to go away nicely (shouldn't be too bad actually :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88924 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 23:14:35 +00:00
Ryan Bloom
0765217fba Document the new argument to ap_get_brigade()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88919 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 17:28:58 +00:00
Greg Ames
27c9f0c550 Limit the threaded mpm to quiescing one process at a time.
This is to fix a problem where the scoreboard is filled with
quiescing processes and no working processes can start, triggered by
MaxRequestsPerChild.  perform_idle_server_maintenance could theoretically
cause it as well.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88913 13f79535-47bb-0310-9956-ffa450edef68
2001-04-23 02:13:17 +00:00
Ryan Bloom
eb94b557ee At the hack-athon we decided to change the way that input filters
determine how much data is returned to the previous filter.  Prior to this
change, we used a field in the conn_rec to determine how much to return.
After this change, we use an argument to ap_get_brigade.  This makes it
much more obvious how things work at all levels, so that module authors
can easily determine how much data is supposed to be returned to them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88912 13f79535-47bb-0310-9956-ffa450edef68
2001-04-22 22:19:32 +00:00
Roy T. Fielding
4647e5f71a Revert the change that moved keepalives out of conn_rec. That variable
controls the number of requests per connection, regardless of the protocol
used by the request.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88908 13f79535-47bb-0310-9956-ffa450edef68
2001-04-21 12:23:37 +00:00
Doug MacEachern
cd7883893c Add ap_set_int_slot() function
PR:
Obtained from:
Submitted by:	John K. Sterling <sterling@covalent.net>
Reviewed by:	dougm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88902 13f79535-47bb-0310-9956-ffa450edef68
2001-04-20 16:43:39 +00:00
Ryan Bloom
70a67b2c26 Move the keepalives field out of the conn_rec and into an HTTP specific
connection record.  This also moves some HTTP specific back out of the
core and into the HTTP module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88881 13f79535-47bb-0310-9956-ffa450edef68
2001-04-18 03:53:34 +00:00
Bill Stoddard
fcd4eac310 Retagged.. Now bump back to 2.0.18-dev. For anyone looking at this in the future,
I screwed up tagging the 2.0.17 release. Should have set the string to 2.0.17, then tagged.
I left it at 2.0.17-dev by mistake.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88879 13f79535-47bb-0310-9956-ffa450edef68
2001-04-17 13:09:05 +00:00
Bill Stoddard
0f9f9d8ef3 Retag at 2.0.17
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88877 13f79535-47bb-0310-9956-ffa450edef68
2001-04-17 12:55:30 +00:00
Bill Stoddard
5d7d80f213 Bump the release num
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88875 13f79535-47bb-0310-9956-ffa450edef68
2001-04-17 03:32:54 +00:00
David Reid
29b5864cbf Silly typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88872 13f79535-47bb-0310-9956-ffa450edef68
2001-04-16 20:33:16 +00:00