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

Merge branch 'PHP-5.6' into PHP-7.0

* PHP-5.6:
  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
---

a829108d5f19d5bd9edc8f1ae55cbcd0f3d43de9