Browse Source

Ok, take the even larger hammer to get suPHP working again: 1. fix the path to the suphp executable (variable was renamed by author) and 2. fix implementation of new suPHP_{Add,Remove}Handler directives and 3. use suPHP_AddHandler directive in apache.base to finally glue Apache and suPHP together under run-time for .suphp scripts

master
parent
commit
662aa6e348
  1. 1
      apache/apache.base
  2. 17
      apache/apache.patch.suphp
  3. 2
      apache/apache.spec

1
apache/apache.base

@ -239,6 +239,7 @@ DefaultType text/plain
<IfModule mod_suphp.c>
suPHP_Engine on
suPHP_ConfigPath @l_prefix@/etc/php
suPHP_AddHandler x-httpd-php
AddHandler x-httpd-php .suphp
</IfModule>

17
apache/apache.patch.suphp

@ -1,6 +1,6 @@
Index: src/Configuration.cpp
--- src/Configuration.cpp.orig 2005-02-27 18:53:05 +0100
+++ src/Configuration.cpp 2005-09-07 12:09:45 +0200
+++ src/Configuration.cpp 2005-09-07 13:31:39 +0200
@@ -21,6 +21,8 @@
#include <string>
#include <vector>
@ -22,3 +22,18 @@ Index: src/Configuration.cpp
#ifdef OPT_APACHE_USER
this->webserver_user = OPT_APACHE_USER;
#else
Index: src/apache/mod_suphp.c
--- src/apache/mod_suphp.c.orig 2005-02-27 18:56:37 +0100
+++ src/apache/mod_suphp.c 2005-09-07 13:32:19 +0200
@@ -249,9 +249,9 @@
{"suPHP_UserGroup", suphp_handle_cmd_user_group, NULL,
RSRC_CONF|ACCESS_CONF, TAKE2, "User and group scripts shall be run as"},
#endif
- {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, ACCESS_CONF,
+ {"suPHP_AddHandler", suphp_handle_cmd_add_handler, NULL, RSRC_CONF|ACCESS_CONF,
ITERATE, "Tells mod_suphp to handle these MIME-types"},
- {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, ACCESS_CONF,
+ {"suphp_RemoveHandler", suphp_handle_cmd_remove_handler, NULL, RSRC_CONF|ACCESS_CONF,
ITERATE, "Tells mod_suphp not to handle these MIME-types"},
{NULL}
};

2
apache/apache.spec

@ -1078,7 +1078,7 @@ AutoReqProv: no
libs="$libs -limap -lmodphp4 -limap"
%endif
%if "%{with_suphp}" == "yes"
cflags="$cflags -DPATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
cflags="$cflags -DSUPHP_PATH_TO_SUPHP='\"%{l_prefix}/sbin/suphp\"'"
%endif
CC="%{l_cc}" \
CFLAGS="$cflags" \

Loading…
Cancel
Save