Commit c185c5f2 authored by Andre Malo's avatar Andre Malo
Browse files

mod_version_for_2.0.x branch: 

* Merge 179253 to 190230 from branches/2.0.x


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/mod_version_for_2.0.x@190231 13f79535-47bb-0310-9956-ffa450edef68
parent e729fe5b

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -7,6 +7,14 @@ Changes with Apache 2.0.55 
     accompanying ap_version_t structure (minor MMN bump).

     [André Malo]













  *) SECURITY: CAN-2005-1268 (cve.mitre.org)













     mod_ssl: Fix off-by-one overflow whilst printing CRL information













     at "LogLevel debug" which could be triggered if configured 













     to use a "malicious" CRL.  PR 35081.  [Marc Stern <mstern csc.com>]

























  *) mod_userdir: Fix possible memory corruption issue.  PR 34588.













     [David Leonard <dleonard vintela.com>]



























  *) worker mpm: don't take down the whole server for a transient















     thread creation failure. PR 34514 [Greg Ames]















  

































STATUS



+27
−6






























Original line number
Diff line number
Diff line








@@ -235,12 +235,6 @@ PATCHES TO BACKPORT FROM TRUNK:













        PR: 34452















        +1: jorton





























     *) mod_userdir: fix to palloc(sizeof struct) not palloc(sizeof pointer)













        http://svn.apache.org/viewcvs?rev=165151&view=rev













        PR: 34588













        +1: jorton, bnicholes, trawick (isn't it worth a CHANGES entry for a storage













            corruption fix?)





























     *) fix z/OS annoyance with pathname on debug messages in error log















        http://svn.apache.org/viewcvs?rev=178299&view=rev















        +1: trawick









@@ -255,8 +249,35 @@ PATCHES TO BACKPORT FROM TRUNK:













     *) Support the suppress-error-charset setting, as with Apache 1.3.x.















        PR 31274. (current docs say it works with Apache from 2.0.40 ;) )















        http://svn.apache.org/viewcvs?rev=170354&view=rev













        +1: trawick, jorton



























     *) Downgrade the log level of a worker MPM apr_proc_mutex_foo error













        message when it occurs during restart (as we already do for a couple













        of other calls).













        http://svn.apache.org/viewcvs?rev=179317&view=rev













        +1: trawick, jorton



























     *) proxy FTP: Fix confusion about globbing characters which could lead













        to getting a directory listing when a file was requested.  PR 34512.













        2.1 patch was http://svn.apache.org/viewcvs?rev=179704&view=rev













        2.0 version: http://people.apache.org/~trawick/179704-20.txt













        +1: trawick, jorton



























     *) mod_mime_magic: Handle CRLF-format magic files so that it works with













        the default installation on Windows. 













        http://svn.apache.org/viewcvs?rev=179622&view=rev















        +1: trawick





























     *) mod_cache: Fix handling of 'Vary: *". PR 16125.













        Trunk: r180341













        2.0.x Patch: http://issues.apache.org/bugzilla/attachment.cgi?id=15297













        +1: pquerna



























     *) mod_ssl: Fix buffering in SSL output filter.













        http://svn.apache.org/viewcvs?rev=189971&view=rev













        PR: 35279













        +1: jorton





























PATCHES TO BACKPORT THAT ARE ON HOLD OR NOT GOING ANYWHERE SOON:































    *) Remove LDAP toolkit specific code from util_ldap and mod_auth_ldap.

































docs/conf/httpd-std.conf.in



+1
−0






























Original line number
Diff line number
Diff line








@@ -962,6 +962,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0













# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.















#















BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully













BrowserMatch "MS FrontPage" redirect-carefully















BrowserMatch "^WebDrive" redirect-carefully















BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully















BrowserMatch "^gnome-vfs" redirect-carefully

































docs/conf/httpd-win.conf



+1
−0






























Original line number
Diff line number
Diff line








@@ -881,6 +881,7 @@ BrowserMatch "JDK/1\.0" force-response-1.0













# Same deal with Apple's DAV filesystem and Gnome VFS support for DAV.















#















BrowserMatch "Microsoft Data Access Internet Publishing Provider" redirect-carefully













BrowserMatch "MS FrontPage" redirect-carefully















BrowserMatch "^WebDrive" redirect-carefully















BrowserMatch "^WebDAVFS/1.[0123]" redirect-carefully















BrowserMatch "^gnome-vfs" redirect-carefully

































docs/manual/dns-caveats.html



+4
−0






























Original line number
Diff line number
Diff line








@@ -2,6 +2,10 @@ URI: dns-caveats.html.en













Content-Language: en















Content-type: text/html; charset=ISO-8859-1





























URI: dns-caveats.html.es













Content-Language: es













Content-type: text/html; charset=ISO-8859-1





























URI: dns-caveats.html.fr















Content-Language: fr















Content-type: text/html; charset=ISO-8859-1