Index: trunk/CHANGELOG =================================================================== --- trunk/CHANGELOG (revision 731) +++ trunk/CHANGELOG (revision 732) @@ -11,6 +11,8 @@ ! = Update/Change ------------------------------------- 2.7.0 ------------------------------------- +01-Feb-2008 Thomas Hornik ++ added check for AddDefaultCharset to install 29-Feb-2008 Thomas Hornik # fixed issue in pagename generation if AddDefaultCharset is set (as work-around). 28-Feb-2008 Thomas Hornik Index: trunk/wb/install/index.php =================================================================== --- trunk/wb/install/index.php (revision 731) +++ trunk/wb/install/index.php (revision 732) @@ -54,6 +54,21 @@ } } +// Check if AddDefaultCharset is set +$e_adc=false; +$sapi=php_sapi_name(); +if(strpos($sapi, 'apache')!==FALSE || strpos($sapi, 'nsapi')!==FALSE) { + flush(); + $apache_rheaders=apache_response_headers(); + foreach($apache_rheaders AS $h) { + if(strpos($h, 'html; charset')!==FALSE) { + preg_match('/charset\s*=\s*([a-zA-Z0-9- _]+)/', $h, $match); + $apache_charset=$match[1]; + $e_adc=$apache_charset; + } + } +} + ?> @@ -115,16 +130,16 @@ ?> - + Enabled') { ?> - + - - + - - + + + + + + + + + + + +

Step 1

Please check the following requirements are met before continuing...

Step 1

Please check the following requirements are met before continuing...
Please note: PHP Session Support may appear disabled if your browser does not support cookies.Please note: PHP Session Support may appear disabled if your browser does not support cookies.
PHP Version > 4.1.0 + PHP Version > 4.1.0 4.1) { @@ -135,8 +150,8 @@ ?> PHP Session SupportPHP Safe ModePHP Safe Mode
AddDefaultCharset unset + NoYes +  
Please note: AddDefaultCharset is set to in apache.conf.
If you have to use umlauts (e.g. ä á) please change this to Off. - Or use inside website baker, too.