tyrael Mon, 26 Sep 2011 23:28:24 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=317363
Log: fix #49599, the eol-style is important here, as this is a regression test for #36459 Bugs: https://bugs.php.net/49599 (Closed) file eol lost with svn migration https://bugs.php.net/36459 (Closed) Incorrect adding PHPSESSID to links, which contains \r\n Changed paths: UU php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt UU php/php-src/branches/PHP_5_4/ext/session/tests/bug36459.phpt UU php/php-src/trunk/ext/session/tests/bug36459.phpt
Modified: php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt 2011-09-26 23:12:15 UTC (rev 317362) +++ php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt 2011-09-26 23:28:24 UTC (rev 317363) @@ -1,42 +1,42 @@ ---TEST-- -Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n) ---SKIPIF-- -<?php include('skipif.inc'); ?> ---INI-- -session.use_trans_sid=1 -session.use_cookies=0 -session.use_only_cookies=0 -session.name=sid ---FILE-- -<?php -error_reporting(E_ALL); - -session_start(); - -# Do not remove \r from this tests, they are essential! -?> -<html> - <head> - <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> - </head> - <body> - <p>See source html code</p> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" - style="font: normal 11pt Times New Roman">incorrect link</a><br /> - <br /> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" style="font: normal 11pt Times New Roman">correct link</a> - </body> -</html> ---EXPECTF-- -<html> - <head> - <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> - </head> - <body> - <p>See source html code</p> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" - style="font: normal 11pt Times New Roman">incorrect link</a><br /> - <br /> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" style="font: normal 11pt Times New Roman">correct link</a> - </body> -</html> +--TEST-- +Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n) +--SKIPIF-- +<?php include('skipif.inc'); ?> +--INI-- +session.use_trans_sid=1 +session.use_cookies=0 +session.use_only_cookies=0 +session.name=sid +--FILE-- +<?php +error_reporting(E_ALL); + +session_start(); + +# Do not remove \r from this tests, they are essential! +?> +<html> + <head> + <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> + </head> + <body> + <p>See source html code</p> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" + style="font: normal 11pt Times New Roman">incorrect link</a><br /> + <br /> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" style="font: normal 11pt Times New Roman">correct link</a> + </body> +</html> +--EXPECTF-- +<html> + <head> + <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> + </head> + <body> + <p>See source html code</p> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" + style="font: normal 11pt Times New Roman">incorrect link</a><br /> + <br /> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" style="font: normal 11pt Times New Roman">correct link</a> + </body> +</html> Property changes on: php/php-src/branches/PHP_5_3/ext/session/tests/bug36459.phpt ___________________________________________________________________ Modified: svn:eol-style - native + CRLF Modified: php/php-src/branches/PHP_5_4/ext/session/tests/bug36459.phpt =================================================================== --- php/php-src/branches/PHP_5_4/ext/session/tests/bug36459.phpt 2011-09-26 23:12:15 UTC (rev 317362) +++ php/php-src/branches/PHP_5_4/ext/session/tests/bug36459.phpt 2011-09-26 23:28:24 UTC (rev 317363) @@ -1,42 +1,42 @@ ---TEST-- -Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n) ---SKIPIF-- -<?php include('skipif.inc'); ?> ---INI-- -session.use_trans_sid=1 -session.use_cookies=0 -session.use_only_cookies=0 -session.name=sid ---FILE-- -<?php -error_reporting(E_ALL); - -session_start(); - -# Do not remove \r from this tests, they are essential! -?> -<html> - <head> - <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> - </head> - <body> - <p>See source html code</p> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" - style="font: normal 11pt Times New Roman">incorrect link</a><br /> - <br /> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" style="font: normal 11pt Times New Roman">correct link</a> - </body> -</html> ---EXPECTF-- -<html> - <head> - <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> - </head> - <body> - <p>See source html code</p> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" - style="font: normal 11pt Times New Roman">incorrect link</a><br /> - <br /> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" style="font: normal 11pt Times New Roman">correct link</a> - </body> -</html> +--TEST-- +Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n) +--SKIPIF-- +<?php include('skipif.inc'); ?> +--INI-- +session.use_trans_sid=1 +session.use_cookies=0 +session.use_only_cookies=0 +session.name=sid +--FILE-- +<?php +error_reporting(E_ALL); + +session_start(); + +# Do not remove \r from this tests, they are essential! +?> +<html> + <head> + <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> + </head> + <body> + <p>See source html code</p> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" + style="font: normal 11pt Times New Roman">incorrect link</a><br /> + <br /> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" style="font: normal 11pt Times New Roman">correct link</a> + </body> +</html> +--EXPECTF-- +<html> + <head> + <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> + </head> + <body> + <p>See source html code</p> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" + style="font: normal 11pt Times New Roman">incorrect link</a><br /> + <br /> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" style="font: normal 11pt Times New Roman">correct link</a> + </body> +</html> Property changes on: php/php-src/branches/PHP_5_4/ext/session/tests/bug36459.phpt ___________________________________________________________________ Modified: svn:eol-style - native + CRLF Modified: php/php-src/trunk/ext/session/tests/bug36459.phpt =================================================================== --- php/php-src/trunk/ext/session/tests/bug36459.phpt 2011-09-26 23:12:15 UTC (rev 317362) +++ php/php-src/trunk/ext/session/tests/bug36459.phpt 2011-09-26 23:28:24 UTC (rev 317363) @@ -1,42 +1,42 @@ ---TEST-- -Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n) ---SKIPIF-- -<?php include('skipif.inc'); ?> ---INI-- -session.use_trans_sid=1 -session.use_cookies=0 -session.use_only_cookies=0 -session.name=sid ---FILE-- -<?php -error_reporting(E_ALL); - -session_start(); - -# Do not remove \r from this tests, they are essential! -?> -<html> - <head> - <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> - </head> - <body> - <p>See source html code</p> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" - style="font: normal 11pt Times New Roman">incorrect link</a><br /> - <br /> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" style="font: normal 11pt Times New Roman">correct link</a> - </body> -</html> ---EXPECTF-- -<html> - <head> - <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> - </head> - <body> - <p>See source html code</p> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" - style="font: normal 11pt Times New Roman">incorrect link</a><br /> - <br /> - <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" style="font: normal 11pt Times New Roman">correct link</a> - </body> -</html> +--TEST-- +Bug #31454 (Incorrect adding PHPSESSID to links, which contains \r\n) +--SKIPIF-- +<?php include('skipif.inc'); ?> +--INI-- +session.use_trans_sid=1 +session.use_cookies=0 +session.use_only_cookies=0 +session.name=sid +--FILE-- +<?php +error_reporting(E_ALL); + +session_start(); + +# Do not remove \r from this tests, they are essential! +?> +<html> + <head> + <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> + </head> + <body> + <p>See source html code</p> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" + style="font: normal 11pt Times New Roman">incorrect link</a><br /> + <br /> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2" style="font: normal 11pt Times New Roman">correct link</a> + </body> +</html> +--EXPECTF-- +<html> + <head> + <title>Bug #36459 Incorrect adding PHPSESSID to links, which contains \r\n</title> + </head> + <body> + <p>See source html code</p> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" + style="font: normal 11pt Times New Roman">incorrect link</a><br /> + <br /> + <a href="/b2w/www/ru/adm/pages/?action=prev&rec_id=8&pid=2&sid=%s" style="font: normal 11pt Times New Roman">correct link</a> + </body> +</html> Property changes on: php/php-src/trunk/ext/session/tests/bug36459.phpt ___________________________________________________________________ Modified: svn:eol-style - native + CRLF
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php