cvs: docweb / INSTALL.txt /www .htaccess error.php

vincent Tue Sep 21 14:51:31 2004 EDT Modified files: /docweb INSTALL.txt /docweb/www .htaccess error.php Log: This should fix the rewrite problems on doc.php.net. The AllowOverRide part seems to enable mod_rewrite (I recieved the 404 errors with AllowOverRide None) I noticed that the 500 Bad Request happens when you have the rules in the vhost and in the .htaccess I've tested this and it seems to work. The only error I spotted was when you visit /php/dochowto/, urls will get messed up after that, but I don't think that is related to this patch. http://cvs.php.net/diff.php/docweb/INSTALL.txt?r1=1.5&r2=1.6&ty=u Index: docweb/INSTALL.txt diff -u docweb/INSTALL.txt:1.5 docweb/INSTALL.txt:1.6 --- docweb/INSTALL.txt:1.5 Mon Sep 13 13:02:47 2004 +++ docweb/INSTALL.txt Tue Sep 21 14:51:30 2004 @@ -1,4 +1,4 @@ -Initial Instatllation +Initial Installation --------------------- 1. You need to run the scripts/populatedocs.sh to fetch all the required @@ -13,7 +13,7 @@ <VirtualHost 127.0.0.1:80> ServerName doc.php.net - ServerAdmin docweb@lists.php.net + ServerAdmin doc-web@lists.php.net DocumentRoot /path/to/docweb/www @@ -22,9 +22,9 @@ php_flag magic_quotes_gpc Off php_flag magic_quotes_runtime Off - RewriteEngine on - RewriteCond %{REQUEST_FILENAME} !-f - RewriteCond %{REQUEST_FILENAME} !-d - RewriteRule ^(.*)$ redirect.php + <Directory /path/to/docweb/www> + Allowoverride FileInfo Options Limit + Options -Indexes + </Directory> </VirtualHost> http://cvs.php.net/diff.php/docweb/www/.htaccess?r1=1.2&r2=1.3&ty=u Index: docweb/www/.htaccess diff -u docweb/www/.htaccess:1.2 docweb/www/.htaccess:1.3 --- docweb/www/.htaccess:1.2 Sat Sep 11 19:17:15 2004 +++ docweb/www/.htaccess Tue Sep 21 14:51:31 2004 @@ -1,11 +1,6 @@ -ErrorDocument 404 /error.php - -php_flag register_globals Off -php_flag magic_quotes_gpc Off -php_flag magic_quotes_runtime Off +# $Id: .htaccess,v 1.3 2004/09/21 18:51:31 vincent Exp $ RewriteEngine on RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d -RewriteRule ^(.*)$ redirect.php - +RewriteRule ^(.*)$ /redirect.php http://cvs.php.net/diff.php/docweb/www/error.php?r1=1.5&r2=1.6&ty=u Index: docweb/www/error.php diff -u docweb/www/error.php:1.5 docweb/www/error.php:1.6 --- docweb/www/error.php:1.5 Sat Sep 11 19:17:15 2004 +++ docweb/www/error.php Tue Sep 21 14:51:31 2004 @@ -1,9 +1,10 @@ <?php -/* $Id: error.php,v 1.5 2004/09/11 23:17:15 sean Exp $ */ +/* $Id: error.php,v 1.6 2004/09/21 18:51:31 vincent Exp $ */ include '../include/lib_general.inc.php'; -$title = 'Apache :: Error ' . $_SERVER["REDIRECT_STATUS"]; +$red_status = isset($_SERVER["REDIRECT_STATUS"]) ? $_SERVER["REDIRECT_STATUS"] : ''; +$title = 'Apache :: Error ' . $red_status; echo site_header($title); ?> <h2><?php echo $title; ?></h2>