- added session-unregister patch to avoid httpd SEGVs with msession module

[packages/php.git] / php-fastcgi.patch

diff --git a/php-fastcgi.patch b/php-fastcgi.patch
index 7068c06850e54595a2cba58b3db2d19512d6b3d4..8d12da99e6992a32ade8f0b261dff58210d4b9dd 100644 (file)
--- a/php-fastcgi.patch
+++ b/php-fastcgi.patch
@@ -1,29 +1,21 @@
---- php-4.0.5/sapi/fastcgi/config.m4~  Tue Mar 20 19:13:20 2001
-+++ php-4.0.5/sapi/fastcgi/config.m4   Sun May  6 19:40:08 2001
-@@ -7,10 +7,10 @@
+--- php-4.0.6/sapi/fastcgi/config.m4.wiget     Tue Mar 27 22:34:45 2001
++++ php-4.0.6/sapi/fastcgi/config.m4   Wed Jul  4 23:14:00 2001
+@@ -7,10 +7,15 @@
          FASTCGIPATH=$withval
    fi
    test -f "$FASTCGIPATH/lib/libfcgi.a" || AC_MSG_ERROR(Unable to find libfcgi.a in $FASTCGIPATH/lib)
 -  test -f "$FASTCGIPATH/include/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include)
-+  test -f "$FASTCGIPATH/include/fastcgi/fastcgi.h" || AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include)
++  if test -f "$FASTCGIPATH/include/fastcgi.h" ; then 
++      PHP_ADD_INCLUDE($FASTCGIPATH/include)
++  elif test -f "$FASTCGIPATH/include/fastcgi/fastcgi.h" ; then 
++      PHP_ADD_INCLUDE($FASTCGIPATH/fastcgi/include)
++  else
++      AC_MSG_ERROR(Unable to find fastcgi.h in $FASTCGIPATH/include)
++  fi
    PHP_SAPI=fastcgi
    PHP_LIBS=$FASTCGIPATH/lib/libfcgi.a
--  AC_ADD_INCLUDE($FASTCGIPATH/include)
-+  AC_ADD_INCLUDE($FASTCGIPATH/include/fastcgi)
+-  PHP_ADD_INCLUDE($FASTCGIPATH/include)
    EXT_PROGRAM_LDADD="$EXT_PROGRAM_LDADD $FASTCGIPATH/lib/libfcgi.a"
    INSTALL_IT="\$(INSTALL) -m 0755 $SAPI_PROGRAM \$(bindir)/$SAPI_FASTCGI"
    RESULT="yes"
---- php-4.0.5/sapi/fastcgi/fastcgi.c~  Tue Mar 27 18:29:45 2001
-+++ php-4.0.5/sapi/fastcgi/fastcgi.c   Sun May  6 22:21:50 2001
-@@ -197,6 +197,11 @@
-       struct stat st;
-       char *pi = getenv( "PATH_INFO" );
-       char *pt = getenv( "PATH_TRANSLATED" );
-+
-+      if (!pi)
-+              pi = getenv( "SCRIPT_NAME" );
-+      if (!pt)
-+              pt = getenv( "SCRIPT_FILENAME" );
-       path_info = strdup( pi );
- 
-       SG(request_info).request_method = getenv("REQUEST_METHOD");
+