httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pque...@apache.org
Subject svn commit: r390606 - in /httpd/httpd/branches/2.2.x: STATUS modules/filters/mod_include.c
Date Sat, 01 Apr 2006 06:48:44 GMT
Author: pquerna
Date: Fri Mar 31 22:48:43 2006
New Revision: 390606

URL: http://svn.apache.org/viewcvs?rev=390606&view=rev
Log:
Merge r382147 from trunk:
  APR_FILEPATH_NOTABOVEROOT was undefined with a left-hand NULL
  or empty path.  The SECUREROOTPATH and NOTABSOLUTE tests were
  sufficient for this application.  Adjusts for a bug in earlier
  versions of APR with this undefined value.

Modified:
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/modules/filters/mod_include.c

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/STATUS?rev=390606&r1=390605&r2=390606&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Fri Mar 31 22:48:43 2006
@@ -83,14 +83,6 @@
          Trunk version of patch works
       +1: rpluem, jim, pquerna
 
-    * mod_include:  APR_FILEPATH_NOTABOVEROOT was undefined with
-      a left-hand NULL or empty path.  The SECUREROOTPATH and 
-      NOTABSOLUTE tests are sufficient for this application.  
-      Adjust for this bug in earlier versions of APR that mishandled
-      the NOTABOVEROOT flag with an empty left hand value.
-        http://svn.apache.org/viewcvs?rev=382147&view=rev
-      +1: wrowe, bnicholes, pquerna
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
     * mod_dbd: When threaded, create a private pool in child_init

Modified: httpd/httpd/branches/2.2.x/modules/filters/mod_include.c
URL: http://svn.apache.org/viewcvs/httpd/httpd/branches/2.2.x/modules/filters/mod_include.c?rev=390606&r1=390605&r2=390606&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/filters/mod_include.c (original)
+++ httpd/httpd/branches/2.2.x/modules/filters/mod_include.c Fri Mar 31 22:48:43 2006
@@ -1539,7 +1539,6 @@
 
         /* be safe; only files in this directory or below allowed */
         rv = apr_filepath_merge(&newpath, NULL, tag_val,
-                                APR_FILEPATH_NOTABOVEROOT |
                                 APR_FILEPATH_SECUREROOTTEST |
                                 APR_FILEPATH_NOTABSOLUTE, r->pool);
 
@@ -1655,7 +1654,6 @@
 
             /* be safe; only files in this directory or below allowed */
             rv = apr_filepath_merge(&newpath, NULL, parsed_string,
-                                    APR_FILEPATH_NOTABOVEROOT |
                                     APR_FILEPATH_SECUREROOTTEST |
                                     APR_FILEPATH_NOTABSOLUTE, ctx->dpool);
 



Mime
View raw message