svn commit: r649120 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS modules/mappers/mod_speling.c

[ji...@apache.org]

Author: jim
Date: Thu Apr 17 07:10:52 2008
New Revision: 649120

URL: http://svn.apache.org/viewvc?rev=649120&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=649120&r1=649119&r2=649120&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Thu Apr 17 07:10:52 2008
@@ -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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=649120&r1=649119&r2=649120&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Thu Apr 17 07:10:52 2008
@@ -88,14 +88,6 @@
 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 ]

Modified: httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c?rev=649120&r1=649119&r2=649120&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_speling.c Thu Apr 17 07:10:52 2008
@@ -225,12 +225,6 @@
         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