archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 14:08:47 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Fixed bug #36513 (comment will be outputed in last line)

Browse source
This commit is contained in:
Dmitry Stogov 2006-04-13 13:48:28 +00:00
parent af429910ef
commit 67abcb58c3
3 changed files with 25 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
NEWS
View file

@ -16,6 +16,7 @@ PHP NEWS
- Fixed bug #37046 (foreach breaks static scope). (Dmitry) - Fixed bug #37046 (foreach breaks static scope). (Dmitry)
- Fixed bug #37002 (Have to quote literals in INI when concatenating with - Fixed bug #37002 (Have to quote literals in INI when concatenating with
vars). (Dmitry) vars). (Dmitry)
- Fixed bug #36513 (comment will be outputed in last line). (Dmitry)
06 Apr 2006, PHP 5.1.3RC3 06 Apr 2006, PHP 5.1.3RC3
- Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry) - Eliminated run-time constant fetching for TRUE, FALSE and NULL. (Dmitry)

22
Zend/tests/bug36513.phpt Executable file
View file

@ -0,0 +1,22 @@
--TEST--
Bug #36513 (comment will be outputed in last line)
--FILE--
<?php
function test($s) {
echo "'".trim(str_replace("&nbsp;", " ", htmlspecialchars_decode(strip_tags(highlight_string($s,1)))))."'\n";
}
eval('echo "1";//2');
eval('echo 3; //{ 4?>5');
echo "\n";
//test('<?php echo "1";//');
test('<?php echo "1";//2');
test('<?php echo "1";//22');
test('<?php echo 3; // 4 ?>5');
?>
--EXPECT--
135
'<?php echo "1";//2'
'<?php echo "1";//22'
'<?php echo 3; // 4 ?>5'

4
Zend/zend_language_scanner.l
View file

@ -1461,7 +1461,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
yymore(); yymore();
} }
<ST_ONE_LINE_COMMENT>[^\n\r?%>]+{ANY_CHAR} { <ST_ONE_LINE_COMMENT>[^\n\r?%>]*{ANY_CHAR} {
switch (yytext[yyleng-1]) { switch (yytext[yyleng-1]) {
case '?': case '%': case '>': case '?': case '%': case '>':
yyless(yyleng-1); yyless(yyleng-1);
@ -1491,7 +1491,7 @@ NEWLINE ("\r"|"\n"|"\r\n")
<ST_ONE_LINE_COMMENT>"?>"|"%>" { <ST_ONE_LINE_COMMENT>"?>"|"%>" {
if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */ if (CG(asp_tags) || yytext[yyleng-2] != '%') { /* asp comment? */
zendlval->value.str.val = yytext; /* no copying - intentional */ zendlval->value.str.val = yytext; /* no copying - intentional */
zendlval->value.str.len = yyleng; zendlval->value.str.len = yyleng-2;
zendlval->type = IS_STRING; zendlval->type = IS_STRING;
yyless(yyleng-2); yyless(yyleng-2);
BEGIN(ST_IN_SCRIPTING); BEGIN(ST_IN_SCRIPTING);