- updated for php 4.3.2

Changed files:
    php-dl-zlib.patch -> 1.2
    php-ini.patch -> 1.6
    php-java-norpath.patch -> 1.2
    php-mnogosearch-php-extension-1.68.patch -> 1.2

diff --git a/php-dl-zlib.patch b/php-dl-zlib.patch
index abb1c5675914ce7bc3ea2d1479e690e0be0a54c7..e2c62bde600bb81a62af0eb3b430ee097088d236 100644 (file)
--- a/php-dl-zlib.patch
+++ b/php-dl-zlib.patch
@@ -1,15 +1,16 @@
---- php-4.3.0/main/SAPI.c.orig Thu Dec  5 23:15:00 2002
-+++ php-4.3.0/main/SAPI.c      Fri Jan  3 10:28:01 2003
-@@ -521,7 +521,7 @@
+diff -burN php-4.3.2/main/SAPI.c php-4.3.2-dl_zlib/main/SAPI.c
+--- php-4.3.2/main/SAPI.c      Wed Feb 12 00:30:13 2003
++++ php-4.3.2-dl_zlib/main/SAPI.c      Wed Jun 11 09:41:47 2003
+@@ -556,7 +556,7 @@
                                while (*ptr == ' ' && *ptr != '\0') {
                                        ptr++;
                                }
 -#if HAVE_ZLIB
 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
                                if(!strncmp(ptr, "image/", sizeof("image/")-1)) {
-                                       ZLIBG(output_compression) = 0;
+                                       zend_alter_ini_entry("zlib.output_compression", sizeof("zlib.output_compression"), "0", sizeof("0") - 1, PHP_INI_USER, PHP_INI_STAGE_RUNTIME);
                                }
-@@ -669,7 +669,7 @@
+@@ -704,7 +704,7 @@
                return SUCCESS;
        }
  
@@ -17,42 +18,4 @@
 +#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
        /* Add output compression headers at this late stage in order to make
           it possible to switch it off inside the script. */
-       if (ZLIBG(output_compression)) {
---- php-4.3.0/ext/standard/image.c.orig        Thu Dec  5 16:52:35 2002
-+++ php-4.3.0/ext/standard/image.c     Fri Jan  3 10:29:20 2003
-@@ -34,7 +34,7 @@
- #endif
- #include "php_image.h"
  
--#if HAVE_ZLIB
-+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- #include "zlib.h"
- #endif
- 
-@@ -80,7 +80,7 @@
-       REGISTER_LONG_CONSTANT("IMAGETYPE_JP2",     IMAGE_FILETYPE_JP2,     CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMAGETYPE_JPX",     IMAGE_FILETYPE_JPX,     CONST_CS | CONST_PERSISTENT);
-       REGISTER_LONG_CONSTANT("IMAGETYPE_JB2",     IMAGE_FILETYPE_JB2,     CONST_CS | CONST_PERSISTENT);
--#if HAVE_ZLIB 
-+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
-       REGISTER_LONG_CONSTANT("IMAGETYPE_SWC",     IMAGE_FILETYPE_SWC,     CONST_CS | CONST_PERSISTENT);
- #endif        
-       REGISTER_LONG_CONSTANT("IMAGETYPE_IFF",     IMAGE_FILETYPE_IFF,     CONST_CS | CONST_PERSISTENT);
-@@ -170,7 +170,7 @@
- }
- /* }}} */
- 
--#if HAVE_ZLIB
-+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
- /* {{{ php_handle_swc
-  */
- static struct gfxinfo *php_handle_swc(php_stream * stream TSRMLS_DC)
-@@ -944,7 +944,7 @@
-               case IMAGE_FILETYPE_SWF:
-                       result = php_handle_swf(stream TSRMLS_CC);
-                       break;
--#if HAVE_ZLIB
-+#if HAVE_ZLIB && !defined(COMPILE_DL_ZLIB)
-               case IMAGE_FILETYPE_SWC:
-                       result = php_handle_swc(stream TSRMLS_CC);
-                       break;

diff --git a/php-ini.patch b/php-ini.patch
index 0a7dc75f2b8eca5dab890bf594e27379f5b0ac1a..f5d26372308113d3e2d6a1a38e254b8e914d09c4 100644 (file)
--- a/php-ini.patch
+++ b/php-ini.patch
@@ -142,8 +142,8 @@
  user_dir =
  
  ; Directory in which the loadable extensions (modules) reside.
--extension_dir = ./
-+extension_dir = /usr/lib/php
+-extension_dir = "./"
++extension_dir = "/usr/lib/php"
  
  ; Whether or not to enable the dl() function.  The dl() function does NOT work
  ; properly in multithreaded servers, such as IIS or Zeus, and is automatically

diff --git a/php-java-norpath.patch b/php-java-norpath.patch
index ddf3bdebb6061a8d584ebf3e489ea259ec3d91eb..b6553c6c8d24412ccca3448b07fc69aac8eda371 100644 (file)
--- a/php-java-norpath.patch
+++ b/php-java-norpath.patch
@@ -1,5 +1,6 @@
---- php-4.3.0/ext/java/config.m4.orig  Sat Jan  4 10:51:49 2003
-+++ php-4.3.0/ext/java/config.m4       Sat Jan  4 10:54:48 2003
+diff -burN php-4.3.2/ext/java/config.m4 php-4.3.2-java-norpath/ext/java/config.m4
+--- php-4.3.2/ext/java/config.m4       Fri Apr  4 19:43:13 2003
++++ php-4.3.2-java-norpath/ext/java/config.m4  Wed Jun 11 09:38:23 2003
 @@ -58,7 +58,6 @@
  AC_DEFUN(JAVA_CHECK_LIB, [
   AC_MSG_CHECKING([Checking for libjava])
@@ -36,6 +37,6 @@
 -      fi
 -    fi
 -
-     INSTALL_IT="$INSTALL_IT; \$(srcdir)/build/shtool mkdir -p -f -m 0755 \$(INSTALL_ROOT)\$(libdir)"
-     INSTALL_IT="$INSTALL_IT; \$(INSTALL) -m 0755 \$(srcdir)/ext/java/php_java.jar \$(INSTALL_ROOT)\$(libdir)"
-   fi
+     if test -n "$INSTALL_IT"; then
+       INSTALL_IT="$INSTALL_IT ;"
+     fi