Commit 938cb0e7 authored by Jim Jagielski's avatar Jim Jagielski
Browse files

Sync with recently backported patches 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@534074 13f79535-47bb-0310-9956-ffa450edef68
parent 26130c99

CHANGES

+19 −11
Original line number Diff line number Diff line
@@ -2,17 +2,6 @@ 
Changes with Apache 2.3.0

  [Remove entries to the current 2.0 and 2.2 section below, when backported]













  *) HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only













     processing of error responses (4xx, 5xx) will be altered.  PR 39245.













     [Jeff Trawick, Bart van der Schans <schans hippo.nl>]

























  *) htdbm: Enable crypt support on platforms with crypt() but not













     <crypt.h>, such as z/OS. [David Jones <oscaremma gmail.com>]

























  *) mod_ssl: initialize thread locks before initializing the hardware













     acceleration library, so the latter can make use of the former. 













     PR 20951. [adunn at ncipher.com, reviewed by Sander Temme]



























  *) mod_so: Solve dev's confusion by reporting expected/seen module















     magic signatures when failing with a 'garbled' message, and solve















     user's confusion by pointing out 'perhaps compiled for a different










@@ -276,6 +265,25 @@ Changes with Apache 2.3.0



























Changes with Apache 2.2.5



























  *) HTTP proxy ProxyErrorOverride: Leave 1xx and 3xx responses alone.  Only













     processing of error responses (4xx, 5xx) will be altered.  PR 39245.













     [Jeff Trawick, Bart van der Schans <schans hippo.nl>]

























  *) htdbm: Enable crypt support on platforms with crypt() but not













     <crypt.h>, such as z/OS. [David Jones <oscaremma gmail.com>]

























  *) mod_ssl: initialize thread locks before initializing the hardware













     acceleration library, so the latter can make use of the former. 













     PR 20951. [adunn at ncipher.com]

























  *) ab.c: Correct behavior of HTTP request headers sent by ab













     in presence of -H command-line overrides. PR 31268, 26554.













     [Arvind Srinivasan <arvind.srinivasan  sun.com>]

























  *) ab.c: The apr_port_t type is unsigned, but ab was using a













     signed format code in its reports. PR 42070.













     [Takashi Sato <serai  lans-tv.com>]



























  *) core: Correct a regression since 2.0.x in the handling of AllowOverride 















     Options.  PR 41829.  [Torsten Förtsch <torsten.foertsch gmx.net>]