From: Joe Watkins <krakjoe@php.net>
Date: Fri, 6 Jan 2017 05:55:14 +0000 (+0000)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.2RC1~157
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=de3649e2a360dc51f703106d10bc84e9ab0f3aa8;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  fix inappropriate warning in FPM log
---

de3649e2a360dc51f703106d10bc84e9ab0f3aa8