[php-blog-cvs] serendipity index.php,1.49.2.7,1.49.2.8 NEWS,1.214.2.45,1.214.2.46 serendipity_functions_installer.inc.php,1.35.2.2,1.35.2.3

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

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

Modified Files:
      Tag: branch-smarty
	index.php NEWS serendipity_functions_installer.inc.php 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.45
retrieving revision 1.214.2.46
diff -u -d -r1.214.2.45 -r1.214.2.46
--- NEWS	2 Nov 2004 16:01:25 -0000	1.214.2.45
+++ NEWS	3 Nov 2004 10:00:50 -0000	1.214.2.46
@@ -59,6 +59,9 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Better detection if Apache ErrorDocument can be used
+      (garvinhicking)
+
     * Fixed PostgreSQL index key names (names are now unique, and
       combined indizes on the entries text-columns are no longer set)
       (jtate, garvinhicking)

Index: serendipity_functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_installer.inc.php,v
retrieving revision 1.35.2.2
retrieving revision 1.35.2.3
diff -u -d -r1.35.2.2 -r1.35.2.3
--- serendipity_functions_installer.inc.php	6 Oct 2004 19:18:15 -0000	1.35.2.2
+++ serendipity_functions_installer.inc.php	3 Nov 2004 10:00:50 -0000	1.35.2.3
@@ -297,7 +297,7 @@
                 fclose($sock);
             }
 
-            if (preg_match('@^HTTP/\d\.\d 200@', $response)) {
+            if (preg_match('@^HTTP/\d\.\d 200@', $response) && preg_match('@X\-Blog: Serendipity@', $response)) {
                 $serendipity['rewrite_default'] = 'errordocs';
             } else {
                 $serendipity['rewrite_default'] = 'none';

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.7
retrieving revision 1.49.2.8
diff -u -d -r1.49.2.7 -r1.49.2.8
--- index.php	16 Oct 2004 17:27:11 -0000	1.49.2.7
+++ index.php	3 Nov 2004 10:00:50 -0000	1.49.2.8
@@ -14,6 +14,7 @@
 // We need to set this to return a 200 since we use .htaccess ErrorDocument
 // rules to handle archives.
 header('HTTP/1.0 200\r\n');
+header('X-Blog: Serendipity'); // Used for installer detection
 
 // Session and serendipity_login() are needed to also remember an autologin
 // user on the frontend