This commit was manufactured by cvs2svn to create tag 'php_4_3_3'.php-4.3.3

9 files changed, 8 insertions, 106 deletions

diff --git a/build/scan_makefile_in.awk b/build/scan_makefile_in.awk
deleted file mode 100644
index 0c6d20398f..0000000000
--- a/build/scan_makefile_in.awk
+++ /dev/null
@@ -1,32 +0,0 @@
-BEGIN {
-	mode=0
-	sources=""
-}
-	
-mode == 0 && /^LTLIBRARY_SOURCES.*\\$/ {
-	if (match($0, "[^=]*$")) {
-	sources=substr($0, RSTART, RLENGTH-1)
-	}
-	mode=1
-	next
-}
-
-mode == 0 && /^LTLIBRARY_SOURCES.*/ {
-	if (match($0, "[^=]*$")) {
-	sources=substr($0, RSTART, RLENGTH)
-	}
-}
-
-mode == 1 && /.*\\$/ {
-	sources=sources substr($0, 0, length - 1)
-	next
-}
-
-mode == 1 {
-	sources=sources $0
-	mode=0
-}
-
-END {
-	print sources
-}
diff --git a/ext/bz2/config.m4 b/ext/bz2/config.m4
index 90dec7c937..b4ac1ee177 100644
--- a/ext/bz2/config.m4
+++ b/ext/bz2/config.m4
@@ -23,17 +23,11 @@ if test "$PHP_BZ2" != "no"; then
     AC_MSG_ERROR(Please reinstall the BZip2 distribution)
   fi
 
-  PHP_CHECK_LIBRARY(bz2, BZ2_bzerror, 
-  [
-    PHP_ADD_INCLUDE($BZIP_DIR/include)
-    PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD)
-    AC_DEFINE(HAVE_BZ2,1,[ ])
-  ], [
-    AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)
-  ], [
-    -L$BZIP_DIR/lib
-  ])
+  PHP_ADD_INCLUDE($BZIP_DIR/include)
 
-  PHP_NEW_EXTENSION(bz2, bz2.c, $ext_shared)
   PHP_SUBST(BZ2_SHARED_LIBADD)
+  PHP_ADD_LIBRARY_WITH_PATH(bz2, $BZIP_DIR/lib, BZ2_SHARED_LIBADD)
+  AC_CHECK_LIB(bz2, BZ2_bzerror, [AC_DEFINE(HAVE_BZ2,1,[ ])], [AC_MSG_ERROR(bz2 module requires libbz2 >= 1.0.0)],)
+
+  PHP_NEW_EXTENSION(bz2, bz2.c, $ext_shared)
 fi
diff --git a/ext/mbstring/mbstring.c b/ext/mbstring/mbstring.c
index 7e53e7e350..b0939cebc1 100644
--- a/ext/mbstring/mbstring.c
+++ b/ext/mbstring/mbstring.c
@@ -2485,7 +2485,7 @@ MBSTRING_API char * php_mb_convert_encoding(char *input, size_t length, char *_t
 	if (output_len) {
 		*output_len = 0;
 	}
-	if (!input) {
+	if ( !input || !length) {
 		return NULL;
 	}
 	/* new encoding */
diff --git a/ext/mbstring/tests/bug25140.phpt b/ext/mbstring/tests/bug25140.phpt
deleted file mode 100644
index 0b209120f5..0000000000
--- a/ext/mbstring/tests/bug25140.phpt
+++ /dev/null
@@ -1,10 +0,0 @@
---TEST--
-Bug #25140 (mb_convert_encoding returns FALSE on an empty string)
---SKIPIF--
-<?php extension_loaded('mbstring') or die('skip mbstring not available'); ?>
---FILE--
-<?php
-var_dump( mb_convert_encoding( '', 'SJIS', 'EUC-JP' ) );
-?>
---EXPECT--
-string(0) ""
diff --git a/ext/mcve/mcve.c b/ext/mcve/mcve.c
index 44cefacbfc..a328037baa 100644
--- a/ext/mcve/mcve.c
+++ b/ext/mcve/mcve.c
@@ -509,17 +509,10 @@ PHP_FUNCTION(mcve_destroyconn)
 	if (ZEND_NUM_ARGS() != 1 || zend_get_parameters_ex(1, &arg) == FAILURE)
 		WRONG_PARAM_COUNT;
 
-/* If MCVE_DestroyConn() is called within a PHP script, the Resource handle is
-   never cleared, as there does not appear to be an UNREGISTER or DESTROY resource
-   call in the Zend API.  What happens is this uninitialized memory location is
-   passed again to the MCVE_DestroyConn() function at script exit (cleanup), and
-   causes weird stuff. So we just go ahead and let the PHP garbage collector call
-   our _free_mcve_conn()  we registered (le_conn) to clean up */
-#if 0
 	ZEND_FETCH_RESOURCE(conn, MCVE_CONN *, arg, -1, "mcve connection", le_conn);
 
 	MCVE_DestroyConn(conn);
-#endif
+
 	RETURN_TRUE;
 }
 /* }}} */
diff --git a/ext/openssl/config0.m4 b/ext/openssl/config0.m4
deleted file mode 100644
index 157c35b66b..0000000000
--- a/ext/openssl/config0.m4
+++ /dev/null
@@ -1,17 +0,0 @@
-dnl
-dnl $Id$
-dnl
-
-PHP_ARG_WITH(openssl, for OpenSSL support,
-[  --with-openssl[=DIR]    Include OpenSSL support (requires OpenSSL >= 0.9.6)])
-
-if test "$PHP_OPENSSL" != "no"; then
-  PHP_SETUP_OPENSSL(OPENSSL_SHARED_LIBADD, 
-  [
-    PHP_NEW_EXTENSION(openssl, openssl.c xp_ssl.c, $ext_shared)
-    PHP_SUBST(OPENSSL_SHARED_LIBADD)
-    AC_DEFINE(HAVE_OPENSSL_EXT,1,[ ])
-  ], [
-    AC_MSG_ERROR([OpenSSL check failed. Please check config.log for more information.])
-  ])
-fi
diff --git a/ext/standard/filestat.c b/ext/standard/filestat.c
index e199583d47..94580f6fdd 100644
--- a/ext/standard/filestat.c
+++ b/ext/standard/filestat.c
@@ -34,10 +34,6 @@
 # include <unistd.h>
 #endif
 
-#if HAVE_SYS_PARAM_H
-# include <sys/param.h>
-#endif
-
 #if HAVE_SYS_VFS_H
 # include <sys/vfs.h>
 #endif
diff --git a/scripts/phpize.in b/scripts/phpize.in
index ce20a6d228..b8ff5623b1 100644
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@ -57,8 +57,7 @@ touch install-sh mkinstalldirs missing
 aclocal || exit 1
 autoconf || exit 1
 autoheader || exit 1
-libtoolize=`$phpdir/shtool path glibtoolize libtoolize`
-$libtoolize -f -c || exit 1
+libtoolize -f -c || exit 1
 
 # dumping API NOs:
 PHP_API_VERSION=`egrep '#define PHP_API_VERSION' $includedir/main/php.h|sed 's/#define PHP_API_VERSION//'`
diff --git a/tests/lang/bug25145.phpt b/tests/lang/bug25145.phpt
deleted file mode 100755
index 39c83aa4f9..0000000000
--- a/tests/lang/bug25145.phpt
+++ /dev/null
@@ -1,21 +0,0 @@
---TEST--
-Bug #25145 (SEGV on recpt of form input with name like "123[]")
---GET--
-123[]=SEGV
---FILE--
-<?php
-
-print_r($_REQUEST);
-echo "Done\n";
-
-?>
---EXPECT--
-Array
-(
-    [123] => Array
-        (
-            [0] => SEGV
-        )
-
-)
-Done