svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/zend_language_scanner.c branches/PHP_5_4/Zend/zend_language_scanner.l
trunk/Zend/zend_language_scanner.c trunk/Zend/zend_language_scanner.l
| From: | Felipe Pena | Date: | Wed, 30 Nov 2011 19:42:59 +0000 |
| Subject: | svn: /php/php-src/ branches/PHP_5_4/NEWS branches/PHP_5_4/Zend/zend_language_scanner.c branches/PHP_5_4/Zend/zend_language_scanner.l trunk/Zend/zend_language_scanner.c trunk/Zend/zend_language_scanner.l |
||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-67166@lists.php.net to get a copy of this message | ||
felipe Wed, 30 Nov 2011 19:42:59 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=320206
Log:
- Fixed bug #60350 (No string escape code for ESC (ascii 27), normally \e)
patch by: php at mickweiss dot com
Bug: https://bugs.php.net/60350 (Open) No string escape
code for ESC (ascii 27), normally \e
Changed paths:
U php/php-src/branches/PHP_5_4/NEWS
U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c
U php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l
U php/php-src/trunk/Zend/zend_language_scanner.c
U php/php-src/trunk/Zend/zend_language_scanner.l
Modified: php/php-src/branches/PHP_5_4/NEWS
===================================================================
--- php/php-src/branches/PHP_5_4/NEWS 2011-11-30 19:08:06 UTC (rev 320205)
+++ php/php-src/branches/PHP_5_4/NEWS 2011-11-30 19:42:59 UTC (rev 320206)
@@ -1,6 +1,9 @@
PHP NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2011, PHP 5.4.0 RC3
+- Core:
+ . Fixed bug #60350 (No string escape code for ESC (ascii 27), normally \e).
+ (php at mickweiss dot com)
- CLI SAPI:
. Implement FR #60390 (Missing $_SERVER['SERVER_PORT']). (Pierre)
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c 2011-11-30 19:08:06 UTC (rev 320205)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.c 2011-11-30 19:42:59 UTC (rev 320206)
@@ -904,6 +904,10 @@
*t++ = '\v';
zendlval->value.str.len--;
break;
+ case 'e':
+ *t++ = '\e';
+ zendlval->value.str.len--;
+ break;
case '"':
case '`':
if (*s != quote_type) {
Modified: php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l
===================================================================
--- php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l 2011-11-30 19:08:06 UTC (rev 320205)
+++ php/php-src/branches/PHP_5_4/Zend/zend_language_scanner.l 2011-11-30 19:42:59 UTC (rev 320206)
@@ -902,6 +902,10 @@
*t++ = '\v';
zendlval->value.str.len--;
break;
+ case 'e':
+ *t++ = '\e';
+ zendlval->value.str.len--;
+ break;
case '"':
case '`':
if (*s != quote_type) {
Modified: php/php-src/trunk/Zend/zend_language_scanner.c
===================================================================
--- php/php-src/trunk/Zend/zend_language_scanner.c 2011-11-30 19:08:06 UTC (rev 320205)
+++ php/php-src/trunk/Zend/zend_language_scanner.c 2011-11-30 19:42:59 UTC (rev 320206)
@@ -904,6 +904,10 @@
*t++ = '\v';
zendlval->value.str.len--;
break;
+ case 'e':
+ *t++ = '\e';
+ zendlval->value.str.len--;
+ break;
case '"':
case '`':
if (*s != quote_type) {
Modified: php/php-src/trunk/Zend/zend_language_scanner.l
===================================================================
--- php/php-src/trunk/Zend/zend_language_scanner.l 2011-11-30 19:08:06 UTC (rev 320205)
+++ php/php-src/trunk/Zend/zend_language_scanner.l 2011-11-30 19:42:59 UTC (rev 320206)
@@ -902,6 +902,10 @@
*t++ = '\v';
zendlval->value.str.len--;
break;
+ case 'e':
+ *t++ = '\e';
+ zendlval->value.str.len--;
+ break;
case '"':
case '`':
if (*s != quote_type) {