kalle Wed, 21 Apr 2010 23:03:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=298282
Log:
Removed session_is_registered(), session_register() and session_unregister().
-- They are no longer needed without register_globals
Changed paths:
U php/php-src/trunk/NEWS
U php/php-src/trunk/ext/session/session.c
U php/php-src/trunk/ext/session/tests/019.phpt
U php/php-src/trunk/ext/session/tests/session_is_registered_basic.phpt
U
php/php-src/trunk/ext/session/tests/session_is_registered_variation1.phpt
U
php/php-src/trunk/ext/session/tests/session_is_registered_variation2.phpt
U
php/php-src/trunk/ext/session/tests/session_is_registered_variation3.phpt
U php/php-src/trunk/ext/session/tests/session_register_basic.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation1.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation2.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation3.phpt
U php/php-src/trunk/ext/session/tests/session_register_variation4.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_basic.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_variation1.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_variation2.phpt
U php/php-src/trunk/ext/session/tests/session_unregister_variation3.phpt
Modified: php/php-src/trunk/NEWS
===================================================================
--- php/php-src/trunk/NEWS 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/NEWS 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/session.c
===================================================================
--- php/php-src/trunk/ext/session/session.c 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/session.c 2010-04-21 23:03:16 UTC (rev 298282)
@@ -1837,88 +1837,6 @@
}
/* }}} */
-/* {{{ 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_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 @@
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)
Modified: php/php-src/trunk/ext/session/tests/019.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/019.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/019.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -24,7 +24,6 @@
session_id("abtest");
session_start();
-session_register('o1', 'o2' );
$_SESSION["o1"] = new TFoo(42);
$_SESSION["o2"] =& $_SESSION["o1"];
@@ -47,7 +46,6 @@
?>
--EXPECTF--
-Deprecated: Function session_register() is deprecated in %s on line %d
array(2) {
["o1"]=>
&object(TFoo)#%d (1) {
Modified: php/php-src/trunk/ext/session/tests/session_is_registered_basic.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_is_registered_basic.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_is_registered_basic.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_is_registered_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_is_registered_variation1.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_is_registered_variation1.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_is_registered_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_is_registered_variation2.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_is_registered_variation2.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_is_registered_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_is_registered_variation3.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_is_registered_variation3.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_register_basic.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_register_basic.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_register_basic.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_register_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_register_variation1.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_register_variation1.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_register_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_register_variation2.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_register_variation2.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_register_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_register_variation3.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_register_variation3.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_register_variation4.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_register_variation4.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_register_variation4.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_unregister_basic.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_unregister_basic.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_unregister_basic.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_unregister_variation1.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_unregister_variation1.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_unregister_variation1.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_unregister_variation2.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_unregister_variation2.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_unregister_variation2.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
Modified: php/php-src/trunk/ext/session/tests/session_unregister_variation3.phpt
===================================================================
--- php/php-src/trunk/ext/session/tests/session_unregister_variation3.phpt 2010-04-21 22:56:33 UTC (rev 298281)
+++ php/php-src/trunk/ext/session/tests/session_unregister_variation3.phpt 2010-04-21 23:03:16 UTC (rev 298282)
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
