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

1026 Commits

Author SHA1 Message Date
Brian Pane
40e5bd5e08 forward-port MMN from trunk to async-dev branch so MMN-dependent perl-framework tests will compile
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@321517 13f79535-47bb-0310-9956-ffa450edef68
2005-10-16 00:15:27 +00:00
Brian Pane
41f09ddf07 Update new conn_rec field "data_in_output_filters" in core output filter
so async MPMs can tell whether to keep polling and writing


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@307379 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 07:43:23 +00:00
Brian Pane
e7d300d318 Refactored ap_process_request() so that in async MPMs, the MPM (and not
the httpd core) is responsible for write completion.

Note that, with this commit, the Event MPM is still doing write
completion synchronously.  I'll add async write completion as a
separate commit.

Note also that this commit breaks the (experimental) Leader/Followers
MPM on the (equally experimental) async-dev branch.  The fix is to add
either synchronous or asynchronous write completion to that MPM.  Rather
than hack in synchronous write completion, I'll revisit Leader/Followers
once I have async working in Event.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@307362 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 04:49:52 +00:00
Brian Pane
6f3e6ceafa Forward-port of revision 307355 to async-dev branch:
Correct an out-of-date comment


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@307356 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 03:56:47 +00:00
Brian Pane
bd34a1bc19 Redesign of request cleanup:
- A new End-Of-Request bucket is pushed through the output filter
    chain after the last bucket of the response.
  - This bucket gets destroyed by ap_core_output_filter() after the
    buckets in front of it have been sent.
  - The destroy callback of the EOR bucket invokes the access logger
    and frees the request's pool.

With this change, the request logger now runs after the last byte of
the response is _sent_, rather than after the last byte of the response
is _generated_.  This should make the bytes-sent count in the access
log more accurate in cases where the client closes the connection
midway through the sending of the response.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@307339 13f79535-47bb-0310-9956-ffa450edef68
2005-10-09 01:37:11 +00:00
Brian Pane
1000a35949 Forward-port of wrowe's NET_TIME filter removal/refactor into
the async-dev branch, in preparation for developing async write
completion in this branch on top of the new timeout design.
http://svn.apache.org/viewcvs.cgi?rev=306495&view=rev


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@306541 13f79535-47bb-0310-9956-ffa450edef68
2005-10-06 06:19:12 +00:00
Brian Pane
b821e76412 New version of ap_core_output_filter...
The big change is that it now does nonblocking writes when possible.  The
goal of this redesign is to more cleanly support asynchronous write completion
in MPMs such as Event or Leader.  However, the nonblocking writes may also
help in Worker and Prefork by allowing more overlapping of handler and
output filter processing with network writes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@291377 13f79535-47bb-0310-9956-ffa450edef68
2005-09-25 05:22:04 +00:00
Brian Pane
d1ff1de803 Added new connection states CONN_STATE_HANDLER and CONN_STATE_WRITE_COMPLETION.
Also, core_create_conn() now initializes the conn_state within the newly
created connection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@280221 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 00:29:10 +00:00
Paul Querna
9c05049bff *) Create an optional function and MPM Query to replace the core output filter.
*) Put an example of using it into the Event MPM, which just calls the original core output filter.  


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/async-dev@278652 13f79535-47bb-0310-9956-ffa450edef68
2005-09-05 00:21:25 +00:00
Jim Jagielski
d81de0d9b3 Add ap_append_pid(); This is performed enough to warrant
a function I think, especially with the fact that
the mapping of getpid() to APR_PID_T_FMT isn't
consistant in some areas. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@265506 13f79535-47bb-0310-9956-ffa450edef68
2005-08-31 15:22:08 +00:00
Colm MacCarthaigh
36b3643d82 *how* did I mis-spell that.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264104 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 09:38:33 +00:00
Colm MacCarthaigh
5a0531c52e Move the "GracefulShutdownTimeout" command definition into mpm_common
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@264103 13f79535-47bb-0310-9956-ffa450edef68
2005-08-29 09:28:27 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
Colm MacCarthaigh
a500939eb8 Add ap_relieve_child_processess(), a non-infanticidal copy of
ap_reclaim_child_processes(). Allows us to waitpid() each process in the
scoreboard and each "extra" process with a single call.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240465 13f79535-47bb-0310-9956-ffa450edef68
2005-08-27 22:12:08 +00:00
Colm MacCarthaigh
d7c04b158c Move the "GracefulShutdownTimeout" directive into mpm_common, for re-use
with other MPM's.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240296 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 17:43:24 +00:00
Colm MacCarthaigh
bbb8aeee02 Silly me, I forgot to commit this; the definitions for the GRACEFUL_STOP
signal.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@240274 13f79535-47bb-0310-9956-ffa450edef68
2005-08-26 16:13:17 +00:00
Colm MacCarthaigh
ea08df890e Correct the function prototype/declaration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239732 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 19:06:40 +00:00
Colm MacCarthaigh
d6f8c966b0 Provide a function for closing all of the listeners.
* This is useful for properly implementing a graceful stop and restart
    where we want child processess to be able to carry on serving a request 
    but "de-listen" from a port. So that another instance entirely can be 
    started in our place, or to unbind from a "Listen" directive an admin 
    has removed from the configuration.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239710 13f79535-47bb-0310-9956-ffa450edef68
2005-08-24 16:51:20 +00:00
Colm MacCarthaigh
395896ae8d Remove support for the threaded-mpm's on Linux 2.0, and de-autoconf the
graceful restart signal. Frees up SIGWINCH for implementing graceful stop.
See <20050727114058.GA3390@stdlib.net> and subsequent thread on httpd-dev.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@239430 13f79535-47bb-0310-9956-ffa450edef68
2005-08-23 16:41:17 +00:00
Paul Querna
157942e212 move trunk to 2.3.0-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@219521 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 15:52:19 +00:00
Ian Holsman
e3b8df6224 c/major bump/minor bump/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@219435 13f79535-47bb-0310-9956-ffa450edef68
2005-07-18 00:59:59 +00:00
Ian Holsman
9ffe8c5d1a This patch adds a new hook (request_status) that gets ran in proxy_handler
just before the final return.  This gives modules an opportunity to do
something based on the proxy status.

A couple of examples where this is useful:

-You are using a caching module and would rather return stale content rather
than an error to the client if the origin is down.

-you proxy some subrequests (using SSI - mod_include) and do not want SSI
errors when the backend is down. If you would normally return
HTTP_BAD_GATEWAY, you may have a module that serves some other content.


new hook -- so mmn bump.. i made it a major one, hope thats ok 

Patch From Brian Akins <Brian.Akins turner.com>




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@219372 13f79535-47bb-0310-9956-ffa450edef68
2005-07-17 05:12:10 +00:00
William A. Rowe Jr
4418c45bbd The cookie is AP22 by unanimous consent.
This is because 2.1.x dies the day 2.2.0 is branched.  There will
  be no updates to 2.1 as we continue to maintain 2.2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@209876 13f79535-47bb-0310-9956-ffa450edef68
2005-07-08 20:15:14 +00:00
William A. Rowe Jr
025c799a79 Initially a no-op. Add trace_enable configuration. The http and proxy
flavors of interpreting this flag are yet to be committed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@208785 13f79535-47bb-0310-9956-ffa450edef68
2005-07-01 19:39:26 +00:00
William A. Rowe Jr
2aac52b64d Whoops - two things at once. Document MAGIC_COOKIE "AP21"
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@208778 13f79535-47bb-0310-9956-ffa450edef68
2005-07-01 17:51:09 +00:00
William A. Rowe Jr
c88cb077ef Change Apache httpd 2.1 signature to "AP21" as this flavor
is binary-incompatible to any "AP20" module.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@208777 13f79535-47bb-0310-9956-ffa450edef68
2005-07-01 17:50:01 +00:00
Paul Querna
b536107fc3 Move on to 2.1.7-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@201579 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 07:37:04 +00:00
Paul Querna
f2a9978fe2 - Prepare for 2.1.6 tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@201577 13f79535-47bb-0310-9956-ffa450edef68
2005-06-24 07:34:36 +00:00
Paul Querna
2e6e500225 Onward to 2.1.6-dev!
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@191100 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 07:03:13 +00:00
Paul Querna
33180c7a7a * include/ap_release.h: Remove -dev to prepare for 2.1.5 tag.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@191098 13f79535-47bb-0310-9956-ffa450edef68
2005-06-17 07:00:20 +00:00
Joe Orton
9687f8c6a7 Update remaining 2004 copyright notices.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190592 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 13:54:34 +00:00
Paul Querna
6a23d6ebeb Merge the listen-protocol sandbox branch to trunk.
I will be adding documentation for the new directives hopefully in the next day or so.

* server/core.c: Added 'Protocol' to the core module config
                 Added ap_{set,get}_server_protocol API.
                 Added new directive: 'AcceptFilter'.
                 Enable 'httpready' by default on systems that support it.  Use dataready filters for others.

* server/listen.c: Attempt to inherit protocols from Listener Records to Server configs.
                   The 'Listen' directive can now optionally take a protocol arg
                   Move bits that determined which accept filter is applied to core.c.
                   Added bits to find the correct accept filter based on the core's configuration.

* include/{ap_listen.h,http_core.h}: Add Protocol to respective structures.

* include/http_core.h: Add the accf_map table to the core_server_config structure

* include/ap_mmn.h: Minor MMN Bump for the new interfacces.

* modules/ssl/ssl_engine_init.c: Use the new protocol framework to enable mod_ssl for 'https' websites.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190563 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 09:21:18 +00:00
Nick Kew
b0a5cb0bb9 Add monitor hook (discussed under "watchdog" thread).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@188846 13f79535-47bb-0310-9956-ffa450edef68
2005-06-07 19:13:37 +00:00
Jeff Trawick
b5ed63df60 The new function ap_logs_child_init() is intended for use
only by the core server.  Require CORE_PRIVATE to obtain
the prototype.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@171093 13f79535-47bb-0310-9956-ffa450edef68
2005-05-20 10:50:17 +00:00
Jeff Trawick
7ae218a5bf Support the suppress-error-charset setting, as with Apache 1.3.x.
With Apache 1.3.x, it is a bit simpler as the request does
not go through ap_make_content_type().

Modules can set custom error responses but not be able to
set the charset, so they have to code the charset in the
html.  Thus, it is useful to preserve 1.3.x behavior exactly.

PR: 26467


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170354 13f79535-47bb-0310-9956-ffa450edef68
2005-05-16 10:41:42 +00:00
Jeff Trawick
f78a4e4a89 Prevent hangs of child processes when writing to piped loggers at
the time of graceful restart. 

PR:          26467
Reviewed by: Joe Orton



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170281 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 23:56:48 +00:00
Bradley Nicholes
1439ca9d5c Add the LDAPVerifyServerCert directive to util_ldap to force
verification of a server certificate when establishing an SSL connection
to the LDAP server


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169705 13f79535-47bb-0310-9956-ffa450edef68
2005-05-11 22:34:18 +00:00
Paul Querna
da9a8de753 Add AP_INIT_TAKE_ARGV. There can be some inconsistent results because of the behavoir of ap_getword_conf. Do not rely upon any last argument that is "". If the argument is in the middle of the line, it should work correctly.
This is updated from the version sent to dev@httpd to fix the behavoir with 0 arguments.

* include/http_config.h: minor MMN bump for the new interface.
* modules/generators/mod_autoindex.c: Migrate IndexOptions to the new ARGV command type.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168202 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 22:23:00 +00:00
Paul Querna
8f193f8538 The SPMT_OS2_MPM doesn't exist. The warning is also wrong, since both winnt and prefork MPMs call this function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@168139 13f79535-47bb-0310-9956-ffa450edef68
2005-05-04 16:02:44 +00:00
Paul Querna
03c53e0a5b Add ap_vhost_iterate_given_conn() as I had previously mentioned on the mailing list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164538 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 05:23:18 +00:00
Paul Querna
af9ae7c2d7 Remove ap_method_list_do and ap_method_list_vdo as previously mentioned dev@httpd.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@164536 13f79535-47bb-0310-9956-ffa450edef68
2005-04-25 05:19:18 +00:00
Rich Bowen
6efa778213 As discussed on the list, change the default setting for
KeepAliveTimeout from 15 seconds to 5 seconds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@161140 13f79535-47bb-0310-9956-ffa450edef68
2005-04-13 01:21:11 +00:00
Bradley Nicholes
38e8b5da89 Implement the exported function from mod_ldap(util_ldap) as optional functions so that we can eliminate the load ordering of mod_ldap and mod_authnz_ldap.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@159619 13f79535-47bb-0310-9956-ffa450edef68
2005-03-31 18:44:16 +00:00
Sander Striker
ac9a5e85ed And carry on with 2.1.5-dev.
* include/ap_release.h

  Bump AP_SERVER_PATCHLEVEL_NUMBER to 5.
  Set AP_SERVER_DEVBUILD_BOOLEAN.

* CHANGES

  Add a 2.1.5 section.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157726 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 08:44:38 +00:00
Sander Striker
9c49c3b87b Prepare for 2.1.4 tag.
* include/ap_release.h

  Clear AP_SERVER_DEVBUILD_BOOLEAN.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157725 13f79535-47bb-0310-9956-ffa450edef68
2005-03-16 08:43:38 +00:00
Justin Erenkrantz
a80f8410bd Add ReceiveBufferSize directive to control the TCP receive buffer.
Submitted by: Eric Covener <covener gmail.com>
Reviewed by:  Justin Erenkrantz (with minor formatting tweaks)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@157583 13f79535-47bb-0310-9956-ffa450edef68
2005-03-15 20:04:58 +00:00
Jeff Trawick
62de54117a really bump MMN
Submitted by: Sander Temme

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156279 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 20:39:32 +00:00
Jeff Trawick
3e14f16867 worker MPM/mod_status: Support per-worker tracking of pid and
generation in the scoreboard so that mod_status can accurately
represent workers in processes which are gracefully terminating.

New child processes with worker MPM can take over slots of
individual threads within gracefully terminating processes.
Sometimes this is a problem (too many of these gracefully
terminating processes), so it is helpful to have mod_status
provide the information required to recognize these processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156274 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 20:06:55 +00:00
Justin Erenkrantz
249b7dfcbb Onward ho to 2.1.4.
* CHANGES: Bump.
* include/ap_release.h: Bump.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154973 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 06:29:31 +00:00
Justin Erenkrantz
5bc6a0a84f * include/ap_release.h: Time for 2.1.3.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@154971 13f79535-47bb-0310-9956-ffa450edef68
2005-02-23 06:27:41 +00:00