diff options
author | Ondřej Surý <ondrej@sury.org> | 2012-03-03 16:02:44 +0100 |
---|---|---|
committer | Ondřej Surý <ondrej@sury.org> | 2012-03-03 16:02:44 +0100 |
commit | 096b2f823b2273e3ee707b3805feb78d1e4be61d (patch) | |
tree | 2dbcbbe86edd177db1e3b33db04438919fa3d04e /ext | |
parent | f89bb30da3cd51ee2deb566a08e318d6c3995324 (diff) | |
download | php-096b2f823b2273e3ee707b3805feb78d1e4be61d.tar.gz |
Imported Upstream version 5.4.0upstream/5.4.0
Diffstat (limited to 'ext')
-rw-r--r-- | ext/fileinfo/php_fileinfo.h | 4 | ||||
-rw-r--r-- | ext/mysqlnd/mysqlnd.h | 4 | ||||
-rw-r--r-- | ext/openssl/openssl.c | 6 | ||||
-rw-r--r-- | ext/openssl/tests/bug61124.phpt | 12 | ||||
-rwxr-xr-x | ext/soap/tests/bugs/bug34657.phpt | 2 | ||||
-rwxr-xr-x | ext/spl/tests/iterator_006.phpt | 2 | ||||
-rw-r--r-- | ext/sqlite3/php_sqlite3.h | 4 | ||||
-rw-r--r-- | ext/standard/credits_ext.h | 4 | ||||
-rw-r--r-- | ext/standard/tests/streams/bug47997.phpt | 2 | ||||
-rw-r--r-- | ext/standard/tests/streams/stream_get_line_nb.phpt | 2 | ||||
-rw-r--r-- | ext/standard/var_unserializer.c | 8 | ||||
-rw-r--r-- | ext/standard/var_unserializer.re | 8 | ||||
-rw-r--r-- | ext/xmlreader/tests/expand.phpt | 2 |
13 files changed, 45 insertions, 15 deletions
diff --git a/ext/fileinfo/php_fileinfo.h b/ext/fileinfo/php_fileinfo.h index 532a87ce4..f5b7ec23e 100644 --- a/ext/fileinfo/php_fileinfo.h +++ b/ext/fileinfo/php_fileinfo.h @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_fileinfo.h 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: php_fileinfo.h 323634 2012-02-28 18:43:44Z stas $ */ #ifndef PHP_FILEINFO_H #define PHP_FILEINFO_H @@ -24,7 +24,7 @@ extern zend_module_entry fileinfo_module_entry; #define phpext_fileinfo_ptr &fileinfo_module_entry -#define PHP_FILEINFO_VERSION "1.0.5-dev" +#define PHP_FILEINFO_VERSION "1.0.5" #ifdef PHP_WIN32 #define PHP_FILEINFO_API __declspec(dllexport) diff --git a/ext/mysqlnd/mysqlnd.h b/ext/mysqlnd/mysqlnd.h index ae894389b..a6d0039d1 100644 --- a/ext/mysqlnd/mysqlnd.h +++ b/ext/mysqlnd/mysqlnd.h @@ -17,12 +17,12 @@ | Georg Richter <georg@mysql.com> | +----------------------------------------------------------------------+ */ -/* $Id: mysqlnd.h 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: mysqlnd.h 323634 2012-02-28 18:43:44Z stas $ */ #ifndef MYSQLND_H #define MYSQLND_H -#define MYSQLND_VERSION "mysqlnd 5.0.10-dev - 20111026 - $Revision: 321634 $" +#define MYSQLND_VERSION "mysqlnd 5.0.10 - 20111026 - $Revision: 323634 $" #define MYSQLND_VERSION_ID 50010 #define MYSQLND_PLUGIN_API_VERSION 1 diff --git a/ext/openssl/openssl.c b/ext/openssl/openssl.c index e563f246b..5601c89d0 100644 --- a/ext/openssl/openssl.c +++ b/ext/openssl/openssl.c @@ -20,7 +20,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: openssl.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: openssl.c 323440 2012-02-23 01:26:46Z scottmac $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -4803,6 +4803,10 @@ PHP_FUNCTION(openssl_decrypt) if (!(options & OPENSSL_RAW_DATA)) { base64_str = (char*)php_base64_decode((unsigned char*)data, data_len, &base64_str_len); + if (!base64_str) { + php_error_docref(NULL TSRMLS_CC, E_WARNING, "Failed to base64 decode the input"); + RETURN_FALSE; + } data_len = base64_str_len; data = base64_str; } diff --git a/ext/openssl/tests/bug61124.phpt b/ext/openssl/tests/bug61124.phpt new file mode 100644 index 000000000..2fc192d43 --- /dev/null +++ b/ext/openssl/tests/bug61124.phpt @@ -0,0 +1,12 @@ +--TEST--
+Bug #61124: Segmentation fault with openssl_decrypt
+--SKIPIF--
+<?php
+if (!extension_loaded("openssl")) die("skip");
+--FILE--
+<?php
+var_dump(openssl_decrypt('kzo w2RMExUTYQXW2Xzxmg==', 'aes-128-cbc', 'pass', false, 'pass'));
+
+--EXPECTF--
+Warning: openssl_decrypt(): Failed to base64 decode the input in %s on line %s
+bool(false)
\ No newline at end of file diff --git a/ext/soap/tests/bugs/bug34657.phpt b/ext/soap/tests/bugs/bug34657.phpt index 0069c9395..d974d02cc 100755 --- a/ext/soap/tests/bugs/bug34657.phpt +++ b/ext/soap/tests/bugs/bug34657.phpt @@ -8,7 +8,7 @@ if (extension_loaded("openssl")) { when openssl loaded, tcp stream is less verbose, so some error messages are missing so let's skip the test in this case */ - die("skip"); + die("skip OpenSSL extension required"); } ?> --FILE-- diff --git a/ext/spl/tests/iterator_006.phpt b/ext/spl/tests/iterator_006.phpt index 1a1be0561..54da89cbd 100755 --- a/ext/spl/tests/iterator_006.phpt +++ b/ext/spl/tests/iterator_006.phpt @@ -1,7 +1,7 @@ --TEST-- SPL: IteratorIterator and SimpleXMlElement --SKIPIF-- -<?php if (!extension_loaded('simplexml')) print "skip"; ?> +<?php if (!extension_loaded('simplexml')) print "skip SimpleXML required"; ?> --FILE-- <?php diff --git a/ext/sqlite3/php_sqlite3.h b/ext/sqlite3/php_sqlite3.h index c402e6ff9..8e6825eda 100644 --- a/ext/sqlite3/php_sqlite3.h +++ b/ext/sqlite3/php_sqlite3.h @@ -16,12 +16,12 @@ +----------------------------------------------------------------------+ */ -/* $Id: php_sqlite3.h 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: php_sqlite3.h 323634 2012-02-28 18:43:44Z stas $ */ #ifndef PHP_SQLITE3_H #define PHP_SQLITE3_H -#define PHP_SQLITE3_VERSION "0.7-dev" +#define PHP_SQLITE3_VERSION "0.7" extern zend_module_entry sqlite3_module_entry; #define phpext_sqlite3_ptr &sqlite3_module_entry diff --git a/ext/standard/credits_ext.h b/ext/standard/credits_ext.h index e96864372..7bdb41e60 100644 --- a/ext/standard/credits_ext.h +++ b/ext/standard/credits_ext.h @@ -43,7 +43,7 @@ CREDIT_LINE("Multibyte String Functions", "Tsukada Takuya, Rui Hirokawa"); CREDIT_LINE("MySQL driver for PDO", "George Schlossnagle, Wez Furlong, Ilia Alshanetsky, Johannes Schlueter"); CREDIT_LINE("MySQL", "Zeev Suraski, Zak Greant, Georg Richter"); CREDIT_LINE("MySQLi", "Zak Greant, Georg Richter, Andrey Hristov, Ulf Wendel"); -CREDIT_LINE("MySQLnd", "Georg Richter, Andrey Hristov, Ulf Wendel"); +CREDIT_LINE("MySQLnd", "Andrey Hristov, Ulf Wendel, Georg Richter"); CREDIT_LINE("OCI8", "Stig Bakken, Thies C. Arntzen, Andy Sautins, David Benson, Maxim Maletsky, Harald Radi, Antony Dovgal, Andi Gutmans, Wez Furlong, Christopher Jones, Oracle Corporation"); CREDIT_LINE("ODBC driver for PDO", "Wez Furlong"); CREDIT_LINE("ODBC", "Stig Bakken, Andreas Karajannis, Frank M. Kromann, Daniel R. Kalowsky"); @@ -69,7 +69,7 @@ CREDIT_LINE("SOAP", "Brad Lafountain, Shane Caraveo, Dmitry Stogov"); CREDIT_LINE("Sockets", "Chris Vandomelen, Sterling Hughes, Daniel Beulshausen, Jason Greene"); CREDIT_LINE("SPL", "Marcus Boerger, Etienne Kneuss"); CREDIT_LINE("SQLite 3.x driver for PDO", "Wez Furlong"); -CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky"); +CREDIT_LINE("SQLite3", "Scott MacVicar, Ilia Alshanetsky, Brad Dewar"); CREDIT_LINE("Sybase-CT", "Zeev Suraski, Tom May, Timm Friebe"); CREDIT_LINE("System V Message based IPC", "Wez Furlong"); CREDIT_LINE("System V Semaphores", "Tom May"); diff --git a/ext/standard/tests/streams/bug47997.phpt b/ext/standard/tests/streams/bug47997.phpt index 1ad28907f..f13a19d1f 100644 --- a/ext/standard/tests/streams/bug47997.phpt +++ b/ext/standard/tests/streams/bug47997.phpt @@ -1,5 +1,7 @@ --TEST-- Bug #47997 (stream_copy_to_stream returns 1 on empty streams) +--INI-- +allow_url_fopen=1 --FILE-- <?php diff --git a/ext/standard/tests/streams/stream_get_line_nb.phpt b/ext/standard/tests/streams/stream_get_line_nb.phpt index 3e3848f54..ce981203f 100644 --- a/ext/standard/tests/streams/stream_get_line_nb.phpt +++ b/ext/standard/tests/streams/stream_get_line_nb.phpt @@ -3,7 +3,7 @@ stream_get_line() on non-blocking stream --SKIPIF-- <?php $sockets = @stream_socket_pair(STREAM_PF_UNIX, STREAM_SOCK_STREAM, 0); -if (!$sockets) die("skip"); +if (!$sockets) die("skip stream_socket_pair() should work"); fclose($sockets[0]); fclose($sockets[1]); ?> diff --git a/ext/standard/var_unserializer.c b/ext/standard/var_unserializer.c index 1c6ff9795..fb5cea107 100644 --- a/ext/standard/var_unserializer.c +++ b/ext/standard/var_unserializer.c @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.c 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: var_unserializer.c 323633 2012-02-28 18:36:10Z pajoye $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -373,6 +373,9 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce) return elements; } +#ifdef PHP_WIN32 +# pragma optimize("", off) +#endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { zval *retval_ptr = NULL; @@ -397,6 +400,9 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) return finish_nested_data(UNSERIALIZE_PASSTHRU); } +#ifdef PHP_WIN32 +# pragma optimize("", on) +#endif PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) { diff --git a/ext/standard/var_unserializer.re b/ext/standard/var_unserializer.re index d86bf93ee..cf01ee28e 100644 --- a/ext/standard/var_unserializer.re +++ b/ext/standard/var_unserializer.re @@ -16,7 +16,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: var_unserializer.re 321634 2012-01-01 13:15:04Z felipe $ */ +/* $Id: var_unserializer.re 323633 2012-02-28 18:36:10Z pajoye $ */ #include "php.h" #include "ext/standard/php_var.h" @@ -379,6 +379,9 @@ static inline long object_common1(UNSERIALIZE_PARAMETER, zend_class_entry *ce) return elements; } +#ifdef PHP_WIN32 +# pragma optimize("", off) +#endif static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) { zval *retval_ptr = NULL; @@ -403,6 +406,9 @@ static inline int object_common2(UNSERIALIZE_PARAMETER, long elements) return finish_nested_data(UNSERIALIZE_PASSTHRU); } +#ifdef PHP_WIN32 +# pragma optimize("", on) +#endif PHPAPI int php_var_unserialize(UNSERIALIZE_PARAMETER) { diff --git a/ext/xmlreader/tests/expand.phpt b/ext/xmlreader/tests/expand.phpt index 99c0604b8..c77e6c31b 100644 --- a/ext/xmlreader/tests/expand.phpt +++ b/ext/xmlreader/tests/expand.phpt @@ -2,7 +2,7 @@ XMLReader: Expand into existing DOM documet --SKIPIF-- <?php if (!extension_loaded("xmlreader")) print "skip"; -if (!extension_loaded("dom")) print "skip"; +if (!extension_loaded("dom")) print "skip DOM extension required"; $reader = new XMLReader(); if (!method_exists($reader, 'expand')) print "skip"; ?> |