pollita Sat May 8 02:01:12 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/ext/session session.c
/php-src NEWS
Log:
MFH: if statement logic would never eval to false.
http://cvs.php.net/diff.php/php-src/ext/session/session.c?r1=1.336.2.38&r2=1.336.2.39&ty=u
Index: php-src/ext/session/session.c
diff -u php-src/ext/session/session.c:1.336.2.38
php-src/ext/session/session.c:1.336.2.39
--- php-src/ext/session/session.c:1.336.2.38 Tue Apr 13 14:23:10 2004
+++ php-src/ext/session/session.c Sat May 8 02:01:11 2004
@@ -17,7 +17,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: session.c,v 1.336.2.38 2004/04/13 18:23:10 iliaa Exp $ */
+/* $Id: session.c,v 1.336.2.39 2004/05/08 06:01:11 pollita Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -1350,7 +1350,7 @@
} else {
convert_to_string_ex(entry);
- if ((strcmp(Z_STRVAL_PP(entry), "HTTP_SESSION_VARS") != 0) ||
+ if ((strcmp(Z_STRVAL_PP(entry), "HTTP_SESSION_VARS") != 0) &&
(strcmp(Z_STRVAL_PP(entry), "_SESSION") != 0)) {
PS_ADD_VARL(Z_STRVAL_PP(entry), Z_STRLEN_PP(entry));
}
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.653&r2=1.1247.2.654&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.653 php-src/NEWS:1.1247.2.654
--- php-src/NEWS:1.1247.2.653 Fri Apr 30 13:54:45 2004
+++ php-src/NEWS Sat May 8 02:01:11 2004
@@ -5,6 +5,8 @@
then 1 character long. (Ilia)
- Fixed handling of return values from storred procedures in mssql_execute()
with multiple result sets returned. (Frank)
+- Fixed logic bug in session_register() which allowed registering _SESSION
+ and/or HTTP_SESSION_VARS. (Sara)
- Fixed bug #28229 (run-tests tripped up by spaces in names). (Marcus)
- Fixed bug #28228 (number_format() does not allow empty decimal separator).
(Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
