delta/php-git.git/sapi/cli/php_cli_server.c, branch php-7.0.9

Fixed bug #72484 (SCRIPT_FILENAME shows wrong path if the user specify router.php)

2016-06-25T01:08:16+00:00

Merge branch 'PHP-5.6.19' into PHP-7.0.4

2016-03-02T07:01:48+00:00

* PHP-5.6.19:
  fix test file
  Fix version
  update NEWS
  Update NEWS
  Fix bug #71498: Out-of-Bound Read in phar_parse_zipfile()
  fix ts buld
  prep for 5.6.19RC1
  5.6.20 is next
  Fixed bug #71587 - Use-After-Free / Double-Free in WDDX Deserialize

Conflicts:
	configure.in
	ext/wddx/wddx.c
	main/php_version.h

fix ts buld

2016-02-18T09:31:24+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-02-14T19:49:03+00:00

* PHP-5.6:
  Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug

Fixed bug #71559 Built-in HTTP server, we can downlaod file in web by bug

2016-02-14T19:47:23+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01T17:48:25+00:00

* PHP-5.6:
  Happy new year (Update copyright to 2016)

Happy new year (Update copyright to 2016)

2016-01-01T17:21:47+00:00

Added support for HTTP 451

2015-12-23T10:31:18+00:00

Fix bug #71005 (Segfault in php_cli_server_dispatch_router()).

2015-12-01T03:09:36+00:00

We didn't initialise the retval variable in
php_cli_server_dispatch_router(); let's now initialise it to be
IS_UNDEF, as the following if condition expects.

Merge branch 'PHP-5.6'

2015-09-05T12:43:19+00:00

* PHP-5.6:
  Fix #68291: 404 on urls with '+'

Resolved conflicts:
	sapi/cli/php_cli_server.c