Commit 88f996e7 authored by Colm MacCarthaigh's avatar Colm MacCarthaigh
Browse files

Merge r385580 from 2.2.x: 

    * merge fix to mod_speling crash when r->filename is not set

Reviewed by: jerenkrantz, jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@390518 13f79535-47bb-0310-9956-ffa450edef68
parent 6094b011

CHANGES

+3 −1
Original line number Diff line number Diff line 
                                                         -*- coding: utf-8 -*-

Changes with Apache 2.0.56

    

    

  *) SECURITY: CVE-2005-3357 (cve.mitre.org)

     mod_ssl: Fix a possible crash during access control checks if a

     non-SSL request is processed for an SSL vhost (such as the
@@ -15,6 +14,9 @@ Changes with Apache 2.0.56 
     ap_escape_html so we escape quotes.  Reported by JPCERT.

     [Mark Cox]













  *) mod_speling: Stop crashing with certain non-file requests.  













     [Jeff Trawick]



























  *) keep the Content-Length header for a HEAD with no response body.















     PR 18757 [Greg Ames]















 

































STATUS



+0
−3






























Original line number
Diff line number
Diff line








@@ -112,9 +112,6 @@ RELEASE SHOWSTOPPERS:













PATCHES ACCEPTED TO BACKPORT FROM TRUNK:















  [ start all new proposals below, under PATCHES PROPOSED. ]





























    *) mod_speling: Don't crash if r->filename is unset.













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













       +1: trawick, niq, colm































PATCHES PROPOSED TO BACKPORT FROM TRUNK:















  [ please place SVN revisions from trunk here, so it is easy to

































modules/mappers/mod_speling.c



+6
−1






























Original line number
Diff line number
Diff line








@@ -213,7 +213,12 @@ static int check_speling(request_rec *r)













    }































    /* We've already got a file of some kind or another */













    if (r->proxyreq || (r->finfo.filetype != 0)) {













    if (r->finfo.filetype != 0) {













        return DECLINED;













    }



























    /* Not a file request */













    if (r->proxyreq || !r->filename) {















        return DECLINED;















    }