]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: deda058 a22175b)
Merge branch 'PHP-5.6' into PHP-7.0
authorJulien Pauli <jpauli@php.net>
Fri, 23 Sep 2016 11:53:22 +0000 (13:53 +0200)
committerJulien Pauli <jpauli@php.net>
Fri, 23 Sep 2016 11:53:22 +0000 (13:53 +0200)
* PHP-5.6:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

1  2 
sapi/fpm/fpm/fpm_scoreboard.c patch | diff1 | diff2 | blob | history

diff --cc sapi/fpm/fpm/fpm_scoreboard.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.