cvs: php4 /ext/session session.c

yohgaki Tue Mar 5 19:26:38 2002 EDT Modified files: /php4/ext/session session.c Log: Raise error when session module failed to open or read Index: php4/ext/session/session.c diff -u php4/ext/session/session.c:1.283 php4/ext/session/session.c:1.284 --- php4/ext/session/session.c:1.283 Tue Mar 5 19:05:21 2002 +++ php4/ext/session/session.c Tue Mar 5 19:26:38 2002 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: session.c,v 1.283 2002/03/06 00:05:21 yohgaki Exp $ */ +/* $Id: session.c,v 1.284 2002/03/06 00:26:38 yohgaki Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -553,14 +553,18 @@ char *val; int vallen; - if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name)) == FAILURE) { - php_error(E_ERROR, "Failed to initialize session module"); + if (PS(mod)->open(&PS(mod_data), PS(save_path), PS(session_name) TSRMLS_CC) == FAILURE) { + PS(session_status) = php_session_disabled; + php_error(E_WARNING, "Failed to initialize session module"); return; } - if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen) == SUCCESS) { - php_session_decode(val, vallen TSRMLS_CC); - efree(val); + if (PS(mod)->read(&PS(mod_data), PS(id), &val, &vallen TSRMLS_CC) == FAILURE) { + PS(session_status) = php_session_disabled; + php_error(E_WARNING, "Failed to read session data"); + return; } + php_session_decode(val, vallen TSRMLS_CC); + efree(val); }