- Fixed bug #60350 (No string escape code for ESC (ascii 27), normally \e)

  patch by: php at mickweiss dot com

diff --git a/NEWS b/NEWS
index 4e542dea147ed2438e9e6ba507ff1c0edbd2c2de..052d46d6434c3f1aefab4b105b326c611efbfbb9 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)

diff --git a/Zend/zend_language_scanner.c b/Zend/zend_language_scanner.c
index 10e50b5fff47f2e08a85ec74441b16477875f4cf..c4e95cdf305a2f99f653132f94b9a0d16df1cd81 100644 (file)
--- a/Zend/zend_language_scanner.c
+++ b/Zend/zend_language_scanner.c
@@ -904,6 +904,10 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
                                        *t++ = '\v';
                                        zendlval->value.str.len--;
                                        break;
+                               case 'e':
+                                       *t++ = '\e';
+                                       zendlval->value.str.len--;
+                                       break;
                                case '"':
                                case '`':
                                        if (*s != quote_type) {

diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l
index 1dd509e090b2a795d5a3bc88553ad51d2c68a2ed..2661ff75c1263397a584fc64903f6c6a8e391709 100644 (file)
--- a/Zend/zend_language_scanner.l
+++ b/Zend/zend_language_scanner.l
@@ -902,6 +902,10 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
                                        *t++ = '\v';
                                        zendlval->value.str.len--;
                                        break;
+                               case 'e':
+                                       *t++ = '\e';
+                                       zendlval->value.str.len--;
+                                       break;
                                case '"':
                                case '`':
                                        if (*s != quote_type) {