Removed session_is_registered(), session_register() and session_unregister().

 -- They are no longer needed without register_globals

16 files changed, 15 insertions, 113 deletions

diff --git a/NEWS b/NEWS
index ff76aa148f..7499696f5c 100644
--- a/NEWS
+++ b/NEWS
@@ -35,6 +35,8 @@
   . import_request_variables().
   . register_globals.
   . register_long_arrays ini option.
+  . session_is_registered(), session_register() and session_unregister() 
+    functions.
   . y2k_compliance ini option.
   	
 ?? ??? 20??, PHP 5.3.3
diff --git a/ext/session/session.c b/ext/session/session.c
index c6c4a39401..36f86afaa0 100644
--- a/ext/session/session.c
+++ b/ext/session/session.c
@@ -1837,88 +1837,6 @@ static PHP_FUNCTION(session_write_close)
 }
 /* }}} */
 
-/* {{{ proto bool session_register(mixed var_names [, mixed ...])
-   Adds varname(s) to the list of variables which are freezed at the session end */
-static PHP_FUNCTION(session_register)
-{
-	zval ***args = NULL;
-	int num_args, i;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "+", &args, &num_args) == FAILURE) {
-		return;
-	}
-
-	if (PS(session_status) == php_session_none || PS(session_status) == php_session_disabled) {
-		php_session_start(TSRMLS_C);
-	}
-
-	if (PS(session_status) == php_session_disabled) {
-		if (args) {
-			efree(args);
-		}
-		RETURN_FALSE;
-	}
-
-	for (i = 0; i < num_args; i++) {
-		if (Z_TYPE_PP(args[i]) == IS_ARRAY) {
-			SEPARATE_ZVAL(args[i]);
-		}
-		php_register_var(args[i] TSRMLS_CC);
-	}
-
-	if (args) {
-		efree(args);
-	}
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool session_unregister(string varname)
-   Removes varname from the list of variables which are freezed at the session end */
-static PHP_FUNCTION(session_unregister)
-{
-	char *p_name;
-	int p_name_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &p_name, &p_name_len) == FAILURE) {
-		return;
-	}
-
-	IF_SESSION_VARS() {
-		SEPARATE_ZVAL_IF_NOT_REF(&PS(http_session_vars));
-		PS_DEL_VARL(p_name, p_name_len);
-	}
-
-	RETURN_TRUE;
-}
-/* }}} */
-
-/* {{{ proto bool session_is_registered(string varname)
-   Checks if a variable is registered in session */
-static PHP_FUNCTION(session_is_registered)
-{
-	zval *p_var;
-	char *p_name;
-	int p_name_len;
-
-	if (zend_parse_parameters(ZEND_NUM_ARGS() TSRMLS_CC, "s", &p_name, &p_name_len) == FAILURE) {
-		return;
-	}
-
-	if (PS(session_status) == php_session_none) {
-		RETURN_FALSE;
-	}
-
-	IF_SESSION_VARS() {
-		if (zend_hash_find(Z_ARRVAL_P(PS(http_session_vars)), p_name, p_name_len+1, (void **)&p_var) == SUCCESS) {
-			RETURN_TRUE;
-		}
-	}
-	RETURN_FALSE;
-}
-/* }}} */
-
 /* {{{ arginfo */
 ZEND_BEGIN_ARG_INFO_EX(arginfo_session_name, 0, 0, 0)
 	ZEND_ARG_INFO(0, name)
@@ -1944,19 +1862,6 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_session_decode, 0, 0, 1)
 	ZEND_ARG_INFO(0, data)
 ZEND_END_ARG_INFO()
 
-ZEND_BEGIN_ARG_INFO_EX(arginfo_session_register, 0, 0, 1)
-	ZEND_ARG_INFO(0, name)
-	ZEND_ARG_INFO(0, ...)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_session_unregister, 0, 0, 1)
-	ZEND_ARG_INFO(0, name)
-ZEND_END_ARG_INFO()
-
-ZEND_BEGIN_ARG_INFO_EX(arginfo_session_is_registered, 0, 0, 1)
-	ZEND_ARG_INFO(0, name)
-ZEND_END_ARG_INFO()
-
 ZEND_BEGIN_ARG_INFO(arginfo_session_void, 0)
 ZEND_END_ARG_INFO()
 
@@ -1995,9 +1900,6 @@ static const zend_function_entry session_functions[] = {
 	PHP_FE(session_id,                arginfo_session_id)
 	PHP_FE(session_regenerate_id,     arginfo_session_regenerate_id)
 	PHP_FE(session_decode,            arginfo_session_decode)
-	PHP_DEP_FE(session_register,      arginfo_session_register)
-	PHP_DEP_FE(session_unregister,    arginfo_session_unregister)
-	PHP_DEP_FE(session_is_registered, arginfo_session_is_registered)
 	PHP_FE(session_encode,            arginfo_session_void)
 	PHP_FE(session_start,             arginfo_session_void)
 	PHP_FE(session_destroy,           arginfo_session_void)
diff --git a/ext/session/tests/019.phpt b/ext/session/tests/019.phpt
index e0b8256a59..3ee8ccd420 100644
--- a/ext/session/tests/019.phpt
+++ b/ext/session/tests/019.phpt
@@ -24,7 +24,6 @@ class TFoo {
 
 session_id("abtest");
 session_start();
-session_register('o1', 'o2' );
 
 $_SESSION["o1"] = new TFoo(42);
 $_SESSION["o2"] =& $_SESSION["o1"];
@@ -47,7 +46,6 @@ session_destroy();
 ?>
 --EXPECTF--
 
-Deprecated: Function session_register() is deprecated in %s on line %d
 array(2) {
   ["o1"]=>
   &object(TFoo)#%d (1) {
diff --git a/ext/session/tests/session_is_registered_basic.phpt b/ext/session/tests/session_is_registered_basic.phpt
index 5eb127ea46..dec39e5d82 100644
--- a/ext/session/tests/session_is_registered_basic.phpt
+++ b/ext/session/tests/session_is_registered_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : basic functionality
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_is_registered_variation1.phpt b/ext/session/tests/session_is_registered_variation1.phpt
index 35c357d14d..19a8c1974b 100644
--- a/ext/session/tests/session_is_registered_variation1.phpt
+++ b/ext/session/tests/session_is_registered_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_is_registered_variation2.phpt b/ext/session/tests/session_is_registered_variation2.phpt
index 3727518b19..61c9e27636 100644
--- a/ext/session/tests/session_is_registered_variation2.phpt
+++ b/ext/session/tests/session_is_registered_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_is_registered_variation3.phpt b/ext/session/tests/session_is_registered_variation3.phpt
index b435d043d9..396c7f7093 100644
--- a/ext/session/tests/session_is_registered_variation3.phpt
+++ b/ext/session/tests/session_is_registered_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_register_basic.phpt b/ext/session/tests/session_register_basic.phpt
index a394f748e8..70da518073 100644
--- a/ext/session/tests/session_register_basic.phpt
+++ b/ext/session/tests/session_register_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_register() function : basic functionality
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_register_variation1.phpt b/ext/session/tests/session_register_variation1.phpt
index 82950d9a9e..367c88449b 100644
--- a/ext/session/tests/session_register_variation1.phpt
+++ b/ext/session/tests/session_register_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_register() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_register_variation2.phpt b/ext/session/tests/session_register_variation2.phpt
index d9060c7e90..50eac60db0 100644
--- a/ext/session/tests/session_register_variation2.phpt
+++ b/ext/session/tests/session_register_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_register() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_register_variation3.phpt b/ext/session/tests/session_register_variation3.phpt
index 43172ac49a..3e7b912580 100644
--- a/ext/session/tests/session_register_variation3.phpt
+++ b/ext/session/tests/session_register_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_register() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_register_variation4.phpt b/ext/session/tests/session_register_variation4.phpt
index 4f07815026..04892bb7dd 100644
--- a/ext/session/tests/session_register_variation4.phpt
+++ b/ext/session/tests/session_register_variation4.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_register() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_unregister_basic.phpt b/ext/session/tests/session_unregister_basic.phpt
index 15ebb7dd21..39a16d0812 100644
--- a/ext/session/tests/session_unregister_basic.phpt
+++ b/ext/session/tests/session_unregister_basic.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : basic functionality
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_unregister_variation1.phpt b/ext/session/tests/session_unregister_variation1.phpt
index 609a05163f..95275dcecd 100644
--- a/ext/session/tests/session_unregister_variation1.phpt
+++ b/ext/session/tests/session_unregister_variation1.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_unregister_variation2.phpt b/ext/session/tests/session_unregister_variation2.phpt
index 19cf4d5e61..25cfefce31 100644
--- a/ext/session/tests/session_unregister_variation2.phpt
+++ b/ext/session/tests/session_unregister_variation2.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php
 
diff --git a/ext/session/tests/session_unregister_variation3.phpt b/ext/session/tests/session_unregister_variation3.phpt
index 7933b08788..5a8aa4818b 100644
--- a/ext/session/tests/session_unregister_variation3.phpt
+++ b/ext/session/tests/session_unregister_variation3.phpt
@@ -1,7 +1,7 @@
 --TEST--
 Test session_unregister() function : variation
 --SKIPIF--
-<?php include('skipif.inc'); ?>
+<?php include('skipif.inc'); if(PHP_VERSION_ID < 503099) { die('SKIP'); } ?>
 --FILE--
 <?php