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

Merge branch 'PHP-7.0' into PHP-7.1

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

153404fa73ba9991936b190a8632123646b88b18