]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bb7ceb0 27ff425)
Merge branch 'PHP-5.6'
authorAdam Harvey <aharvey@php.net>
Tue, 6 Jan 2015 01:29:40 +0000 (01:29 +0000)
committerAdam Harvey <aharvey@php.net>
Tue, 6 Jan 2015 01:29:40 +0000 (01:29 +0000)
commita607a1db1d16f62feac06c136c1bf435c3e55a9d
treec85e179ce8d6a09df12ba9f3143c540e090b933btree | snapshot
parentbb7ceb046eb5f0d5fa25066a3d7f9b4eb8cc3c93commit | diff
parent27ff425b78a1355a24d44eb719291ebd9022bc87commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  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/php_cli_server.c
sapi/cli/php_cli_server.c diff1 | diff2 | blob | history
sapi/cli/tests/bug61977.phpt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.