httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From traw...@apache.org
Subject svn commit: r922574 - in /httpd/httpd/branches/2.2.x: STATUS modules/mappers/mod_rewrite.c
Date Sat, 13 Mar 2010 14:10:52 GMT
Author: trawick
Date: Sat Mar 13 14:10:52 2010
New Revision: 922574

URL: http://svn.apache.org/viewvc?rev=922574&view=rev
Log:
fix apr_pstrcat() call in config-time error path

Reviewed by: jim, sf

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

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=922574&r1=922573&r2=922574&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Sat Mar 13 14:10:52 2010
@@ -86,9 +86,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  * Fix apr_pstrcat() call in 2.2.x mod_rewrite (doesn't apply to trunk).
-    2.2.x patch: http://people.apache.org/~trawick/mod_rewrite_pstrcat.txt
-    +1: trawick, jim, sf
 
 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_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c?rev=922574&r1=922573&r2=922574&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.2.x/modules/mappers/mod_rewrite.c Sat Mar 13 14:10:52 2010
@@ -3014,7 +3014,7 @@ static const char *cmd_rewritelock(cmd_p
     lockname = ap_server_root_relative(cmd->pool, a1);
 
     if (!lockname) {
-        return apr_pstrcat(cmd->pool, "Invalid RewriteLock path ", a1);
+        return apr_pstrcat(cmd->pool, "Invalid RewriteLock path ", a1, NULL);
     }
 
     return NULL;



Mime
View raw message