delta/php-git.git/sapi/cli/tests, branch php-5.6.8 git.php.net: repository/php-src.git Fixed bug #67741 (auto_prepend_file messes up __LINE__) 2015-03-03T03:43:23+00:00 Reeze Xia reeze@php.net 2015-03-03T03:25:30+00:00 4e2c87edb34c4f151da6899d523c93b8e8565975 This also fixes bug #54081 
This also fixes bug #54081
Merge branch 'PHP-5.5' into PHP-5.6 2015-01-06T01:27:37+00:00 Adam Harvey aharvey@php.net 2015-01-06T01:27:37+00:00 27ff425b78a1355a24d44eb719291ebd9022bc87 * PHP-5.5: Handle NULL strings in sapi_cli_server_register_variable(). Allow CLI server test scripts to specify the name of the router file. Conflicts: sapi/cli/tests/php_cli_server.inc 
* PHP-5.5:
  Handle NULL strings in sapi_cli_server_register_variable().
  Allow CLI server test scripts to specify the name of the router file.

Conflicts:
	sapi/cli/tests/php_cli_server.inc
Handle NULL strings in sapi_cli_server_register_variable(). 2015-01-06T01:23:27+00:00 Adam Harvey aharvey@php.net 2015-01-06T01:23:27+00:00 448ef30f75988384b84cdb88bbb3a1a56b9534da Fixes bug #68745 (Invalid HTTP requests make web server segfault). 
Fixes bug #68745 (Invalid HTTP requests make web server segfault).
Allow CLI server test scripts to specify the name of the router file. 2015-01-06T01:22:59+00:00 Adam Harvey aharvey@php.net 2015-01-06T01:22:59+00:00 0cc2810498a56e263f2e1dd77f1f42e6c53dc99e This is required to write tests that behave differently when an index.php isn't present in the document root. (Such as the one I'm about to commit.) 
This is required to write tests that behave differently when an index.php isn't
present in the document root. (Such as the one I'm about to commit.)
Merge branch 'PHP-5.5' into PHP-5.6 2014-11-29T00:49:23+00:00 Ferenc Kovacs tyrael@php.net 2014-11-29T00:49:23+00:00 7e4b77c921fa669138c01dfe334472ce1343621f * PHP-5.5: fix test with readline on mac 
* PHP-5.5:
  fix test with readline on mac
fix test with readline on mac 2014-11-29T00:47:45+00:00 Ferenc Kovacs tyrael@php.net 2014-11-29T00:47:45+00:00 108bf849674d772cbf9bfeb2e95072f40ab4c91d 






Merge branch 'PHP-5.5' into PHP-5.6
2014-09-27T00:18:29+00:00

Johannes Schlüter
johannes@php.net

2014-09-27T00:18:29+00:00

16b4167fdd817b5906e9ab22492911d14f033206












Merge branch 'PHP-5.4' into PHP-5.5
2014-09-27T00:17:52+00:00

Johannes Schlüter
johannes@php.net

2014-09-27T00:17:52+00:00

e6105ffb22e5417e98d09bbe183f1f42057753ca












This test should pass
2014-09-27T00:17:26+00:00

Johannes Schlüter
johannes@php.net

2014-09-27T00:17:26+00:00

2711948d14cbcd5ababf82cae55ef25f3f870e1f












Merge branch 'PHP-5.5' into PHP-5.6
2014-07-07T20:45:01+00:00

Adam Harvey
aharvey@php.net

2014-07-07T20:45:01+00:00

70e9d3e2f9d7bc0b48811f01c084f82524af604c

* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).





* PHP-5.5:
  Fixed bug #66830 (Empty header causes PHP built-in web server to hang).