Stanislav Malyshev 90a0cbd594 Merge branch 'PHP-5.6.19' into PHP-7.0.4 ...

* 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

2016-03-01 23:01:48 -08:00

..

apache2handler

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-11 21:39:31 +01:00

cgi

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

cli

Merge branch 'PHP-5.6.19' into PHP-7.0.4

2016-03-01 23:01:48 -08:00

embed

Merge branch 'PHP-5.6' into PHP-7.0

2016-01-01 19:48:25 +02:00

fpm

fpm: call zend_signal_init() in child

2016-02-15 13:23:37 +08:00

litespeed

Merge branch 'PHP-5.6' into PHP-7.0

2016-02-08 20:29:24 +02:00

phpdbg

Format string fixes

2016-02-14 14:45:53 +01:00

tests

Merge branch 'PHP-5.6'

2015-08-11 01:42:25 +02:00