delta/php-git.git/sapi/cli, branch PHP-7.0.4

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

be more precise about the meaning of -n

2016-02-10T12:57:48+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-18T16:02:23+00:00

* PHP-5.6:
  fork test
  fix test
  fork test
  fork test for win32
  fork test

fix test

2016-01-18T15:52:48+00:00

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-04T17:13:38+00:00

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

Conflicts:
	ext/json/php_json_encoder.h
	sapi/continuity/capi.c

2016-01-02T23:44:37+00:00

2016-01-01T18:03:16+00:00