cvs: php-src /ext/session session.c
| From: | Ilia Alshanetsky | Date: | Thu, 27 Jul 2006 14:13:53 +0000 |
| Subject: | cvs: php-src /ext/session session.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-39586@lists.php.net to get a copy of this message | ||
iliaa Thu Jul 27 14:13:53 2006 UTC
Modified files:
/php-src/ext/session session.c
Log:
MFB: make C++ compilers happy
http://cvs.php.net/viewvc.cgi/php-src/ext/session/session.c?r1=1.441&r2=1.442&diff_format=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.441 php-src/ext/session/session.c:1.442
--- php-src/ext/session/session.c:1.441 Thu Jul 27 14:05:38 2006
+++ php-src/ext/session/session.c Thu Jul 27 14:13:53 2006
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.441 2006/07/27 14:05:38 iliaa Exp $ */
+/* $Id: session.c,v 1.442 2006/07/27 14:13:53 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -653,7 +653,7 @@
{
char *val;
int vallen;
- zend_bool new = 0;
+ zend_bool make_new = 0;
/* check session name for invalid characters */
if (PS(id) && strpbrk(PS(id), "\r\n\t <>'\"\\")) {
@@ -679,7 +679,7 @@
if (PS(use_cookies)) {
PS(send_cookie) = 1;
}
- new = 1;
+ make_new = 1;
}
/* Read data */
@@ -692,7 +692,7 @@
if (PS(mod)->s_read(&PS(mod_data), PS(id), &val, &vallen TSRMLS_CC) == SUCCESS) {
php_session_decode(val, vallen TSRMLS_CC);
efree(val);
- } else if (!new) {
+ } else if (!make_new) {
goto new_session;
}
}