3 files changed, 21 insertions, 7 deletions

diff --git a/ext/session/session.c b/ext/session/session.c
index 053d6fa374..fc102e5393 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -2024,46 +2024,57 @@ static PHP_FUNCTION(session_is_registered)
 /* }}} */
 
 /* {{{ arginfo */
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_name, 0, 0, 0)
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_module_name, 0, 0, 0)
 	ZEND_ARG_INFO(0, module)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_save_path, 0, 0, 0)
 	ZEND_ARG_INFO(0, path)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_id, 0, 0, 0)
 	ZEND_ARG_INFO(0, id)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_regenerate_id, 0, 0, 0)
 	ZEND_ARG_INFO(0, delete_old_session)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_decode, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_register, 0, 0, 1)
 	ZEND_ARG_INFO(0, name)
 	ZEND_ARG_INFO(0, ...)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_unregister, 0, 0, 1)
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_is_registered, 0, 0, 1)
 	ZEND_ARG_INFO(0, name)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO(arginfo_session_void, 0)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_save_handler, 0, 0, 6)
 	ZEND_ARG_INFO(0, open)
 	ZEND_ARG_INFO(0, close)
@@ -2073,14 +2084,17 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_save_handler, 0, 0, 6)
 	ZEND_ARG_INFO(0, gc)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_cache_limiter, 0, 0, 0)
 	ZEND_ARG_INFO(0, cache_limiter)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_cache_expire, 0, 0, 0)
 	ZEND_ARG_INFO(0, new_cache_expire)
 ZEND_END_ARG_INFO()
 
+static
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_set_cookie_params, 0, 0, 1)
 	ZEND_ARG_INFO(0, lifetime)
 	ZEND_ARG_INFO(0, path)
diff --git a/ext/session/tests/bug41600.phpt b/ext/session/tests/bug41600.phpt
index 028fca79a0..ba04fd9d99 100644
--- a/ext/session/tests/bug41600.phpt
+++ b/ext/session/tests/bug41600.phpt
@@ -6,7 +6,7 @@ Bug #41600 (url rewriter tags doesn't work with namespaced tags)
 session.use_cookies=0
 session.cache_limiter=
 session.use_trans_sid=1
-arg_separator.output="&"
+arg_separator.output=&
 session.name=PHPSESSID
 session.serialize_handler=php
 session.save_handler=files
diff --git a/ext/session/tests/session_save_path_variation4.phpt b/ext/session/tests/session_save_path_variation4.phpt
index 6ea725cd89..453645d314 100644
--- a/ext/session/tests/session_save_path_variation4.phpt
+++ b/ext/session/tests/session_save_path_variation4.phpt
@@ -22,10 +22,10 @@ ob_start();
  */
 
 echo "*** Testing session_save_path() : variation ***\n";
-$initdir = getcwd();
-$sessions = ($initdir."/sessions");
+$directory = dirname(__FILE__);
+$sessions = ($directory."/sessions");
 
-chdir($initdir);
+chdir($directory);
 
 // Delete the existing directory
 if (file_exists($sessions) === TRUE) {
@@ -34,7 +34,7 @@ if (file_exists($sessions) === TRUE) {
 
 var_dump(mkdir($sessions));
 var_dump(chdir($sessions));
-ini_set("session.save_path", $initdir);
+ini_set("session.save_path", $directory);
 var_dump(session_save_path());
 var_dump(session_start());
 var_dump(session_save_path());
@@ -46,8 +46,8 @@ echo "Done";
 ob_end_flush();
 ?>
 --CLEAN--
-$initdir = getcwd();
-$sessions = ($initdir."/sessions");
+$directory = dirname(__FILE__);
+$sessions = ($directory."/sessions");
 var_dump(rmdir($sessions));
 --EXPECTF--
 *** Testing session_save_path() : variation ***