cvs: ZendEngine2(PHP_5_2) / zend_language_scanner.l php-src NEWS
[email protected] ("Matt Wilmas")
| Newsgroups | php.zend-engine.cvs |
|---|---|
| Message-ID | <cvsmattwil1210328941@cvsserver> |
mattwil Fri May 9 10:29:01 2008 UTC
Modified files: (Branch: PHP_5_2)
/php-src NEWS
/ZendEngine2 zend_language_scanner.l
Log:
MFH: Fix loss of backslash at end of heredoc; For bug #44830 (Very minor issue with backslash in heredoc)
http://cvs.php.net/viewvc.cgi/php-src/NEWS?r1=1.2027.2.547.2.1155&r2=1.2027.2.547.2.1156&diff_format=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.2027.2.547.2.1155 php-src/NEWS:1.2027.2.547.2.1156
--- php-src/NEWS:1.2027.2.547.2.1155 Wed May 7 20:03:26 2008
+++ php-src/NEWS Fri May 9 10:29:01 2008
@@ -7,6 +7,7 @@
as function parameter. (Rob)
- Fixed bug #44836 (putenv() crashes, avoid direct reference of environ in
POSIX systems). (Ilia, delphij at FreeBSD dot org)
+- Fixed bug #44830 (Very minor issue with backslash in heredoc). (Matt)
- Fixed bug #44811 (Improve error message when creating a new SoapClient that
contains invalid data). (Markus Fischer, David C)
- Fixed bug #44798 (Memory leak assigning value to attribute). (Ilia)
http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_language_scanner.l?r1=1.131.2.11.2.15&r2=1.131.2.11.2.16&diff_format=u
Index: ZendEngine2/zend_language_scanner.l
diff -u ZendEngine2/zend_language_scanner.l:1.131.2.11.2.15 ZendEngine2/zend_language_scanner.l:1.131.2.11.2.16
--- ZendEngine2/zend_language_scanner.l:1.131.2.11.2.15 Wed Apr 9 21:40:13 2008
+++ ZendEngine2/zend_language_scanner.l Fri May 9 10:29:01 2008
@@ -19,7 +19,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: zend_language_scanner.l,v 1.131.2.11.2.15 2008/04/09 21:40:13 scottmac Exp $ */
+/* $Id: zend_language_scanner.l,v 1.131.2.11.2.16 2008/05/09 10:29:01 mattwil Exp $ */
#define yyleng SCNG(yy_leng)
#define yytext SCNG(yy_text)
@@ -792,9 +792,7 @@
while (s<end) {
if (*s=='\\') {
s++;
- if (s>=end) {
- continue;
- }
+
switch(*s) {
case 'n':
*t++ = '\n';
@@ -1808,9 +1806,7 @@
while (s<end) {
if (*s=='\\') {
s++;
- if (s>=end) {
- continue;
- }
+
switch(*s) {
case '\\':
case '\'':