Browse Source

MFH: Fix loss of backslash at end of heredoc; For bug #44830 (Very minor issue with backslash in heredoc)

PHP-5.2.1RC1
Matt Wilmas 18 years ago
parent
commit
4d478c9b67
  1. 1
      NEWS
  2. 8
      Zend/zend_language_scanner.l

1
NEWS

@ -7,6 +7,7 @@ PHP NEWS
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)

8
Zend/zend_language_scanner.l

@ -792,9 +792,7 @@ static void zend_scan_escape_string(zval *zendlval, char *str, int len, char quo
while (s<end) {
if (*s=='\\') {
s++;
if (s>=end) {
continue;
}
switch(*s) {
case 'n':
*t++ = '\n';
@ -1808,9 +1806,7 @@ HEREDOC_CHARS ("{"*([^$\n\r\\{]|("\\"[^\n\r]))|{HEREDOC_LITERAL_DOLLAR}|({
while (s<end) {
if (*s=='\\') {
s++;
if (s>=end) {
continue;
}
switch(*s) {
case '\\':
case '\'':

Loading…
Cancel
Save