17234768bad1e64a742cc7cffbaa2f06 php-fastcgi.patch

005386c1e8c5894cc978eebfb50f34f0  php-shared.patch

Changed files:
    php-fastcgi.patch -> 1.1
    php-shared.patch -> 1.1
    php4-shared.patch -> 1.1

diff --git a/php-fastcgi.patch b/php-fastcgi.patch
new file mode 100644 (file)
index 0000000..7068c06
--- /dev/null
+++ b/php-fastcgi.patch
@@ -0,0 +1,29 @@
+--- 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 @@
+         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)
+   PHP_SAPI=fastcgi
+   PHP_LIBS=$FASTCGIPATH/lib/libfcgi.a
+-  AC_ADD_INCLUDE($FASTCGIPATH/include)
++  AC_ADD_INCLUDE($FASTCGIPATH/include/fastcgi)
+   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");

diff --git a/php-shared.patch b/php-shared.patch
new file mode 100644 (file)
index 0000000..c7d3020
--- /dev/null
+++ b/php-shared.patch
@@ -0,0 +1,82 @@
+diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
+--- php-4.0.5.orig/Makefile.in Sun May  6 23:07:47 2001
++++ php-4.0.5/Makefile.in      Mon May  7 03:25:53 2001
+@@ -2,41 +2,68 @@
+ ZEND_DIR = $(srcdir)/Zend
+ SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+ 
+-LTLIBRARY_NAME = libphp4.la
+-LTLIBRARY_SOURCES = stub.c
++libexec_LTLIBRARIES = libphp_common.la libphp4.la
++libphp4_la_NAME = libphp4.la
++libphp_common_la_NAME = libphp_common.la
++libphp4_la_SOURCES = stub.c
++libphp_la_common_SOURCES = stub.c
++
++libphp4_la_DEPENDENCIES = \
++              libphp_common.la \
++              sapi/$(PHP_SAPI)/libsapi.la
+ 
+-LTLIBRARY_DEPENDENCIES = \
++libphp_common_la_DEPENDENCIES = \
+               Zend/libZend.la \
+-              sapi/$(PHP_SAPI)/libsapi.la \
+               main/libmain.la \
+               $(REGEX_LIB) \
+               $(EXT_LTLIBS) \
+               $(TSRM_LIB)
+ 
+-LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
+-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
++libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
++libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
++
++libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release 4.0.5 -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
++libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
+ 
+ PROGRAM_NAME         = php
+ PROGRAM_SOURCES      = stub.c
+-PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
++PROGRAM_LDADD        = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD)
+ PROGRAM_LDFLAGS      = -export-dynamic        
+ PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
+ 
+-targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
++targets = $(libexec_LTLIBRARIES) $(PHP_PROGRAM)
+ 
+ install_targets = install-sapi install-modules
+ 
+ include $(top_srcdir)/build/rules.mk
+-include $(top_srcdir)/build/library.mk
+ include $(top_srcdir)/build/program.mk
+ 
++libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X)
++
++$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES)
++      $(LINK) $(libphp_common_la_LDFLAGS) $(libphp_common_la_OBJECTS) $(libphp_common_la_LIBADD)
++
++libphp4_la_OBJECTS = $(libphp4_la_SOURCES:.c=.lo) $(libphp4_la_OBJECTS_X)
++
++$(libphp4_la_NAME): $(libphp4_la_OBJECTS) $(libphp4_la_DEPENDENCIES)
++      $(LINK) $(libphp4_la_LDFLAGS) $(libphp4_la_OBJECTS) $(libphp4_la_LIBADD)
++
+ install-sapi:
+-      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
++      @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
++      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la
+       -@$(mkinstalldirs) $(DESTDIR)$(bindir)
+       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+               for i in 0.0.0 0.0 0; do \
+                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
++                              break; \
++                      fi; \
++              done; \
++      fi
++      -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
++              for i in 0.0.0 0.0 0; do \
++                      if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
++                              $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
+                               break; \
+                       fi; \
+               done; \

diff --git a/php4-shared.patch b/php4-shared.patch
new file mode 100644 (file)
index 0000000..c7d3020
--- /dev/null
+++ b/php4-shared.patch
@@ -0,0 +1,82 @@
+diff -ur php-4.0.5.orig/Makefile.in php-4.0.5/Makefile.in
+--- php-4.0.5.orig/Makefile.in Sun May  6 23:07:47 2001
++++ php-4.0.5/Makefile.in      Mon May  7 03:25:53 2001
+@@ -2,41 +2,68 @@
+ ZEND_DIR = $(srcdir)/Zend
+ SUBDIRS = Zend main ext sapi $(TSRM_DIR) $(REGEX_DIR) . $(PEAR_DIR)
+ 
+-LTLIBRARY_NAME = libphp4.la
+-LTLIBRARY_SOURCES = stub.c
++libexec_LTLIBRARIES = libphp_common.la libphp4.la
++libphp4_la_NAME = libphp4.la
++libphp_common_la_NAME = libphp_common.la
++libphp4_la_SOURCES = stub.c
++libphp_la_common_SOURCES = stub.c
++
++libphp4_la_DEPENDENCIES = \
++              libphp_common.la \
++              sapi/$(PHP_SAPI)/libsapi.la
+ 
+-LTLIBRARY_DEPENDENCIES = \
++libphp_common_la_DEPENDENCIES = \
+               Zend/libZend.la \
+-              sapi/$(PHP_SAPI)/libsapi.la \
+               main/libmain.la \
+               $(REGEX_LIB) \
+               $(EXT_LTLIBS) \
+               $(TSRM_LIB)
+ 
+-LTLIBRARY_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
+-LTLIBRARY_LIBADD = $(LTLIBRARY_DEPENDENCIES) $(EXTRA_LIBS)
++libphp4_la_LDFLAGS = -rpath $(phptempdir) $(EXTRA_LDFLAGS) $(LDFLAGS) $(PHP_RPATHS)
++libphp4_la_LIBADD = $(libphp4_la_DEPENDENCIES) $(EXTRA_LIBS)
++
++libphp_common_la_LDFLAGS = -rpath $(phptempdir) -release 4.0.5 -version-info 0:0:0 $(LDFLAGS) $(PHP_RPATHS)
++libphp_common_la_LIBADD = $(libphp_common_la_DEPENDENCIES) $(EXTRA_LIBS)
+ 
+ PROGRAM_NAME         = php
+ PROGRAM_SOURCES      = stub.c
+-PROGRAM_LDADD        = libphp4.la $(EXT_PROGRAM_LDADD)
++PROGRAM_LDADD        = libphp_common.la sapi/cgi/libsapi.la $(EXT_PROGRAM_LDADD)
+ PROGRAM_LDFLAGS      = -export-dynamic        
+ PROGRAM_DEPENDENCIES = $(PROGRAM_LDADD)
+ 
+-targets = $(LTLIBRARY_NAME) $(PHP_PROGRAM)
++targets = $(libexec_LTLIBRARIES) $(PHP_PROGRAM)
+ 
+ install_targets = install-sapi install-modules
+ 
+ include $(top_srcdir)/build/rules.mk
+-include $(top_srcdir)/build/library.mk
+ include $(top_srcdir)/build/program.mk
+ 
++libphp_common_la_OBJECTS = $(libphp_common_la_SOURCES:.c=.lo) $(libphp_common_la_OBJECTS_X)
++
++$(libphp_common_la_NAME): $(libphp_common_la_OBJECTS) $(libphp_common_la_DEPENDENCIES)
++      $(LINK) $(libphp_common_la_LDFLAGS) $(libphp_common_la_OBJECTS) $(libphp_common_la_LIBADD)
++
++libphp4_la_OBJECTS = $(libphp4_la_SOURCES:.c=.lo) $(libphp4_la_OBJECTS_X)
++
++$(libphp4_la_NAME): $(libphp4_la_OBJECTS) $(libphp4_la_DEPENDENCIES)
++      $(LINK) $(libphp4_la_LDFLAGS) $(libphp4_la_OBJECTS) $(libphp4_la_LIBADD)
++
+ install-sapi:
+-      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la >/dev/null 2>&1
++      @$(LIBTOOL) --silent --mode=install cp libphp_common.la $(phptempdir)/libphp_common.la
++      @$(LIBTOOL) --silent --mode=install cp libphp4.la $(phptempdir)/libphp4.la
+       -@$(mkinstalldirs) $(DESTDIR)$(bindir)
+       -@if test ! -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); then \
+               for i in 0.0.0 0.0 0; do \
+                       if test -r $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i; then \
+                               $(LN_S) $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp4.$(SHLIB_SUFFIX_NAME); \
++                              break; \
++                      fi; \
++              done; \
++      fi
++      -@if test ! -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); then \
++              for i in 0.0.0 0.0 0; do \
++                      if test -r $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i; then \
++                              $(LN_S) $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME).$$i $(phptempdir)/libphp_common.$(SHLIB_SUFFIX_NAME); \
+                               break; \
+                       fi; \
+               done; \