delta/php-git.git/sapi/cli, branch php-5.6.6RC1

bump year

2015-01-15T15:26:37+00:00

Fix bug #68784

2015-01-10T02:09:13+00:00

Merge branch 'PHP-5.5' into PHP-5.6

2015-01-06T01:27:37+00:00

* 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

Handle NULL strings in sapi_cli_server_register_variable().

2015-01-06T01:23:27+00:00

Fixes bug #68745 (Invalid HTTP requests make web server segfault).

Allow CLI server test scripts to specify the name of the router file.

2015-01-06T01:22:59+00:00

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.)

Fix php cli (-S option) inconsistent port parsing

2014-12-01T06:42:12+00:00

Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).

Fix php cli (-S option) inconsistent port parsing

2014-12-01T06:29:24+00:00

Add port range verification of listening port with -S option for the php cli.
This fixes inconsistent listening port due to unverified cast from long to short
with htons(3).

Merge branch 'PHP-5.5' into PHP-5.6

2014-11-29T00:49:23+00:00

* PHP-5.5:
  fix test with readline on mac

fix test with readline on mac

2014-11-29T00:47:45+00:00

typo fixes - https://github.com/vlajos/misspell_fixer

2014-11-23T22:33:43+00:00

Conflicts:
	ext/ftp/ftp.h
	ext/pcre/pcrelib/pcre_printint.c
	ext/pcre/pcrelib/sljit/sljitLir.c
	ext/pcre/pcrelib/sljit/sljitLir.h
	ext/pcre/pcrelib/sljit/sljitNativeARM_32.c
	ext/pcre/pcrelib/sljit/sljitNativeTILEGX_64.c
	ext/pgsql/pgsql.c
	ext/phar/func_interceptors.c
	ext/soap/soap.c
	ext/standard/image.c