mod_speling: Stop crashing with certain non-file requests.

(r->filename unset)

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

diff --git a/CHANGES b/CHANGES
index 1f7b0eaa558789f084f36db541182ff9718dbc48..d8e7575f84d9404651a74ad9d34d2873c469a84c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,8 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) mod_speling: Stop crashing with certain non-file requests.  [Jeff Trawick]
+
   *) mod_proxy_ajp: Support common headers of the AJP protocol in responses.
      PR 38340. [Aleksey Pesternikov <apesternikov yahoo.com>, Ruediger Pluem]
 

diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index a7b9b9ff1699b045ec70014fca6f567b9b222841..2c427df254ed38f12f284283fd509efad34a1ba2 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;
     }