- fixes for apache 2.2

Changed files:
    apache-mod_suphp-apr.patch -> 1.5
    apache-mod_suphp.conf -> 1.5

diff --git a/apache-mod_suphp-apr.patch b/apache-mod_suphp-apr.patch
index c14054f7855eebc8529fa221ad24fc453b9f3e5b..dcfead6c3852fe0d533ac354452b50f464749bd2 100644 (file)
--- a/apache-mod_suphp-apr.patch
+++ b/apache-mod_suphp-apr.patch
@@ -10,6 +10,17 @@ diff -urN suphp-0.5.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_su
      {
          return 0;
      }
+@@ -313,8 +313,8 @@
+     AP_INIT_TAKE2("suPHP_UserGroup", suphp_handle_cmd_user_group, NULL, RSRC_CONF | ACCESS_CONF,
+                   "User and group scripts shall be run as"),
+ #endif
+-    AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
+-    AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
++    AP_INIT_ITERATE("suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp to handle these MIME-types"),
++    AP_INIT_ITERATE("suPHP_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF | ACCESS_CONF, "Tells mod_suphp not to handle these MIME-types"),
+     {NULL}
+ };
+ 
 @@ -524,7 +524,7 @@
              return rv;
          }

diff --git a/apache-mod_suphp.conf b/apache-mod_suphp.conf
index 5e5b2fff85ce6c7d63d45dbc2a4d9c1c093cb00a..57ad572a5560f86e8247b1254780af5c51f68089 100644 (file)
--- a/apache-mod_suphp.conf
+++ b/apache-mod_suphp.conf
@@ -4,5 +4,6 @@ LoadModule suphp_module modules/mod_suphp.so
 <IfModule suphp_module>
     suPHP_Configpath   /etc/php
     suPHP_Engine on
+    suPHP_AddHandler x-httpd-php
     AddHandler x-httpd-php .php .inc
 </IfModule>