[php-blog-cvs] serendipity serendipity_admin_installer.inc.php,1.59.4.2,1.59.4.3

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

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

Modified Files:
      Tag: branch_0_6
	serendipity_admin_installer.inc.php 
Log Message:
better errorhandler detection


Index: serendipity_admin_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_installer.inc.php,v
retrieving revision 1.59.4.2
retrieving revision 1.59.4.3
diff -u -d -r1.59.4.2 -r1.59.4.3
--- serendipity_admin_installer.inc.php	13 Apr 2004 10:55:04 -0000	1.59.4.2
+++ serendipity_admin_installer.inc.php	4 May 2004 08:56:49 -0000	1.59.4.3
@@ -157,6 +157,7 @@
         $old_htaccess = @file_get_contents('./.htaccess');
         $fp = @fopen('./.htaccess', 'w');
         $serendipity_root = str_replace(basename($_SERVER['PHP_SELF']), '', $_SERVER['PHP_SELF']);
+        $serendipity_host = preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']);
 
         if (!$fp) {
             printf(HTACCESS_ERROR,
@@ -168,11 +169,14 @@
             fclose($fp);
 
             // Do a request on a nonexistant file to see, if our htaccess allows ErrorDocument
-            $sock = fsockopen(preg_replace('@^([^:]+):?.*$@', '\1', $_SERVER['HTTP_HOST']), $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
+            $sock = fsockopen($serendipity_host, $_SERVER['SERVER_PORT'], $errorno, $errorstring, 10);
             $response = '';
 
             if ($sock) {
-                fputs($sock, "GET {$_SERVER['REQUEST_URI']}nonexistant HTTP/1.0\n\n");
+                fputs($sock, "GET {$_SERVER['REQUEST_URI']}nonexistant HTTP/1.0\n");
+                fputs($sock, "Host: $serendipity_host\n");
+                fputs($sock, "Connection: close\n\n");
+
                 while (!feof($sock) && strlen($response) < 4096) {
                     $response .= fgets($sock, 400);
                 }