From: Julien Pauli <jpauli@php.net>
Date: Fri, 23 Sep 2016 11:54:22 +0000 (+0200)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.0RC3~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=974ba6be7a20d277723e6e7f9976219796dba7c0;p=php

Merge branch 'PHP-7.0' into PHP-7.1

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

Conflicts:
	sapi/fpm/fpm/fpm_scoreboard.c
---

974ba6be7a20d277723e6e7f9976219796dba7c0