From: Remi Collet <remi@php.net>
Date: Mon, 20 Nov 2017 08:42:58 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.2.1RC1~55
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=307e15592b31d65047aa04ba7892193a22ff4f94;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Better fix bug #75540 Segfault with libzip 1.3.1 - only 1.3.1 is affected - fix use after free
---

307e15592b31d65047aa04ba7892193a22ff4f94