fix apr_pstrcat() call in config-time error path

Reviewed by: jim, sf

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

diff --git a/STATUS b/STATUS
index 13f8c45c077af17f77e8e2f089817662032afc4f..ef169dc7c9d07c4937e7647fd0c954db86e3aa55 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -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 ]

diff --git a/modules/mappers/mod_rewrite.c b/modules/mappers/mod_rewrite.c
index d5bd56797ebd7306164dfeefab3fa08a5acdf7d1..fd293e2673e1c59fe83574480cdf6571a3934383 100644 (file)
--- a/modules/mappers/mod_rewrite.c
+++ b/modules/mappers/mod_rewrite.c
@@ -3014,7 +3014,7 @@ static const char *cmd_rewritelock(cmd_parms *cmd, void *dconf, const char *a1)
     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;