php4-apache24.patch

   1 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/acinclude.m4 php-4.4.9.changed/acinclude.m4
   2 --- php-4.4.9.org/acinclude.m4  2013-10-07 13:35:57.560042156 +0200
   3 +++ php-4.4.9.changed/acinclude.m4      2013-10-07 13:35:39.659624293 +0200
   4 @@ -2007,6 +2007,10 @@
   5    ac_output=`$1 -v 2>&1`
   6  fi
   7
   8 +  if test -n "$FORCE_APACHE_VERSION"; then
   9 +    ac_output="Server version: Apache/${FORCE_APACHE_VERSION} (PLD/Linux)"
  10 +  fi
  11 +
  12    ac_IFS=$IFS
  13  IFS="- /.
  14  "
  15 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/configure.in php-4.4.9.changed/configure.in
  16 --- php-4.4.9.org/configure.in  2013-10-07 13:35:57.586709445 +0200
  17 +++ php-4.4.9.changed/configure.in      2013-10-07 13:34:26.551250929 +0200
  18 @@ -1421,6 +1421,21 @@
  19  X
  20    fi
  21
  22 +  if test "$PHP_SAPI" = "apache2handler" || test "$PHP_SAPI" = "apache2filter"; then
  23 +    if test "$APACHE_VERSION" -ge 2004001; then
  24 +      if test -z "$APACHE_THREADED_MPM"; then
  25 +cat <<X
  26 ++--------------------------------------------------------------------+
  27 +|                        *** WARNING ***                             |
  28 +|                                                                    |
  29 +| You have built PHP for Apache's current non-threaded MPM.          |
  30 +| If you change Apache to use a threaded MPM you must reconfigure    |
  31 +| PHP with --enable-maintainer-zts                                   |
  32 +X
  33 +      fi
  34 +    fi
  35 +  fi
  36 +
  37    # Warn about linking Apache with libpthread if oci8 extension is enabled on linux.
  38    if test "$PHP_OCI8" != "no" -o "$PHP_ORACLE" != "no"; then
  39      if test "$PHP_SAPI" = "apache"; then
  40 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/sapi/apache2filter/config.m4 php-4.4.9.changed/sapi/apache2filter/config.m4
  41 --- php-4.4.9.org/sapi/apache2filter/config.m4  2004-12-17 00:14:28.000000000 +0100
  42 +++ php-4.4.9.changed/sapi/apache2filter/config.m4      2013-10-07 13:34:26.551250929 +0200
  43 @@ -36,7 +36,6 @@
  44    APXS_BINDIR=`$APXS -q BINDIR`
  45    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
  46    APXS_CFLAGS=`$APXS -q CFLAGS`
  47 -  APXS_MPM=`$APXS -q MPM_NAME`
  48    APU_BINDIR=`$APXS -q APU_BINDIR`
  49    APR_BINDIR=`$APXS -q APR_BINDIR`
  50
  51 @@ -115,8 +114,16 @@
  52      ;;
  53    esac
  54
  55 -  if test "$APXS_MPM" != "prefork"; then
  56 -    PHP_BUILD_THREAD_SAFE
  57 +  if test "$APACHE_VERSION" -lt 2004001; then
  58 +    APXS_MPM=`$APXS -q MPM_NAME`
  59 +    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
  60 +      PHP_BUILD_THREAD_SAFE
  61 +    fi
  62 +  else
  63 +    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
  64 +    if test -n "$APACHE_THREADED_MPM"; then
  65 +      PHP_BUILD_THREAD_SAFE
  66 +    fi
  67    fi
  68    AC_MSG_RESULT(yes)
  69
  70 diff -ur -x configure -x aclocal.m4 -x config.guess -x config.sub -x '*.orig' -x install-sh -x ltmain.sh -x php_config.h.in php-4.4.9.org/sapi/apache2handler/config.m4 php-4.4.9.changed/sapi/apache2handler/config.m4
  71 --- php-4.4.9.org/sapi/apache2handler/config.m4 2013-10-07 13:35:57.520041222 +0200
  72 +++ php-4.4.9.changed/sapi/apache2handler/config.m4     2013-10-07 13:34:26.551250929 +0200
  73 @@ -35,7 +35,6 @@
  74    APXS_BINDIR=`$APXS -q BINDIR`
  75    APXS_HTTPD=`$APXS -q SBINDIR`/`$APXS -q TARGET`
  76    APXS_CFLAGS=`$APXS -q CFLAGS`
  77 -  APXS_MPM=`$APXS -q MPM_NAME`
  78    APU_BINDIR=`$APXS -q APU_BINDIR`
  79    APR_BINDIR=`$APXS -q APR_BINDIR`
  80
  81 @@ -114,8 +113,16 @@
  82      ;;
  83    esac
  84
  85 -  if test "$APXS_MPM" != "prefork"; then
  86 -    PHP_BUILD_THREAD_SAFE
  87 +  if test "$APACHE_VERSION" -lt 2004001; then
  88 +    APXS_MPM=`$APXS -q MPM_NAME`
  89 +    if test "$APXS_MPM" != "prefork" && test "$APXS_MPM" != "peruser" && test "$APXS_MPM" != "itk"; then
  90 +      PHP_BUILD_THREAD_SAFE
  91 +    fi
  92 +  else
  93 +    APACHE_THREADED_MPM=`$APXS_HTTPD -V | grep 'threaded:.*yes'`
  94 +    if test -n "$APACHE_THREADED_MPM"; then
  95 +      PHP_BUILD_THREAD_SAFE
  96 +    fi
  97    fi
  98    AC_MSG_RESULT(yes)