projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7ae00f0 1071a26)
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Fri, 8 Jul 2016 13:05:13 +0000 (15:05 +0200)
committerJulien Pauli <jpauli@php.net>
Fri, 8 Jul 2016 13:05:13 +0000 (15:05 +0200)
* PHP-5.6:
  Updated NEWS
  Backported bug #71144 (Segmentation fault when using cURL with ZTS)
  fix bug #72024 (microtime() leaks memory)

Conflicts:
ext/curl/interface.c

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

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