Adam Harvey a607a1db1d 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

2015-01-06 01:29:40 +00:00

69 KiB

Raw Blame History

View Raw