iliaa Tue Dec 13 20:55:42 2005 EDT
Modified files: (Branch: PHP_5_1)
/php-src NEWS
/php-src/ext/tokenizer/tests bug26463.phpt
Log:
Fixed bug #35655 (whitespace following end of heredoc is lost).
http://cvs.php.net/viewcvs.cgi/php-src/NEWS?r1=1.2027.2.290&r2=1.2027.2.291&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.290 php-src/NEWS:1.2027.2.291
--- php-src/NEWS:1.2027.2.290 Tue Dec 13 02:28:33 2005
+++ php-src/NEWS Tue Dec 13 20:55:42 2005
@@ -26,6 +26,7 @@
- Fixed many bugs in OCI8. (Tony)
- Fixed crash and leak in mysqli when using 4.1.x client libraries and
connecting to 5.x server. (Andrey)
+- Fixed bug #35655 (whitespace following end of heredoc is lost). (Ilia)
- Fixed bug #35630 (strtotime() crashes on certain relative identifiers).
(Ilia)
- Fixed bug #35629 (crash in http:// wrapper on multiple redirects). (Ilia)
http://cvs.php.net/viewcvs.cgi/php-src/ext/tokenizer/tests/bug26463.phpt?r1=1.2&r2=1.2.4.1&diff_format=u
Index: php-src/ext/tokenizer/tests/bug26463.phpt
diff -u php-src/ext/tokenizer/tests/bug26463.phpt:1.2
php-src/ext/tokenizer/tests/bug26463.phpt:1.2.4.1
--- php-src/ext/tokenizer/tests/bug26463.phpt:1.2 Mon Feb 16 17:09:08 2004
+++ php-src/ext/tokenizer/tests/bug26463.phpt Tue Dec 13 20:55:42 2005
@@ -14,11 +14,11 @@
var_dump(token_get_all($str));
?>
--EXPECTF--
-array(17) {
+array(19) {
[0]=>
array(2) {
[0]=>
- int(%d)
+ int(367)
[1]=>
string(6) "<?php
"
@@ -26,7 +26,7 @@
[1]=>
array(2) {
[0]=>
- int(%d)
+ int(309)
[1]=>
string(2) "$x"
}
@@ -35,7 +35,7 @@
[3]=>
array(2) {
[0]=>
- int(%d)
+ int(371)
[1]=>
string(6) "<<<DD
"
@@ -43,7 +43,7 @@
[4]=>
array(2) {
[0]=>
- int(%d)
+ int(307)
[1]=>
string(13) "jhdsjkfhjdsh
"
@@ -51,67 +51,83 @@
[5]=>
array(2) {
[0]=>
- int(%d)
+ int(372)
[1]=>
string(2) "DD"
}
[6]=>
- string(1) "."
+ array(2) {
+ [0]=>
+ int(370)
+ [1]=>
+ string(1) "
+"
+ }
[7]=>
+ string(1) "."
+ [8]=>
array(2) {
[0]=>
- int(%d)
+ int(315)
[1]=>
string(2) """"
}
- [8]=>
- string(1) ";"
[9]=>
+ string(1) ";"
+ [10]=>
array(2) {
[0]=>
- int(%d)
+ int(370)
[1]=>
string(1) "
"
}
- [10]=>
+ [11]=>
array(2) {
[0]=>
- int(%d)
+ int(309)
[1]=>
string(2) "$a"
}
- [11]=>
- string(1) "="
[12]=>
+ string(1) "="
+ [13]=>
array(2) {
[0]=>
- int(%d)
+ int(371)
[1]=>
string(8) "<<<DDDD
"
}
- [13]=>
+ [14]=>
array(2) {
[0]=>
- int(%d)
+ int(307)
[1]=>
string(13) "jhdsjkfhjdsh
"
}
- [14]=>
+ [15]=>
array(2) {
[0]=>
- int(%d)
+ int(372)
[1]=>
string(4) "DDDD"
}
- [15]=>
- string(1) ";"
[16]=>
+ string(1) ";"
+ [17]=>
+ array(2) {
+ [0]=>
+ int(370)
+ [1]=>
+ string(1) "
+"
+ }
+ [18]=>
array(2) {
[0]=>
- int(%d)
+ int(369)
[1]=>
string(2) "?>"
}
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
