]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 73f13f4 552e8b2)
Merge branch 'PHP-5.5' into PHP-5.6
authorDmitry Stogov <dmitry@zend.com>
Tue, 10 Dec 2013 13:58:22 +0000 (17:58 +0400)
committerDmitry Stogov <dmitry@zend.com>
Tue, 10 Dec 2013 13:58:22 +0000 (17:58 +0400)
* PHP-5.5:
  Fixed bug #66112 (Use after free condition in SOAP extension). (martin dot koegler at brz dot gv dot at)

Conflicts:
NEWS

1  2 
ext/soap/soap.c patch | diff1 | diff2 | blob | history

diff --cc ext/soap/soap.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.