summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2005-11-27 06:41:32 +0000
committerIlia Alshanetsky <iliaa@php.net>2005-11-27 06:41:32 +0000
commit331726338b9118f6ce31a06a0a97a3e4aabb3ab3 (patch)
tree98c5db25d3d741934477020e1718fa6810c92423
parent497fae9d1f23135ffddd5295f16777acc85af89f (diff)
downloadphp-git-331726338b9118f6ce31a06a0a97a3e4aabb3ab3.tar.gz
tokenizer fixes for bug #35382
Bug fixing news
-rw-r--r--NEWS4
-rw-r--r--ext/tokenizer/tokenizer.c2
2 files changed, 5 insertions, 1 deletions
diff --git a/NEWS b/NEWS
index aa37dc76f5..21697b1f55 100644
--- a/NEWS
+++ b/NEWS
@@ -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)
diff --git a/ext/tokenizer/tokenizer.c b/ext/tokenizer/tokenizer.c
index cd94b6df67..ce79eedab7 100644
--- a/ext/tokenizer/tokenizer.c
+++ b/ext/tokenizer/tokenizer.c
@@ -344,6 +344,8 @@ static void tokenize(zval *return_value TSRMLS_DC)
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: