From: Remi Collet <remi@php.net>
Date: Fri, 22 Jul 2016 07:37:15 +0000 (+0200)
Subject: Merge branch 'PHP-7.1'
X-Git-Tag: php-7.2.0alpha1~1339^2~11
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=67d1aec92bb4ee6d2e619460ae7b51ac997095e1;p=php

Merge branch 'PHP-7.1'

* PHP-7.1:
  FPM: add test for CVE-2016-5385
---

67d1aec92bb4ee6d2e619460ae7b51ac997095e1