httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cove...@apache.org
Subject svn commit: r1447448 - in /httpd/httpd/branches/2.4.x: STATUS modules/mappers/mod_rewrite.c
Date Mon, 18 Feb 2013 19:33:18 GMT
Author: covener
Date: Mon Feb 18 19:33:18 2013
New Revision: 1447448

URL: http://svn.apache.org/r1447448
Log:
Contributed By: Evgeny Barsukov
Reviewed By: covener, humbedooh, rjung

Merge r1447426 from trunk:

Unbreak default case of RewriteBase not being set after r1410681

Contributed By: Evgeny Barsukov
Reviewed By: covener


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

Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1447448&r1=1447447&r2=1447448&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Feb 18 19:33:18 2013
@@ -92,11 +92,6 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-  * mod_rewrite: RewriteBase setting lost during merge by default (recent regression backported)
-    trunk patch: http://svn.apache.org/r1447426
-    2.4.x patch: trunk works
-    +1 covener, rjung, humbedooh
-
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c?rev=1447448&r1=1447447&r2=1447448&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_rewrite.c Mon Feb 18 19:33:18 2013
@@ -2829,6 +2829,9 @@ static void *config_perdir_merge(apr_poo
         a->baseurl = (overrides->baseurl_set == 0) ? base->baseurl : overrides->baseurl;
         a->baseurl_set = overrides->baseurl_set || base->baseurl_set;
     }
+    else { 
+        a->baseurl = overrides->baseurl;
+    }
 
     a->directory  = overrides->directory;
 



Mime
View raw message