]> granicus.if.org Git - php/commit
Merge branch 'PHP-5.4' into PHP-5.5
authorStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 20:35:00 +0000 (13:35 -0700)
committerStanislav Malyshev <stas@php.net>
Mon, 14 Apr 2014 20:35:24 +0000 (13:35 -0700)
commit8bc82718aecf60696d2d0a9517403f8a282e3573
tree8717a2312856a4b2ed2edf5ea1df0c6fe5042f42
parent22acea99ff3456abf316e838bfdabe37628e36f8
parenta186312832207437e4783024dcdece5232ac6c39
Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
  Fix #66942: openssl_seal() memory leak
  ws fix

Conflicts:
ext/openssl/openssl.c
NEWS
ext/openssl/openssl.c
ext/session/mod_files.c