Download | Plain Text | No Line Numbers 

  1. diff -Naur php-5.3.2.orig/sapi/apache/mod_php5.c php-5.3.2/sapi/apache/mod_php5.c
  2. --- php-5.3.2.orig/sapi/apache/mod_php5.c	2010-02-05 20:34:47.000000000 +0100
  3. +++ php-5.3.2/sapi/apache/mod_php5.c	2010-06-04 00:07:55.000000000 +0200
  4. @@ -991,8 +991,8 @@
  5.   */
  6.  command_rec php_commands[] =
  7.  {
  8. -	{"php_value",		php_apache_value_handler, NULL, OR_OPTIONS, TAKE2, "PHP Value Modifier"},
  9. -	{"php_flag",		php_apache_flag_handler, NULL, OR_OPTIONS, TAKE2, "PHP Flag Modifier"},
  10. +	{"php_value",		php_apache_value_handler, NULL, OR_OPTIONS|OR_FILEINFO, TAKE2, "PHP Value Modifier"},
  11. +	{"php_flag",		php_apache_flag_handler, NULL, OR_OPTIONS|OR_FILEINFO, TAKE2, "PHP Flag Modifier"},
  12.  	{"php_admin_value",	php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Value Modifier (Admin)"},
  13.  	{"php_admin_flag",	php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, TAKE2, "PHP Flag Modifier (Admin)"},
  14.  	{"PHPINIDir",		php_apache_phpini_set, NULL, RSRC_CONF, TAKE1, "Directory containing the php.ini file"},
  15. diff -Naur php-5.3.2.orig/sapi/apache2filter/apache_config.c php-5.3.2/sapi/apache2filter/apache_config.c
  16. --- php-5.3.2.orig/sapi/apache2filter/apache_config.c	2010-01-03 10:23:27.000000000 +0100
  17. +++ php-5.3.2/sapi/apache2filter/apache_config.c	2010-06-04 00:08:24.000000000 +0200
  18. @@ -180,8 +180,8 @@
  19.  
  20.  const command_rec php_dir_cmds[] =
  21.  {
  22. -	AP_INIT_TAKE2("php_value", php_apache_value_handler, NULL, OR_OPTIONS, "PHP Value Modifier"),
  23. -	AP_INIT_TAKE2("php_flag", php_apache_flag_handler, NULL, OR_OPTIONS, "PHP Flag Modifier"),
  24. +	AP_INIT_TAKE2("php_value", php_apache_value_handler, NULL, OR_OPTIONS|OR_FILEINFO, "PHP Value Modifier"),
  25. +	AP_INIT_TAKE2("php_flag", php_apache_flag_handler, NULL, OR_OPTIONS|OR_FILEINFO, "PHP Flag Modifier"),
  26.  	AP_INIT_TAKE2("php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Value Modifier (Admin)"),
  27.  	AP_INIT_TAKE2("php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Flag Modifier (Admin)"),
  28.  	AP_INIT_TAKE1("PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, "Directory containing the php.ini file"),
  29. diff -Naur php-5.3.2.orig/sapi/apache2handler/apache_config.c php-5.3.2/sapi/apache2handler/apache_config.c
  30. --- php-5.3.2.orig/sapi/apache2handler/apache_config.c	2010-01-03 10:23:27.000000000 +0100
  31. +++ php-5.3.2/sapi/apache2handler/apache_config.c	2010-06-04 00:08:43.000000000 +0200
  32. @@ -202,8 +202,8 @@
  33.  
  34.  const command_rec php_dir_cmds[] =
  35.  {
  36. -	AP_INIT_TAKE2("php_value", php_apache_value_handler, NULL, OR_OPTIONS, "PHP Value Modifier"),
  37. -	AP_INIT_TAKE2("php_flag", php_apache_flag_handler, NULL, OR_OPTIONS, "PHP Flag Modifier"),
  38. +	AP_INIT_TAKE2("php_value", php_apache_value_handler, NULL, OR_OPTIONS|OR_FILEINFO, "PHP Value Modifier"),
  39. +	AP_INIT_TAKE2("php_flag", php_apache_flag_handler, NULL, OR_OPTIONS|OR_FILEINFO, "PHP Flag Modifier"),
  40.  	AP_INIT_TAKE2("php_admin_value", php_apache_admin_value_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Value Modifier (Admin)"),
  41.  	AP_INIT_TAKE2("php_admin_flag", php_apache_admin_flag_handler, NULL, ACCESS_CONF|RSRC_CONF, "PHP Flag Modifier (Admin)"),
  42.  	AP_INIT_TAKE1("PHPINIDir", php_apache_phpini_set, NULL, RSRC_CONF, "Directory containing the php.ini file"),
  43.