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

529 Commits

Author SHA1 Message Date
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
Ryan Bloom
019d25acca We need a prototype for ap_show_mpm
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88857 13f79535-47bb-0310-9956-ffa450edef68
2001-04-14 18:20:56 +00:00
Ryan Bloom
cd0738be95 Add more options to the ap_mpm_query function. This also allows MPMs to
report if their threads are dynamic or static.  Finally, this also
implements a new API, ap_show_mpm, which returns the MPM that was
required into the core.

We tried to make all of the MPMs report their threading capabilities
correctly, but each MPM expert should double check us.

Submitted by:	Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88851 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 19:00:39 +00:00
Cliff Woolley
7ef7064507 Change AP_MIN_BYTES_TO_WRITE from 9000 to 8192 to match the bucket buffer
size.  This fixes the 8192-808-8192-808 iovec-length sequence problem
on platforms using writev() (eg OS/2).

Reviewed by:	Brian Havard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88843 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 05:19:25 +00:00
Ryan Bloom
358858ff36 The ap_f* functions should flush data to the filter that is passed in,
not to the filter after the one passed in.  The fixes a bug, where one
filter is skipped when using ap_f*.
Submitted by:	Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88832 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 20:06:50 +00:00
Victor J. Orlikowski
995cf8681d Small docco fixes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88786 13f79535-47bb-0310-9956-ffa450edef68
2001-04-10 16:57:37 +00:00
Paul J. Reder
a3d7fb947d Changes required to make prefork clean up idle children properly. There was a window during which a starting worker deadlocks when an idle cleanup arrives before it completes init. Apache then keeps trying to cleanup the same deadlocked worker forever (until higher pids come along, but it still will never reduce below the deadlocked pid). Thus the number of children would not reduce to the correct idle level.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88741 13f79535-47bb-0310-9956-ffa450edef68
2001-04-06 20:12:09 +00:00
Victor J. Orlikowski
8735167a29 Module writers for 2.0 shouldn't still be relying on a no-op for
compatibilities' sake. Let's kill ap_util_uri_init, since it serves no
purpose now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88716 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 07:15:35 +00:00
Ryan Bloom
b4f2309d88 Back out the 2.0.17 stuff. We'll just re-tag the one file in 2.0.16
and re-roll.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88712 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 03:39:39 +00:00
Ryan Bloom
e98041e4b6 Update for 2.0.17. The only change was in APR-util, but APR and APR-util
aren't at a point that they have their own release strategy, so this means
a new tag for Apache.  :-(


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88711 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 03:31:31 +00:00
Ryan Bloom
e5a0f207ed Working in 2.0.17-dev now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88707 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 00:52:02 +00:00
Ryan Bloom
54a502ffcb Update the CHANGES and ap_release files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88705 13f79535-47bb-0310-9956-ffa450edef68
2001-04-04 00:35:09 +00:00
William A. Rowe Jr
eef2d4af11 Ahhh... the missing file from Ben's and my experiments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88686 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 06:01:49 +00:00
William A. Rowe Jr
87217ab618 Whoops... this could be causing problems
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88676 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 01:40:28 +00:00
Brian Havard
c65d5ee7e4 Reformat declaration so make_export.awk will recognize them. Yes, I know this
makes lines longer than is normally acceptable but I'd like to see anyone come
up with an awk script that handles these things broken over multiple lines...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88646 13f79535-47bb-0310-9956-ffa450edef68
2001-04-02 15:28:09 +00:00
Bill Stoddard
4732553655 Performance: Add quick_handler hook. This hook is called at the
very beginning of the request processing before location_walk,
translate_name, etc.  This hook is useful for URI keyed content
caches like Mike Abbott's Quick Shortcut Cache.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88596 13f79535-47bb-0310-9956-ffa450edef68
2001-03-27 19:19:08 +00:00
Doug MacEachern
bc660e9860 top_module global variable renamed to ap_top_module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88582 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 15:39:52 +00:00
Doug MacEachern
44238d2266 change create_request hook to RUN_ALL/return int so handlers can throw errors
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88576 13f79535-47bb-0310-9956-ffa450edef68
2001-03-25 17:38:18 +00:00
Ryan Bloom
0c88cad66f We are working on 2.0.16 now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88574 13f79535-47bb-0310-9956-ffa450edef68
2001-03-25 15:56:59 +00:00
Ryan Bloom
c3e80a981b Prepare for the next roll
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88572 13f79535-47bb-0310-9956-ffa450edef68
2001-03-25 04:05:42 +00:00
Brian Havard
1dcd4c9b8f Tweak some declarations so they're picked up by make_export.awk
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88568 13f79535-47bb-0310-9956-ffa450edef68
2001-03-24 06:43:19 +00:00
Jeff Trawick
333ebf30c3 Get rid of some warnings which crept into the Unix MPMs a
few days ago.

mpm_common.h started referencing AP_MPM_NEEDS_RECLAIM_CHILD_PROCESSES
but did not include the header file where this might be defined.

The result was no prototype for ap_reclaim_child_processes() on
platforms which needed it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88562 13f79535-47bb-0310-9956-ffa450edef68
2001-03-22 12:32:21 +00:00
Brian Havard
7c7bd950fd Declaration of ap_reclaim_child_processes() in exports.c needs to be
conditional in the same way that the function's definition is so give it a
suitable macro that will be recogized by the scripts that make exports.c.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88537 13f79535-47bb-0310-9956-ffa450edef68
2001-03-19 13:07:28 +00:00
Ryan Bloom
895b7b26ac Add a hook, create_request. This hook allows modules to modify
a request while it is being created.  This hook is called for all
request_rec's, main request, sub request, and internal redirect.
When this hook is called, the the r->main, r->prev, r->next
pointers have been set, so modules can determine what kind of
request this is.

Currently, this is only used by the core module, but protocol modules
are going to need to have the ability to affect the request while it is
being read.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88532 13f79535-47bb-0310-9956-ffa450edef68
2001-03-18 02:33:23 +00:00
Ben Laurie
921c577c78 More doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88531 13f79535-47bb-0310-9956-ffa450edef68
2001-03-17 15:58:09 +00:00
Chuck Murcko
93463cfc17 This is a fix that went into v1.3 quite a while back, but not into v2.0.
It sorts out the problem when a password protected reverse proxy URL
sends a Proxy-Authenticate to a browser instead of a WWW-Authenticate.

This patch covers the changes to the httpd-2.0 tree.

Submitted by:	Graham Leggett
Reviewed by:	Chuck Murcko


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88527 13f79535-47bb-0310-9956-ffa450edef68
2001-03-16 07:28:08 +00:00
Ben Laurie
af98abf4e7 Check in not-quite-working hooks groupings.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88513 13f79535-47bb-0310-9956-ffa450edef68
2001-03-13 22:20:55 +00:00
Bill Stoddard
9692f107c1 *) Reimplement the Windows MPM (mpm_winnt.c) to eliminate calling
DuplicateHandle on an IOCompletionPort (a practice which
     MS "discourages"). The new model does not rely on associating
     the completion port with the listening sockets, thus the
     completion port can be completely managed within the child
     process.  A dedicated thread accepts connections off the network,
     then calls PostQueuedCompletionStatus() to wake up worker
     threads blocked on the completion port.
     [Bill Stoddard]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88498 13f79535-47bb-0310-9956-ffa450edef68
2001-03-12 17:29:02 +00:00
Ben Laurie
e492048855 More doxygenation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88494 13f79535-47bb-0310-9956-ffa450edef68
2001-03-11 23:24:56 +00:00
Ryan Bloom
86224fb1b9 OtherBill told me last night that I never bumped for 2.0.15. Whoops.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88491 13f79535-47bb-0310-9956-ffa450edef68
2001-03-11 15:01:18 +00:00
Ben Laurie
759dfd4d71 First step in doxygen conversion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88490 13f79535-47bb-0310-9956-ffa450edef68
2001-03-11 14:54:13 +00:00
Jeff Trawick
d3dcba691d tweak ap_get_remote_host() so that the caller can find out if she got
back an IP address

mod_access needed to know this, but the old code didn't handle IPv6


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88484 13f79535-47bb-0310-9956-ffa450edef68
2001-03-09 20:30:34 +00:00
Ryan Bloom
585199d2ce Bump for version 2.0.14
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88465 13f79535-47bb-0310-9956-ffa450edef68
2001-03-07 19:13:37 +00:00
Jeff Trawick
3a73caceb3 Rely on APR to determine whether or not we have netinet/tcp.h. This test
requires a special work-around for IRIX 6.5, which will be in APR soon.
There is no need for it in Apache.

The include of netinet/tcp.h was removed from perchild.c and threaded.c.
They no longer seem to be needed there.

PR:		6459


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88455 13f79535-47bb-0310-9956-ffa450edef68
2001-03-05 20:15:15 +00:00
Ryan Bloom
54ed3070d5 Another chunk of code from http to core. This should continue to build
on all platforms.  The next job is to shuffle functions back and forth
so that the server builds without mod_http.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88453 13f79535-47bb-0310-9956-ffa450edef68
2001-03-05 04:43:56 +00:00
Ryan Bloom
3eeeb76fb4 Move more code from the http module into the core server. This
is core code, basically the default handler, the default input
and output filters, and all of the core configuration directives.
All of this code is required in order for the server to work, with or
without HTTP.  The server is closer to working without the HTTP
module, although there is still more to do.

I tried to fix Windows, but somebody should probably make sure I did
it correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88449 13f79535-47bb-0310-9956-ffa450edef68
2001-03-04 06:27:27 +00:00
Ryan Bloom
d2d23882af Allow modules to query the MPM about it's execution profile. This
query API can and should be extended in the future, but for now,
max_daemons, and threading or forking is a very good start.

Non-Unix MPM's do have the MPM query function, although there is no
garauntee that the information is perfect, please check.

Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88437 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 22:46:33 +00:00
Greg Stein
8bcd220ae9 Don't directly include ap_config_auto.h directly. It isn't available on
Windows platforms. Including ap_config.h will pick it up, or it will grab
the appropriate Windows header/defines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88402 13f79535-47bb-0310-9956-ffa450edef68
2001-03-01 00:55:03 +00:00