diff options
| author | Felipe Pena <felipensp@gmail.com> | 2012-04-29 19:36:10 -0300 |
|---|---|---|
| committer | Felipe Pena <felipensp@gmail.com> | 2012-04-29 19:36:10 -0300 |
| commit | bbe9eec9a2c385f096f4200e0f70d0aea88117b8 (patch) | |
| tree | 4ab8e3f7b0dd473c34f872644e2a77ed147cce8b /Zend/zend_language_scanner.l | |
| parent | 7fa45a9399922f324a4fe7e4af8d6f40b0592172 (diff) | |
| parent | cc5b995c78038b92317b38356c9009ff80850d8b (diff) | |
| download | php-git-bbe9eec9a2c385f096f4200e0f70d0aea88117b8.tar.gz | |
Merge branch 'PHP-5.4'
* PHP-5.4:
- Fixed bug #61827 (incorrect \e processing on Windows) patch by: ab@php.net
Diffstat (limited to 'Zend/zend_language_scanner.l')
| -rw-r--r-- | Zend/zend_language_scanner.l | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/Zend/zend_language_scanner.l b/Zend/zend_language_scanner.l index c0179dde95..9641fbbecb 100644 --- a/Zend/zend_language_scanner.l +++ b/Zend/zend_language_scanner.l @@ -905,7 +905,11 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo zendlval->value.str.len--; break; case 'e': +#ifdef PHP_WIN32 + *t++ = (char) 27; +#else *t++ = '\e'; +#endif zendlval->value.str.len--; break; case '"': |