Imported Upstream version 5.3.7upstream/5.3.7

7 files changed, 18 insertions, 13 deletions

diff --git a/ext/session/config.w32 b/ext/session/config.w32
index 379538ce5..5c65651d9 100644
--- a/ext/session/config.w32
+++ b/ext/session/config.w32
@@ -1,4 +1,4 @@
-// $Id: config.w32 306344 2010-12-13 18:43:10Z pajoye $
+// $Id: config.w32 312200 2011-06-16 01:21:01Z pajoye $
 // vim:ft=javascript
 
 ARG_ENABLE("session", "session support", "yes");
@@ -6,5 +6,5 @@ ARG_ENABLE("session", "session support", "yes");
 if (PHP_SESSION == "yes") {
 	EXTENSION("session", "session.c mod_files.c mod_mm.c mod_user.c", false /* never shared */);
 	AC_DEFINE("HAVE_PHP_SESSION", 1, "Session support");
-	PHP_INSTALL_HEADERS("ext/session/", "mod_mm.h");
+	PHP_INSTALL_HEADERS("ext/session/", "mod_mm.h php_session.h mod_files.h mod_user.h");
 }
diff --git a/ext/session/session.c b/ext/session/session.c
index b7a2451b9..432048dc7 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -17,7 +17,7 @@
    +----------------------------------------------------------------------+
  */
 
-/* $Id: session.c 307671 2011-01-23 10:02:06Z pajoye $ */
+/* $Id: session.c 314376 2011-08-06 14:47:44Z felipe $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -2119,7 +2119,7 @@ static const zend_function_entry session_functions[] = {
 	PHP_FE(session_get_cookie_params, arginfo_session_void)
 	PHP_FE(session_write_close,       arginfo_session_void)
 	PHP_FALIAS(session_commit, session_write_close, arginfo_session_void)
-	{NULL, NULL, NULL}
+	PHP_FE_END
 };
 /* }}} */
 
@@ -2283,7 +2283,7 @@ static PHP_MINFO_FUNCTION(session) /* {{{ */
 static const zend_module_dep session_deps[] = { /* {{{ */
 	ZEND_MOD_OPTIONAL("hash")
 	ZEND_MOD_REQUIRED("spl")
-	{NULL, NULL, NULL}
+	ZEND_MOD_END
 };
 /* }}} */
 
diff --git a/ext/session/tests/008-php4.2.3.phpt b/ext/session/tests/008-php4.2.3.phpt
index 1b26900c8..9464ecded 100644
--- a/ext/session/tests/008-php4.2.3.phpt
+++ b/ext/session/tests/008-php4.2.3.phpt
@@ -15,7 +15,6 @@ track_errors=1
 log_errors=0
 html_errors=0
 display_errors=1
-error_reporting=2039;
 session.serialize_handler=php
 session.save_handler=files
 precision=14
@@ -59,12 +58,18 @@ session_destroy();
 ?>
 --EXPECTF--
 Deprecated: Directive 'register_long_arrays' is deprecated in PHP 5.3 and greater in Unknown on line 0
+
+Deprecated: Function session_register() is deprecated in %s on line %d
+
+Notice: Undefined variable: c in %s on line %d
 NULL
 session_write_close(): Your script possibly relies on a session side-effect which existed until PHP 4.2.3. Please be advised that the session extension does not consider global variables as a source of data, unless register_globals is enabled. You can disable this functionality and this warning by setting session.bug_compat_42 or session.bug_compat_warn to off, respectively
 array(1) {
   ["c"]=>
   float(3.14)
 }
+
+Notice: Undefined variable: c in %s on line %d
 NULL
 array(1) {
   ["c"]=>
diff --git a/ext/session/tests/bug32330.phpt b/ext/session/tests/bug32330.phpt
index c0d3370e0..98d442ae5 100644
--- a/ext/session/tests/bug32330.phpt
+++ b/ext/session/tests/bug32330.phpt
@@ -6,7 +6,7 @@ Bug #32330 (session_destroy, "Failed to initialize storage module", custom sessi
 session.use_trans_sid=0
 session.use_cookies=1
 session.name=sid
-session.save_path=/
+session.save_path=/tmp
 session.gc_probability=1
 session.gc_divisor=1
 --FILE--
@@ -68,17 +68,17 @@ $_SESSION['E'] = 'F';
 
 ?>
 --EXPECTF--
-open: path = /, name = sid
+open: path = /tmp, name = sid
 read: id = %s
 gc: maxlifetime = %d
 write: id = %s, data = A|s:1:"B";
 close
-open: path = /, name = sid
+open: path = /tmp, name = sid
 read: id = %s
 gc: maxlifetime = %d
 destroy: id = %s
 close
-open: path = /, name = sid
+open: path = /tmp, name = sid
 read: id = %s
 gc: maxlifetime = %d
 write: id = %s, data = E|s:1:"F";
diff --git a/ext/session/tests/session_encode_basic.phpt b/ext/session/tests/session_encode_basic.phpt
index f74bddd9c..b087f7441 100644
--- a/ext/session/tests/session_encode_basic.phpt
+++ b/ext/session/tests/session_encode_basic.phpt
@@ -120,7 +120,7 @@ string(13) "data|d:-10.5;"
 string(20) "data|d:123456789000;"
 
 -- Iteration 8 --
-string(86) "data|d:1.2345678899999999145113427164344339914681114578343112953007221221923828125E-9;"
+string(29) "data|d:1.2345678899999999E-9;"
 
 -- Iteration 9 --
 string(11) "data|d:0.5;"
diff --git a/ext/session/tests/session_encode_error2.phpt b/ext/session/tests/session_encode_error2.phpt
index 24758500c..2c31ceb51 100644
--- a/ext/session/tests/session_encode_error2.phpt
+++ b/ext/session/tests/session_encode_error2.phpt
@@ -220,7 +220,7 @@ bool(true)
 
 -- Iteration 20 --
 bool(true)
-string(33) "Hello World!|s:12:"Hello World!";"
+bool(false)
 bool(true)
 
 -- Iteration 21 --
diff --git a/ext/session/tests/skipif.inc b/ext/session/tests/skipif.inc
index 6e3eae086..e63f963c5 100644
--- a/ext/session/tests/skipif.inc
+++ b/ext/session/tests/skipif.inc
@@ -18,7 +18,7 @@ if ($save_path) {
 			$save_path = substr($save_path, ++$p);
 		}
 		if (!@is_writable($save_path)) {
-			die("skip\n");
+			die("skip session.save_path $save_path is not writable\n");
 		}
 	}
 }