Imported Upstream version 5.4.0upstream/5.4.0

5 files changed, 19 insertions, 5 deletions

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)
 {