--- apache2-mod_php5-5.2.0/sapi_apache2.c.fix1	2006-11-08 16:47:45 +0300

+++ apache2-mod_php5-5.2.0/sapi_apache2.c	2006-11-08 16:48:26 +0300

@@ -55,18 +55,18 @@

 #include "php_apache.h"

 /* UnixWare and Netware define shutdown to _shutdown, which causes problems later

  * on when using a structure member named shutdown. Since this source

  * file does not use the system call shutdown, it is safe to #undef it.K

  */

 #undef shutdown

-#define PHP_MAGIC_TYPE "application/x-httpd-php"

-#define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php-source"

+#define PHP_MAGIC_TYPE "application/x-httpd-php5"

+#define PHP_SOURCE_MAGIC_TYPE "application/x-httpd-php5-source"

 #define PHP_SCRIPT "php5-script"

 /* A way to specify the location of the php.ini dir in an apache directive */

 char *apache2_php_ini_path_override = NULL;

 static int

 php_apache_sapi_ub_write(const char *str, uint str_length TSRMLS_DC)

 {

@@ -372,19 +372,19 @@ php_apache_server_shutdown(void *tmp)

 	return APR_SUCCESS;

 }

 static void php_apache_add_version(apr_pool_t *p)

 {

 	TSRMLS_FETCH();

 	if (PG(expose_php)) {

 #if SUHOSIN_PATCH

-		ap_add_version_component(p, "PHP/" PHP_VERSION " with Suhosin-Patch");

+		ap_add_version_component(p, "PHP5/" PHP_VERSION " with Suhosin-Patch");

 #else

-		ap_add_version_component(p, "PHP/" PHP_VERSION);

+		ap_add_version_component(p, "PHP5/" PHP_VERSION);

 #endif

 	}

 }

 static int php_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp)

 {

 #ifndef ZTS

 	int threaded_mpm;

--- apache2-mod_php5-5.2.0/apache_config.c.fix1	2006-11-08 15:35:53 +0300

+++ apache2-mod_php5-5.2.0/apache_config.c	2006-11-08 16:47:45 +0300

@@ -185,6 +185,11 @@

 	AP_INIT_TAKE2("php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Value Modifier (Admin)"),

 	AP_INIT_TAKE2("php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Flag Modifier (Admin)"),

 	AP_INIT_TAKE1("PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, "Directory containing the php.ini file"),

+	AP_INIT_TAKE2("php5_value", php_apache_value_handler, NULL, OR_OPTIONS, "PHP Value Modifier"),

+	AP_INIT_TAKE2("php5_flag", php_apache_flag_handler, NULL, OR_OPTIONS, "PHP Flag Modifier"),

+	AP_INIT_TAKE2("php5_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Value Modifier (Admin)"),

+	AP_INIT_TAKE2("php5_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Flag Modifier (Admin)"),

+	AP_INIT_TAKE1("PHP5INIDir", php_apache_phpini_set, NULL, RSRC_CONF, "Directory containing the php.ini file"),

 	{NULL}

 };