httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From minf...@apache.org
Subject svn commit: r1485721 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS modules/dav/main/mod_dav.c
Date Thu, 23 May 2013 14:14:19 GMT
Author: minfrin
Date: Thu May 23 14:14:19 2013
New Revision: 1485721

URL: http://svn.apache.org/r1485721
Log:
mod_dav: Ensure URI is correctly uriencoded on return. PR 54611

trunk patch: http://svn.apache.org/r1476621
Submitted by: Timothy Wood <tjw omnigroup.com>
Reviewed by: minfrin, jim, covener

Modified:
    httpd/httpd/branches/2.4.x/   (props changed)
    httpd/httpd/branches/2.4.x/CHANGES
    httpd/httpd/branches/2.4.x/STATUS
    httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c

Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
  Merged /httpd/httpd/trunk:r1476621

Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1485721&r1=1485720&r2=1485721&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Thu May 23 14:14:19 2013
@@ -2,6 +2,9 @@
 
 Changes with Apache 2.4.5
 
+  *) mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
+     [Timothy Wood <tjw omnigroup.com>]
+
   *) core: apachectl -S prints wildcard name-based virtual hosts twice. 
      PR54948 [Eric Covener]
 

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1485721&r1=1485720&r2=1485721&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu May 23 14:14:19 2013
@@ -90,11 +90,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-    * mod_dav: Ensure URI is correctly uriencoded on return. PR 54611
-      trunk patch: http://svn.apache.org/r1476621
-      2.4.x patch: trunk patch works (minus CHANGES)
-      +1: minfrin, jim, covener
-
     * core: speed up (for common cases) and reduce memory usage of ap_escape_logitem
       This should save 70-100 bytes in the request pool for a default config.
       trunk patch: http://svn.apache.org/r1485409

Modified: httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c?rev=1485721&r1=1485720&r2=1485721&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c (original)
+++ httpd/httpd/branches/2.4.x/modules/dav/main/mod_dav.c Thu May 23 14:14:19 2013
@@ -611,7 +611,9 @@ static int dav_created(request_rec *r, c
     const char *body;
 
     if (locn == NULL) {
-        locn = r->uri;
+        locn = r->unparsed_uri;
+    } else {
+        locn = ap_escape_uri(r->pool, locn);
     }
 
     /* did the target resource already exist? */



Mime
View raw message