php-src/sapi
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
..
aolserver Bump year 2014-01-03 11:08:10 +08:00
apache Bump year 2014-01-03 11:08:10 +08:00
apache2filter fix some warnings 2014-03-24 17:51:50 +01:00
apache2handler Merge branch 'PHP-5.5' into PHP-5.6 2014-04-13 15:39:32 -07:00
apache_hooks Bump year 2014-01-03 11:08:10 +08:00
caudium Bump year 2014-01-03 11:08:10 +08:00
cgi Merge branch 'PHP-5.5' into PHP-5.6 2014-12-30 01:26:53 -08:00
cli Merge branch 'PHP-5.5' into PHP-5.6 2015-01-06 01:27:37 +00:00
continuity Bump year 2014-01-03 11:08:10 +08:00
embed Merge branch 'PHP-5.4' into PHP-5.5 2014-03-24 10:28:48 +01:00
fpm Merge branch 'PHP-5.5' into PHP-5.6 2015-01-05 17:35:14 +01:00
isapi Bump year 2014-01-03 11:08:10 +08:00
litespeed typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:33:43 -08:00
milter Merge branch 'PHP-5.4' into PHP-5.5 2014-07-30 20:12:50 +02:00
nsapi typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:33:43 -08:00
phpdbg typo fix 2014-11-26 18:41:50 +01:00
phttpd Bump year 2014-01-03 11:08:10 +08:00
pi3web Bump year 2014-01-03 11:08:10 +08:00
roxen Bump year 2014-01-03 11:08:10 +08:00
tests - Rewrite scanner to be based on re2c instead of flex 2008-03-16 21:06:55 +00:00
thttpd typo fixes - https://github.com/vlajos/misspell_fixer 2014-11-23 14:33:43 -08:00
tux Bump year 2014-01-03 11:08:10 +08:00
webjames Bump year 2014-01-03 11:08:10 +08:00