NET_TIME, as a standalone feature, was a horrid idea, so eliminate it.

  The core filter will NOT operate correctly across platforms 
  (even between Linux/Solaris) without setting up the conn->timeout,
  so always apply the timeout when establishing the core filter.

  The keep-alive-timeout is entirely an HTTP-ism, and needs to
  move to the http protocol handler.  This isn't triggered in the 
  event mpm, but the event mpm introspects s->keep_alive_timeout
  directly adding it to the pollset, so this is a non-sequitor.

  Finally, once the headers are read, the named virtual host may
  have a different (more/less permissive) timeout for the remainder
  of the request body.  This http-centric patch picks up that subtle
  detail and can switch to a named-vhost timeout.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@307031 13f79535-47bb-0310-9956-ffa450edef68

* run the request_status hook in proxy_handler if HTTP_SERVICE_UNAVAILABLE
  is returned by ap_proxy_pre_request.

Suggested by: Brian Akins <brian.akins turner.com>, Mladen Turk
Reviewed by: Jim Jagielski


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306900 13f79535-47bb-0310-9956-ffa450edef68

mod_proxy_connect: Fix high CPU loop on systems like UnixWare which
trigger POLL_ERR or POLL_HUP on a terminated connection.

PR 36951.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306889 13f79535-47bb-0310-9956-ffa450edef68

* Fix PR36507 (mod_proxy_balancer does not handle sticky sessions with
  tomcat correctly).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306884 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306832 13f79535-47bb-0310-9956-ffa450edef68

  docs/build/ should not exist (docs/manual/build/ already in svn:ignore).



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306826 13f79535-47bb-0310-9956-ffa450edef68

  httpd-docs procedures call for checking out build underneath
  the docs/ tree, so add this subdirectory as an svn ignore



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306816 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306802 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306798 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306787 13f79535-47bb-0310-9956-ffa450edef68

  Spare us a wasted variable, csd is initialized null, acting
  as the 'csd_set' indicator.




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306784 13f79535-47bb-0310-9956-ffa450edef68

  Pay close attention to core_create_req() ... and note
  that not one other member of the r->vars is initialized
  herein.  Move this initialization elsewhere.

  (If this is the 'default' - it really aught to be the
  zero value, for that matter).




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@306782 13f79535-47bb-0310-9956-ffa450edef68

Refresh the SSL FAQ to bring it a little closer to reality.

Submitted by: Noirin Plunkett <firebird nerdchic.net>
Reviewed by: Joe Orton




git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@295105 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293365 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293318 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293310 13f79535-47bb-0310-9956-ffa450edef68

build warnings by asteinmetz. Tested on IA64, x64 and x86. 

Originally by: asteinmetz
Reviewed by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293305 13f79535-47bb-0310-9956-ffa450edef68

  No Functional changes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293302 13f79535-47bb-0310-9956-ffa450edef68

with trunk.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293292 13f79535-47bb-0310-9956-ffa450edef68

and fix a style nit (colm).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293170 13f79535-47bb-0310-9956-ffa450edef68

Originally by: Jim
Reviewed by: Colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293169 13f79535-47bb-0310-9956-ffa450edef68

to zero. These should not be neccessary, but help us get around a gcc
(on ia64 at least) optimisation bug. They are harmless anyway.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293164 13f79535-47bb-0310-9956-ffa450edef68

subversion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@293162 13f79535-47bb-0310-9956-ffa450edef68

* server/main.c (suck_in_APR): Remove weird gzeof reference which
broke all the -Werror builds.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292965 13f79535-47bb-0310-9956-ffa450edef68

*) SECURITY: CAN-2005-2970 (cve.mitre.org)
     worker MPM: Fix a memory leak which can occur after an aborted
     connection in some limited circumstances.  [Greg Ames, Jeff Trawick]



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292949 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292771 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292565 13f79535-47bb-0310-9956-ffa450edef68

moves some structures and define's shared by mod_disk_cache and htcacheclean
into a single mod_disk_cache.h.  

Original Author: asteinmetz
Review by: colm


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292557 13f79535-47bb-0310-9956-ffa450edef68

however backporting these doxygen fixes makes it significantly easier to diff
trunk and the 2.2.x branch, to sort out what's what. And we might as well
release with nicer doxygen markup.

Submitted by: Neale Ranns <neale ranns.org>
Reviewed by:  Ian Holsman


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292540 13f79535-47bb-0310-9956-ffa450edef68

de-ref bug - balancer is always not null since it's &balancer
from the caller.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292435 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292432 13f79535-47bb-0310-9956-ffa450edef68

play nice together. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@292423 13f79535-47bb-0310-9956-ffa450edef68

As recommended by nd, build docs for all languages.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291559 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291488 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291486 13f79535-47bb-0310-9956-ffa450edef68

* Makefile.in
  (docs): If the "docs-build" project is available, trigger its build system
   to turn the XML sources into HTML.  Otherwise, display a URL to the
   instructions on how to use the docs build.

* build/rules.mk.in:
  (.PHONEY): docs is a fake target.

Submitted By: Daniel Rall <dlr apache.org>
Reviewed by: pquerna


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291485 13f79535-47bb-0310-9956-ffa450edef68

* server/connection.c (ap_lingering_close): Fix lingering close to
really match the 1.3 behaviour: read from the client for up to ~30
seconds in total.  Current behaviour will attempt only 15 read() calls
then give up.

* server/connection.c (ap_lingering_close): Cleanup; no functional change.

PR: 35292


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291469 13f79535-47bb-0310-9956-ffa450edef68

Implement a (bounded) buffer of request body data to provide a limited
but safe fix for the mod_ssl renegotiation-vs-requests-with-bodies
bug:

* modules/ssl/ssl_private.h (ssl_io_buffer_fill): Add prototype.

* modules/ssl/ssl_engine_io.c (ssl_io_buffer_fill,
ssl_io_filter_buffer): New functions.

* modules/ssl/ssl_engine_kernel.c (ssl_hook_Access): If a
renegotiation is needed, and the request has a non-zero
content-length, or a t-e header (and 100-continue was not requested),
call ssl_io_buffer_fill to set aside the request body data if
possible, then proceed with the negotiation.

PR: 12355


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291425 13f79535-47bb-0310-9956-ffa450edef68

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291271 13f79535-47bb-0310-9956-ffa450edef68

significant enough to warrant its own CHANGES entry.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@291128 13f79535-47bb-0310-9956-ffa450edef68