Adam Harvey
27ff425b78
Merge branch 'PHP-5.5' into PHP-5.6
...
* 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
2015-01-06 01:27:37 +00:00
Adam Harvey
0cc2810498
Allow CLI server test scripts to specify the name of the router file.
...
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.)
2015-01-06 01:22:59 +00:00
Yasuo Ohgaki
cbd108abf1
Implement RFC https://wiki.php.net/rfc/default_encoding
2014-02-13 11:54:52 +09:00
Nikita Popov
0a91432828
Fix cli server tests broken by r323078
...
Needs to be merged to 5.4 after r323078 is merged.
2012-02-18 11:59:13 +00:00
Peter Cowburn
1c0765195e
broaden php version wildcard in cli server tests (missed a few)
2011-11-11 11:33:23 +00:00
Peter Cowburn
2a41f272e4
broaden php version wildcard in cli server tests
2011-11-11 11:26:51 +00:00
Xinchen Hui
688ba01bc4
Fix test, now can run on windows
2011-10-25 10:54:39 +00:00
Ferenc Kovacs
145437e016
using %s-dev instead of the exact version number
2011-10-23 20:38:53 +00:00
Xinchen Hui
455bc9df4c
add tests for PATH_INFO
...
update php_cli_server.inc to support no router server
2011-10-23 13:57:25 +00:00
