diff options
| -rw-r--r-- | ext/session/session.c | 7 | ||||
| -rw-r--r-- | ext/session/tests/004.phpt | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/ext/session/session.c b/ext/session/session.c index 14cf24731e..1248e6e02d 100644 --- a/ext/session/session.c +++ b/ext/session/session.c @@ -801,7 +801,6 @@ static void php_session_start(PSLS_D) 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 @@ static void php_session_start(PSLS_D) 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}; @@ -907,9 +903,6 @@ static void php_session_start(PSLS_D) 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; php_session_cache_limiter(PSLS_C); diff --git a/ext/session/tests/004.phpt b/ext/session/tests/004.phpt index 8e6ec4e8d3..7fe4afbfa7 100644 --- a/ext/session/tests/004.phpt +++ b/ext/session/tests/004.phpt @@ -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($baz); var_dump($arr); session_destroy(); +?> --EXPECT-- OPEN: /tmp, PHPSESSID READ: test |