]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4.45' into PHP-5.5.29
authorStanislav Malyshev <stas@php.net>
Wed, 26 Aug 2015 06:08:49 +0000 (23:08 -0700)
committerStanislav Malyshev <stas@php.net>
Wed, 26 Aug 2015 06:08:49 +0000 (23:08 -0700)
commit24dda816d069a2e0cb5dc2985afd7f3269202946
tree50cbda40321bbb229c2a9de58a9c595550a2a39c
parent15e9f4baf48f1a02091d1dbf505d9c6d561bc1d4
parentdf4bf28f9f104ca3ef78ed94b497859f15b004e5
Merge branch 'PHP-5.4.45' into PHP-5.5.29

* PHP-5.4.45:
  Fix bug #70219 (Use after free vulnerability in session deserializer)
  Fix for bug #69782
  5.4.45 next

Conflicts:
configure.in
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
main/php_version.h
ext/session/session.c
ext/standard/var_unserializer.c
ext/standard/var_unserializer.re
ext/xsl/xsltprocessor.c