cvs: php4 /ext/session session.c /ext/session/tests 004.phpt

thies Fri Jul 13 06:32:38 2001 EDT Modified files: /php4/ext/session session.c /php4/ext/session/tests 004.phpt Log: make regession test of session work without the ugly hack in session.c and removed that ugly hack. Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.217 php4/ext/session/session.c:1.218 --- php4/ext/session/session.c:1.217 Wed Jul 11 09:46:11 2001 +++ php4/ext/session/session.c Fri Jul 13 06:32:37 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.217 2001/07/11 13:46:11 hholzgra Exp $ */ +/* $Id: session.c,v 1.218 2001/07/13 10:32:37 thies Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -801,7 +801,6 @@ int module_number = PS(module_number); int nrand; int lensess; - int stored_error_reporting; ELS_FETCH(); if (PS(session_status) != php_session_none) @@ -891,9 +890,6 @@ if (send_cookie) php_session_send_cookie(PSLS_C); - /* workaround to prevent warnings when redefining SID */ - stored_error_reporting=EG(error_reporting); - EG(error_reporting) ^= E_NOTICE; if (define_sid) { smart_str var = {0}; @@ -906,9 +902,6 @@ } else REGISTER_STRING_CONSTANT("SID", empty_string, 0); PS(define_sid) = define_sid; - - /* workaround to prevent warnings when redefining SID */ - EG(error_reporting)=stored_error_reporting; PS(session_status)= php_session_active; Index: php4/ext/session/tests/004.phpt diff -u php4/ext/session/tests/004.phpt:1.2 php4/ext/session/tests/004.phpt:1.3 --- php4/ext/session/tests/004.phpt:1.2 Sun Jan 7 05:40:41 2001 +++ php4/ext/session/tests/004.phpt Fri Jul 13 06:32:37 2001 @@ -2,6 +2,7 @@ session_set_save_handler test --FILE-- <? +error_reporting(~E_NOTICE); class handler { var $data = 'baz|O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}arr|a:1:{i:3;O:3:"foo":2:{s:3:"bar";s:2:"ok";s:3:"yes";i:1;}}'; @@ -64,6 +65,7 @@ var_dump($arr); session_destroy(); +?> --EXPECT-- OPEN: /tmp, PHPSESSID READ: test