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

* server/request.c (core_opts_merge): When AllowOverride is specified
for the directory, ignore the inherited override_opts field.

PR: 35330
Submitted by: kabe <kabe sra-tohoku.co.jp>
Reviewed by: jorton


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

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

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

Add <glossary> tag for mime-type where appropriate.



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

Add APR to the glossary and link it in where appropriate.


Missed an end tag in the glossary.



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

Fix dtd to match <glossary> change in xsl.



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

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

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

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

  Add TraceEnable compatibility tag, and ./build.sh all causing
  lots and lots of noise this time.


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

Any failure in apr_stat on a symlink currently gives
"Symbolic link not allowed", which results in much head-scratching
if the actual problem is a broken link of some sort.  The real
fix would be to propogate the correct apr_stat error into the
error log, but that would require more refactoring than I'm
prepared to do.  This change simply expands the error message
to include both possibilities.  It improves the situation for
PR28515 but does not solve it.



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

The arrow indicator for a glossary link was cute, but I found it way too
disturbing to the flow of text.  Here I replace it with a dashed-unline.
Also, allow the omission of the ref attribute where the glossary term is
exactly equal to the link contents.


Omit reference to pre-2.0.48 versions.


Add some <glossary> markup for regular expression and regex.



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

Merge win32 htcacheclean addition into the 2.2.x branch.



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

Merge r290659 with the 2.2.x branch; add htcacheclean to the win32 build



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

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

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

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