From: Julien Pauli <jpauli@php.net>
Date: Fri, 23 Sep 2016 11:54:46 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1232^2~48
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=983f1e3618fd4a561c78793501461798f64f57b1;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  Formatting. Fix possible memory corruption in FPM SHM management
  fix every work call mmap
---

983f1e3618fd4a561c78793501461798f64f57b1