From: Jim Jagielski <jim@apache.org>
Date: Thu, 17 Apr 2008 14:10:52 +0000 (+0000)
Subject: Merge r635953 from trunk:
X-Git-Tag: 2.2.9~240
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=85da5e2a77af7d132b74455786841c3095ab4b7f;p=thirdparty%2Fapache%2Fhttpd.git

Merge r635953 from trunk:

PR 43562.
fix regression in mod_speling behavior from 1.3/2.0
and, basically, incorrect behavior from what is
expected as well as dependency on AcceptPathInfo.

Reviewed by: jim


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@649120 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/CHANGES b/CHANGES
index 7526a1a3935..0e580f90f35 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) mod_speling: remove regression from 1.3/2.0 behavior and
+     drop dependency between mod_speling and AcceptPathInfo.
+     PR 43562 [Jose Kahan <jose w3.org>]
+
   *) mod_substitute: The default is now flattening the buckets after
      each substitution. The newly added 'q' flag allows for the
      quicker, more efficient bucket-splitting if the user so
diff --git a/STATUS b/STATUS
index 9a71521944f..b717aa13f07 100644
--- a/STATUS
+++ b/STATUS
@@ -88,14 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * mod_speling: remove regression from 1.3/2.0 behavior and
-    drop dependency between mod_speling and AcceptPathInfo.
-    PR: 43562
-   Trunk version of patch: 
-       http://svn.apache.org/viewvc?view=rev&revision=635953
-   Backport version for 2.2.x of patch:
-       Trunk version of patch works
-   +1: jim, niq, wrowe
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
index 270b47eeec3..78f58b07357 100644
--- a/modules/mappers/mod_speling.c
+++ b/modules/mappers/mod_speling.c
@@ -225,12 +225,6 @@ static int check_speling(request_rec *r)
         return DECLINED;
     }
 
-    /* we default to reject path info (same as core handler) */
-    if ((r->used_path_info != AP_REQ_ACCEPT_PATH_INFO) &&
-        r->path_info && *r->path_info) {
-        return DECLINED;
-    }
-
     /*
      * The request should end up looking like this:
      * r->uri: /correct-url/mispelling/more