cvs: php4 /ext/session session.c

hholzgra Wed Jul 11 09:46:11 2001 EDT Modified files: /php4/ext/session session.c Log: workaround to make ext/session well behaved with 'make test' and E_ALL Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.216 php4/ext/session/session.c:1.217 --- php4/ext/session/session.c:1.216 Wed Jul 11 09:27:27 2001 +++ php4/ext/session/session.c Wed Jul 11 09:46:11 2001 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.216 2001/07/11 13:27:27 hholzgra Exp $ */ +/* $Id: session.c,v 1.217 2001/07/11 13:46:11 hholzgra Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -801,6 +801,7 @@ int module_number = PS(module_number); int nrand; int lensess; + int stored_error_reporting; ELS_FETCH(); if (PS(session_status) != php_session_none) @@ -889,7 +890,11 @@ 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}; @@ -901,6 +906,9 @@ } 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;