diff options
| author | Adam Harvey <aharvey@php.net> | 2015-01-06 01:27:37 +0000 |
|---|---|---|
| committer | Adam Harvey <aharvey@php.net> | 2015-01-06 01:27:37 +0000 |
| commit | 27ff425b78a1355a24d44eb719291ebd9022bc87 (patch) | |
| tree | 82e135b0e14397272bf28ff13548c13d7ce9c8dd /.gitignore | |
| parent | 4756207e7ef9fcaa80039f5cf2f6b8f8935bf66b (diff) | |
| parent | 448ef30f75988384b84cdb88bbb3a1a56b9534da (diff) | |
| download | php-git-27ff425b78a1355a24d44eb719291ebd9022bc87.tar.gz | |
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
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions