From: Joe Watkins <krakjoe@php.net>
Date: Mon, 23 Oct 2017 08:11:52 +0000 (+0100)
Subject: Merge branch 'PHP-7.1' into PHP-7.2
X-Git-Tag: php-7.3.0alpha1~1204^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ca77eacbc1388cb91fbcab4964f78ae3488cad3b;p=php

Merge branch 'PHP-7.1' into PHP-7.2

* PHP-7.1:
  Fix bug #69954 and remove pdo_mysql.cache_size and mysqli.cache_size INI directives
---

ca77eacbc1388cb91fbcab4964f78ae3488cad3b