]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 07b6fc9 6e6a556)
Merge branch 'PHP-5.6.19' into PHP-7.0.4
authorStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 07:01:48 +0000 (23:01 -0800)
committerStanislav Malyshev <stas@php.net>
Wed, 2 Mar 2016 07:01:48 +0000 (23:01 -0800)
commit90a0cbd59470dcc81f57c66698f05158149d2980
tree53dbb8c272b7276f5de1114a7787034048649fe9tree | snapshot
parent07b6fc93b11b46926db6e7c02f90c84981a40c33commit | diff
parent6e6a556b8c8e192ab44edeaabe012f29b614202dcommit | diff
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
ext/phar/zip.c diff1 | diff2 | blob | history
ext/wddx/wddx.c diff1 | diff2 | blob | history
sapi/cli/php_cli_server.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.