[php-blog-cvs] serendipity NEWS,1.205,1.206 htaccess.cgi.rewrite.tpl,1.2,1.3 htaccess.rewrite.tpl,1.15,1.16

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8855

Modified Files:
	NEWS htaccess.cgi.rewrite.tpl htaccess.rewrite.tpl 
Log Message:
mod_rewrite should use RewriteBase


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.205
retrieving revision 1.206
diff -u -d -r1.205 -r1.206
--- NEWS	24 Aug 2004 17:32:45 -0000	1.205
+++ NEWS	30 Aug 2004 14:20:06 -0000	1.206
@@ -3,6 +3,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * When using mod_rewrite, make use of RewriteBase for correct
+      subdirectory matching. Thanks to Martin Roell! (garvinhicking)
+
     * Don't use the title of an entry in the RSS feed <guid></guid> tags
       (tomsommer)
 

Index: htaccess.cgi.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.cgi.rewrite.tpl,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- htaccess.cgi.rewrite.tpl	24 Aug 2004 17:32:45 -0000	1.2
+++ htaccess.cgi.rewrite.tpl	30 Aug 2004 14:20:07 -0000	1.3
@@ -3,6 +3,7 @@
 DirectoryIndex {PREFIX}{indexFile}
 
 RewriteEngine On
+RewriteBase {PREFIX}
 RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
 RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1-short.html [L,NC,QSA]
 RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA]

Index: htaccess.rewrite.tpl
===================================================================
RCS file: /cvsroot/php-blog/serendipity/htaccess.rewrite.tpl,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- htaccess.rewrite.tpl	24 Aug 2004 17:32:45 -0000	1.15
+++ htaccess.rewrite.tpl	30 Aug 2004 14:20:14 -0000	1.16
@@ -5,6 +5,7 @@
 php_value register_globals off
 
 RewriteEngine On
+RewriteBase {PREFIX}
 RewriteRule ^{PAT_ARCHIVES} {indexFile}?url=/{PATH_ARCHIVES}/$1.html [L,QSA]
 RewriteRule ^{PAT_ARCHIVES_SHORT} {indexFile}?url=/{PATH_ARCHIVES}/$1-short.html [L,NC,QSA]
 RewriteRule ^([0-9]+)[_\-][0-9a-z_\-]*\.html {indexFile}?url=$1-article.html [L,NC,QSA]