]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1c331d8 ffdc2c4)
Merge branch 'PHP-5.6'
authorAnatol Belski <ab@php.net>
Sun, 8 Feb 2015 11:43:22 +0000 (12:43 +0100)
committerAnatol Belski <ab@php.net>
Sun, 8 Feb 2015 11:43:22 +0000 (12:43 +0100)
* PHP-5.6:
  Fix another invalid free of CG(interned_empty_string)
  add tests for #68996
  Fixed #68790 (Missing return)
  Invalid free of CG(interned_empty_string)

Conflicts:
ext/soap/soap.c
ext/wddx/wddx.c
main/main.c
sapi/litespeed/lsapi_main.c


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.