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

diff --git a/CHANGES b/CHANGES
index 1d1a07bd1ab540ba25b0be4170bf4420acbf0c8b..065130f3cc45fc5f6ce52d4832ac229e1bdd0722 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,5 @@
                                                          -*- 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
@@ -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]
  

diff --git a/STATUS b/STATUS
index f690e63e8af0cc6bb6fe68cc46a8a8c3c47c3978..7876270344ddc6982943b1920b01b86b667ac43e 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 3d57b9b2804d3581df737781a9d4fa18d6cd1e2f..8d2b506ff1dc7d2abe7189eb4cfb1d425123240c 100644 (file)
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -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;
     }