iliaa Sun Nov 27 01:41:33 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src/ext/tokenizer tokenizer.c
/php-src NEWS
Log:
tokenizer fixes for bug #35382
Bug fixing news
http://cvs.php.net/diff.php/php-src/ext/tokenizer/tokenizer.c?r1=1.31.2.2&r2=1.31.2.3&ty=u
Index: php-src/ext/tokenizer/tokenizer.c
diff -u php-src/ext/tokenizer/tokenizer.c:1.31.2.2
php-src/ext/tokenizer/tokenizer.c:1.31.2.3
--- php-src/ext/tokenizer/tokenizer.c:1.31.2.2 Thu Nov 10 02:50:59 2005
+++ php-src/ext/tokenizer/tokenizer.c Sun Nov 27 01:41:31 2005
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: tokenizer.c,v 1.31.2.2 2005/11/10 07:50:59 sniper Exp $ */
+/* $Id: tokenizer.c,v 1.31.2.3 2005/11/27 06:41:31 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -344,6 +344,8 @@
while ((token_type = lex_scan(&token TSRMLS_CC))) {
destroy = 1;
switch (token_type) {
+ case EOF:
+ zendleng--; /* don't count EOF */
case T_OPEN_TAG:
case T_OPEN_TAG_WITH_ECHO:
case T_WHITESPACE:
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.2027.2.227&r2=1.2027.2.228&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.227 php-src/NEWS:1.2027.2.228
--- php-src/NEWS:1.2027.2.227 Sat Nov 26 16:04:42 2005
+++ php-src/NEWS Sun Nov 27 01:41:32 2005
@@ -1,16 +1,18 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2006, PHP 5.1.1
-- Changed reflection constants to class constants. (Johannes)
+- Make reflection constants be both PHP and class constants. (Johannes)
- Added an additional field $frame['object'] to the result array of
debug_backtrace() that contains a reference to the respective object when the
frame was called from an object. (Sebastian)
- Fixed bug #35413 (Removed -dev flag from Zend Engine version). (Ilia)
+- Fixed bug #35411 (Regression with \{$ handling). (Ilia)
- Fixed bug #35406 (eval hangs when evall'ed code ends with comment w/o
newline). (Marcus)
- Fixed bug #35402 (New date class causes crash in get_object_vars()). (Tony)
- Fixed bug #35391 (pdo_mysql::exec does not return number of affected rows).
(Tony)
+- Fixed bug #35382 (Comment in end of file produces fatal error). (Ilia)
- Fixed bug #35360 (exceptions in interactive mode (php -a) may cause crash).
(Dmitry)
- Fixed bug #35358 (Incorrect error messages for PDO class constants). (Ilia)
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
