sniper Mon Apr 10 15:06:51 2006 UTC
Removed files:
/php-src/ext/session/tests 007.phpt 008-php4.2.3.phpt 008.phpt
012.phpt 019.phpt
Modified files:
/php-src/ext/session php_session.h session.c
/php-src/ext/session/tests 009.phpt 010.phpt 011.phpt 013.phpt
014.phpt skipif.inc
Log:
- Cleanup
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/php_session.h?r1=1.105&r2=1.106&diff_format=u
Index: php-src/ext/session/php_session.h
diff -u php-src/ext/session/php_session.h:1.105
php-src/ext/session/php_session.h:1.106
--- php-src/ext/session/php_session.h:1.105 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/php_session.h Mon Apr 10 15:06:51 2006
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_session.h,v 1.105 2006/03/07 00:20:53 pajoye Exp $ */
+/* $Id: php_session.h,v 1.106 2006/04/10 15:06:51 sniper Exp $ */
#ifndef PHP_SESSION_H
#define PHP_SESSION_H
@@ -111,8 +111,6 @@
long gc_maxlifetime;
int module_number;
long cache_expire;
- zend_bool bug_compat; /* Whether to behave like PHP 4.2 and earlier */
- zend_bool bug_compat_warn; /* Whether to warn about it */
const struct ps_serializer_struct *serializer;
zval *http_session_vars;
zend_bool auto_start;
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/session.c?r1=1.432&r2=1.433&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.432 php-src/ext/session/session.c:1.433
--- php-src/ext/session/session.c:1.432 Thu Mar 16 09:44:41 2006
+++ php-src/ext/session/session.c Mon Apr 10 15:06:51 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.432 2006/03/16 09:44:41 dmitry Exp $ */
+/* $Id: session.c,v 1.433 2006/04/10 15:06:51 sniper Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -145,8 +145,6 @@
/* {{{ PHP_INI
*/
PHP_INI_BEGIN()
- STD_PHP_INI_BOOLEAN("session.bug_compat_42", "1",
PHP_INI_ALL, OnUpdateBool, bug_compat, php_ps_globals, ps_globals)
- STD_PHP_INI_BOOLEAN("session.bug_compat_warn", "1",
PHP_INI_ALL, OnUpdateBool, bug_compat_warn, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.save_path", "",
PHP_INI_ALL, OnUpdateSaveDir,save_path, php_ps_globals, ps_globals)
STD_PHP_INI_ENTRY("session.name", "PHPSESSID",
PHP_INI_ALL, OnUpdateString, session_name, php_ps_globals, ps_globals)
PHP_INI_ENTRY("session.save_handler", "files",
PHP_INI_ALL, OnUpdateSaveHandler)
@@ -723,27 +721,6 @@
int ret = FAILURE;
IF_SESSION_VARS() {
- if (PS(bug_compat)) {
- HashTable *ht = Z_ARRVAL_P(PS(http_session_vars));
- HashPosition pos;
- zval **val;
- int do_warn = 0;
-
- zend_hash_internal_pointer_reset_ex(ht, &pos);
-
- while (zend_hash_get_current_data_ex(ht,
- (void **) &val, &pos) !=
FAILURE) {
- if (Z_TYPE_PP(val) == IS_NULL) {
- if (migrate_global(ht, &pos TSRMLS_CC))
- do_warn = 1;
- }
- zend_hash_move_forward_ex(ht, &pos);
- }
-
- if (do_warn && PS(bug_compat_warn)) {
- php_error_docref(NULL TSRMLS_CC, E_WARNING,
"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. You can disable this functionality and this
warning by setting session.bug_compat_42 or session.bug_compat_warn to off,
respectively.");
- }
- }
if (PS(mod_data)) {
char *val;
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/009.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/session/tests/009.phpt
diff -u php-src/ext/session/tests/009.phpt:1.8
php-src/ext/session/tests/009.phpt:1.9
--- php-src/ext/session/tests/009.phpt:1.8 Mon Mar 27 14:08:10 2006
+++ php-src/ext/session/tests/009.phpt Mon Apr 10 15:06:51 2006
@@ -1,12 +1,10 @@
--TEST--
-unset($_SESSION["name"]); should work with register_globals=off
+unset($_SESSION["name"]); should work
--SKIPIF--
<?php include('skipif.inc'); ?>
--INI--
session.use_cookies=0
session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
session.serialize_handler=php
session.save_handler=files
--FILE--
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/010.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/session/tests/010.phpt
diff -u php-src/ext/session/tests/010.phpt:1.3
php-src/ext/session/tests/010.phpt:1.4
--- php-src/ext/session/tests/010.phpt:1.3 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/tests/010.phpt Mon Apr 10 15:06:51 2006
@@ -5,8 +5,6 @@
--INI--
session.use_cookies=0
session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
--FILE--
<?php
error_reporting(E_ALL);
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/011.phpt?r1=1.3&r2=1.4&diff_format=u
Index: php-src/ext/session/tests/011.phpt
diff -u php-src/ext/session/tests/011.phpt:1.3
php-src/ext/session/tests/011.phpt:1.4
--- php-src/ext/session/tests/011.phpt:1.3 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/tests/011.phpt Mon Apr 10 15:06:51 2006
@@ -5,8 +5,6 @@
--INI--
session.use_cookies=0
session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
--FILE--
<?php
error_reporting(E_ALL);
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/013.phpt?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/session/tests/013.phpt
diff -u php-src/ext/session/tests/013.phpt:1.5
php-src/ext/session/tests/013.phpt:1.6
--- php-src/ext/session/tests/013.phpt:1.5 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/tests/013.phpt Mon Apr 10 15:06:51 2006
@@ -5,8 +5,6 @@
--INI--
session.use_cookies=0
session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
session.serialize_handler=php
session.save_handler=files
--FILE--
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/014.phpt?r1=1.8&r2=1.9&diff_format=u
Index: php-src/ext/session/tests/014.phpt
diff -u php-src/ext/session/tests/014.phpt:1.8
php-src/ext/session/tests/014.phpt:1.9
--- php-src/ext/session/tests/014.phpt:1.8 Tue Mar 7 00:20:53 2006
+++ php-src/ext/session/tests/014.phpt Mon Apr 10 15:06:51 2006
@@ -6,8 +6,6 @@
session.use_trans_sid=1
session.use_cookies=0
session.cache_limiter=
-session.bug_compat_42=1
-session.bug_compat_warn=0
session.name=PHPSESSID
session.serialize_handler=php
session.save_handler=files
http://cvs.php.net/viewcvs.cgi/php-src/ext/session/tests/skipif.inc?r1=1.5&r2=1.6&diff_format=u
Index: php-src/ext/session/tests/skipif.inc
diff -u php-src/ext/session/tests/skipif.inc:1.5
php-src/ext/session/tests/skipif.inc:1.6
--- php-src/ext/session/tests/skipif.inc:1.5 Thu May 27 20:53:26 2004
+++ php-src/ext/session/tests/skipif.inc Mon Apr 10 15:06:51 2006
@@ -1,6 +1,6 @@
<?php
// This script prints "skip" if condition does not meet.
-if (!extension_loaded("session") && ini_get("enable_dl")) {
+if (!extension_loaded("session")) {
$dlext = (substr(PHP_OS, 0, 3) == "WIN") ? ".dll" : ".so";
@dl("session$dlext");
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
