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

1.2 KiB

Raw Blame History

View Raw