--- apache-mod_php5-5.2.0/mod_php5.c.fix1 2006-11-08 11:37:00 +0300 +++ apache-mod_php5-5.2.0/mod_php5.c 2006-11-08 11:39:06 +0300 @@ -974,46 +974,46 @@ static void php_init_handler(server_rec php_ini_path_override(&apache_sapi_module.php_ini_path_override); php_apache_startup(&apache_sapi_module); } #if MODULE_MAGIC_NUMBER >= 19980527 { TSRMLS_FETCH(); if (PG(expose_php)) { #if SUHOSIN_PATCH - ap_add_version_component("PHP/" PHP_VERSION " with Suhosin-Patch"); + ap_add_version_component("PHP5/" PHP_VERSION " with Suhosin-Patch"); #else - ap_add_version_component("PHP/" PHP_VERSION); + ap_add_version_component("PHP5/" PHP_VERSION); #endif } } #endif } /* }}} */ /* {{{ handler_rec php_handlers[] */ handler_rec php_handlers[] = { - {"application/x-httpd-php", send_parsed_php}, - {"application/x-httpd-php-source", send_parsed_php_source}, + {"application/x-httpd-php5", send_parsed_php}, + {"application/x-httpd-php5-source", send_parsed_php_source}, {"text/html", php_xbithack_handler}, {NULL} }; /* }}} */ /* {{{ command_rec php_commands[] */ command_rec php_commands[] = { - {"php_value", php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"}, - {"php_flag", php_apache_flag_handler, NULL, OR_OPTIONS, TAKE2, "PHP Flag Modifier"}, - {"php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Value Modifier (Admin)"}, - {"php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Flag Modifier (Admin)"}, - {"PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, TAKE1, "Directory containing the php.ini file"}, + {"php5_value", php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"}, + {"php5_flag", php_apache_flag_handler, NULL, OR_OPTIONS, TAKE2, "PHP Flag Modifier"}, + {"php5_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Value Modifier (Admin)"}, + {"php5_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Flag Modifier (Admin)"}, + {"PHP5INIDir", php_apache_phpini_set, NULL, RSRC_CONF, TAKE1, "Directory containing the php.ini file"}, {NULL} }; /* }}} */ /* {{{ odule MODULE_VAR_EXPORT php5_module */ module MODULE_VAR_EXPORT php5_module = {