- use conf.d for apache config fragment; rel 2

[packages/apache-mod_suphp.git] / apache-mod_suphp-apr.patch

diff --git a/apache-mod_suphp-apr.patch b/apache-mod_suphp-apr.patch
index 2d93e69addac2b2a526a178348b00945bcd209f2..30476b37e1956d882162b2dd1d50d2bfc90b63a8 100644 (file)
--- a/apache-mod_suphp-apr.patch
+++ b/apache-mod_suphp-apr.patch
@@ -1,30 +1,86 @@
-diff -urN suphp-0.5.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_suphp.c
---- suphp-0.5.2.org/src/apache2/mod_suphp.c    2004-10-20 22:35:50.075483226 +0200
-+++ suphp-0.5.2/src/apache2/mod_suphp.c        2004-10-20 22:38:22.569814891 +0200
-@@ -524,7 +524,7 @@
-             return rv;
-         }
-         
--        APR_BRIGADE_FOREACH(bucket, bb)
-+      for(bucket = APR_BRIGADE_FIRST(bb); bucket != APR_BRIGADE_SENTINEL(bb); bucket = APR_BRIGADE_SENTINEL(bb))
-         {
-             const char *data;
-             apr_size_t len;
-@@ -595,7 +595,7 @@
-             
-             const char *buf;
-             apr_size_t blen;
--            APR_BRIGADE_FOREACH(b, bb)
-+          for(b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BRIGADE_SENTINEL(bb))
-             {
-                 if (APR_BUCKET_IS_EOS(b))
-                     break;
-@@ -616,7 +616,7 @@
-             /* empty brigade (script output) */
-             const char *buf;
-             apr_size_t blen;
--            APR_BRIGADE_FOREACH(b, bb)
-+          for(b = APR_BRIGADE_FIRST(bb); b != APR_BRIGADE_SENTINEL(bb); b = APR_BRIGADE_SENTINEL(bb))
-             {
-                 if (APR_BUCKET_IS_EOS(b))
-                     break;
+diff -urN suphp-0.6.2.org/src/apache2/mod_suphp.c suphp-0.5.2/src/apache2/mod_suphp.c
+--- suphp-0.6.2.org/src/apache2/mod_suphp.c    2004-10-23 12:58:09.156787800 +0200
++++ suphp-0.6.2/src/apache2/mod_suphp.c        2004-10-23 12:59:23.461491768 +0200
+@@ -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}
+ };
+ 
+--- suphp-0.6.2/acinclude.m4.orig      2007-09-17 14:42:24.000000000 +0000
++++ suphp-0.6.2/acinclude.m4   2007-09-17 14:44:54.000000000 +0000
+@@ -40,7 +40,7 @@
+ dnl value of apr_config to fetch any necessary build/link information.
+ dnl
+ 
+-AC_DEFUN(APR_FIND_APR, [
++AC_DEFUN([APR_FIND_APR], [
+   apr_found="no"
+ 
+   if test "$ac_cv_emxos2" = "yes"; then
+@@ -53,18 +53,18 @@
+   AC_MSG_CHECKING(for APR)
+   AC_ARG_WITH(apr,
+   [  --with-apr=DIR|FILE     prefix for installed APR, path to APR build tree,
+-                          or the full path to apr-config],
++                          or the full path to apr-1-config],
+   [
+     if test "$withval" = "no" || test "$withval" = "yes"; then
+       AC_MSG_ERROR([--with-apr requires a directory to be provided])
+     fi
+ 
+-    if $TEST_X "$withval/bin/apr-config"; then
++    if $TEST_X "$withval/bin/apr-1-config"; then
+       apr_found="yes"
+-      apr_config="$withval/bin/apr-config"
+-    elif $TEST_X "$withval/apr-config"; then
++      apr_config="$withval/bin/apr-1-config"
++    elif $TEST_X "$withval/apr-1-config"; then
+       apr_found="yes"
+-      apr_config="$withval/apr-config"
++      apr_config="$withval/apr-1-config"
+     elif $TEST_X "$withval/bin/apr-1-config"; then
+       apr_found="yes"
+       apr_config="$withval/bin/apr-1-config"
+@@ -79,7 +79,7 @@
+     dnl if --with-apr is used, then the target prefix/directory must be valid
+     if test "$apr_found" != "yes"; then
+       AC_MSG_ERROR([the --with-apr parameter is incorrect. It must specify an install prefix, a
+-build directory, or an apr-config file.])
++build directory, or an apr-1-config file.])
+     fi
+   ],[
+     dnl if we have a bundled source directory, use it
+@@ -87,21 +87,21 @@
+       apr_temp_abs_srcdir="`cd $1 && pwd`"
+       apr_found="reconfig"
+       if test -n "$2"; then
+-        apr_config="$2/apr-config"
++        apr_config="$2/apr-1-config"
+       else
+-        apr_config="$1/apr-config"
++        apr_config="$1/apr-1-config"
+       fi
+     fi
+     if test "$apr_found" = "no" && test -n "$3" && test "$3" = "1"; then
+-      if apr-config --help > /dev/null 2>&1 ; then
++      if apr-1-config --help > /dev/null 2>&1 ; then
+         apr_found="yes"
+-        apr_config="apr-config"
++        apr_config="apr-1-config"
+       else
+         dnl look in some standard places (apparently not in builtin/default)
+         for lookdir in /usr /usr/local /opt/apr /usr/local/apache2 ; do
+-          if $TEST_X "$lookdir/bin/apr-config"; then
++          if $TEST_X "$lookdir/bin/apr-1-config"; then
+             apr_found="yes"
+-            apr_config="$lookdir/bin/apr-config"
++            apr_config="$lookdir/bin/apr-1-config"
+             break
+           fi
+         done