]> granicus.if.org Git - php/commit
Merge branch 'PHP-7.0'
authorAnatol Belski <ab@php.net>
Wed, 23 Sep 2015 17:57:56 +0000 (19:57 +0200)
committerAnatol Belski <ab@php.net>
Wed, 23 Sep 2015 17:57:56 +0000 (19:57 +0200)
commit1f7465eaf330d8c88684968d2020bf54549d883e
tree25ddbb1bc941e2795f601fd4afe00127abec88af
parent3c49ec47e7142cdb7381ac362276fa6321b811e5
parenta829108d5f19d5bd9edc8f1ae55cbcd0f3d43de9
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