]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorJulien Pauli <jpauli@php.net>
Fri, 23 Sep 2016 11:54:22 +0000 (13:54 +0200)
committerJulien Pauli <jpauli@php.net>
Fri, 23 Sep 2016 11:54:22 +0000 (13:54 +0200)
* PHP-7.0:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap

Conflicts:
sapi/fpm/fpm/fpm_scoreboard.c

1  2 
sapi/fpm/fpm/fpm_scoreboard.c

Simple merge