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

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

clarify LDAPConnectionTimeout behavior/availability which is really just 
passed along to the SDK when applicable.




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

Further mitigation for the TLS renegotation attack, CVE-2009-3555:

* modules/ssl/ssl_engine_kernel.c (has_buffered_data): New function.
  (ssl_hook_Access): Forcibly disable keepalive for the connection if
  there is any buffered data readable from the input filter stack.

* modules/ssl/ssl_engine_io.c (ssl_io_filter_input): Ensure that the
  BIO uses blocking operations when invoked outside direct control of
  the httpd filter stack.

Thanks to Hartmut Keil <Hartmut.Keil adnovum.ch> for proposing this
technique.

Submitted by: jorton
Reviewed by: rpluem, jim, trawick


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

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

clarify that FileETag is for static files only, and explicitly mention 
that ETags aren't generated for files parsed by mod_include.




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

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

Similar to r893874, fix the ProxyPass example accoding to the trailing slash rule.
PR: 48459


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

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

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

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

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

Fix the ProxyPass example according to the trailing slash rule.

Submitted by: inoue <inoue ariel-networks.com>
PR: 48444

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

Submitted by: HANAWA Yoshio <hanawa dino.co.jp>
Reviewed by:  takashi


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

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

Submitted by: OZAWA Sakuro <ozawa feedforce.jp>
Reviewed by:  takashi


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

the configuration file.

PR: 46333
Patch submitted by: Nathan Stratton Treadway


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

      PR 48054
          Trunk patch: n/a (trunk upgraded to use ap_expr for condition testing)
              2.2.x patch: https://issues.apache.org/bugzilla/attachment.cgi?id=24418
                  +1: niq, rpluem, jim



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

      per RFC 2616, 13.8.
          PR 15866
              Trunk Patch: http://svn.apache.org/viewvc?rev=818492&view=rev
                               http://svn.apache.org/viewvc?rev=821763&view=rev
                                   2.2.x Patch: http://people.apache.org/~poirier/PR15866-22x.patch
                                       +1: poirier, rpluem, rjung, jim




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

Build: fix --with-module to work as documented
PR 43881
Submitted: Gez Saunders
Reviewed: Nick Kew


Submitted by: niq
Reviewed/backported by: jim


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

Make RemoveType override the info from TypesConfig

Submitted by: sf
Reviewed/backported by: jim


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

Work around broken cache management in mod_ldap: If LDAPSharedCacheSize is too
small, try to free some memory by purging the cache and log a warning.

Also increase the default LDAPSharedCacheSize to 500000. This is a more
realistic size suitable for the default values of 1024 for LdapCacheEntries and
LdapOpCacheEntries.

PR: 46749

Submitted by: sf
Reviewed/backported by: jim


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

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

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

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

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

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

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

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

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

Add link from glossary entry for regular expressions to the wikipedia entry,
which seems to be a good reference for PCRE's flavor of regular expression syntax.


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

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

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

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

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

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

with Fedora. Remove the use of the apachectl script, as a script calling
another script makes no sense. Test for the pidfile specifically, so
that Redhat's scripts don't fall back to using pidof and returning the
status of other httpd processes running on the same box.


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

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

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

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