From: Anatol Belski <ab@php.net>
Date: Wed, 23 Sep 2015 17:57:56 +0000 (+0200)
Subject: Merge branch 'PHP-7.0'
X-Git-Tag: php-7.1.0alpha1~1105
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1f7465eaf330d8c88684968d2020bf54549d883e;p=php

Merge branch 'PHP-7.0'

* PHP-7.0:
  add test
  expose openssl config path so it can be tested
  Fix for Bug #70384 	mysqli_real_query(): Unknown type 245 sent by the server
---

1f7465eaf330d8c88684968d2020bf54549d883e