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

 -- They are no longer needed without register_globals

diff --git a/NEWS b/NEWS
index ff76aa148f16504251fc0447c2d52d8b718dc79d..7499696f5c3f9c15428217d12fec8c8b7e7dda71 100644 (file)
--- 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 c6c4a39401afcf170a99ebc10b1ffbcbad0024f2..36f86afaa0adae020733f252ac1a6676768b8679 100644 (file)
--- 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 e0b8256a590d1766233e2af2ce687e5fea9bc203..3ee8ccd420826e45710fd103b3ff74cf948b4341 100644 (file)
--- 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 5eb127ea469528f0c65704eb50250d67c55fa58d..dec39e5d8285ad1e7ebfbd2ec8da2fc38c70bdb1 100644 (file)
--- 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 35c357d14db0851ee3996579a2271f8f9fa4de1c..19a8c1974bab590c04274fdb57cbb52f35b64c36 100644 (file)
--- 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 3727518b19a092d34c5d9e1881061ff58d706ef6..61c9e276366d87239cd879c2514c8fbc6dab1b47 100644 (file)
--- 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 b435d043d9cd6dc254c362c70b508516881f11dc..396c7f709306b4d54eeba6ad9e31b4e9a21811c8 100644 (file)
--- 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 a394f748e87639ee39c188d6be71aaea5cf9a3f1..70da5180732503cf01444ea6da2f897efb1fab01 100644 (file)
--- 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 82950d9a9eae8eee4234246729337d271339a160..367c88449bb915c5356cca693dcd8b309e27df44 100644 (file)
--- 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 d9060c7e901554a059aff0ca1987f824bc16a1f2..50eac60db029eb2a92cb6adbcf9edd11de203b31 100644 (file)
--- 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 43172ac49a9afa9b1a0ef1dcd209db392b65f5ea..3e7b912580a549556899f6c38bb7be217966e4b3 100644 (file)
--- 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 4f078150268341a5bde9a4208b5c2567d2bd5694..04892bb7ddc3c1daa1f1658a5352ef6a357a24c7 100644 (file)
--- 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 15ebb7dd217d53e587ebe34de583d90e00f4e3b9..39a16d0812fa9294b78d79e86e7e7ee12d235239 100644 (file)
--- 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 609a05163f83f8d51321278316b64594b3cad610..95275dcecd152f6f9ecb915f5b2039e642bb273d 100644 (file)
--- 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 19cf4d5e612ca7afa1b2972c6c601d1aed0ec5cf..25cfefce315b942797f7e9a46514f25da23aaeb3 100644 (file)
--- 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 7933b08788d2a457ba072613f6a0d9436fb04d56..5a8aa4818bfd2d9ea477cbd7cb0c4d6245fd3e45 100644 (file)
--- 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