]> granicus.if.org Git - php/commitdiff
projects / php / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3aa882a 2576936)
Merge branch 'PHP-5.6' into PHP-7.0
authorAnatol Belski <ab@php.net>
Wed, 23 Sep 2015 17:57:42 +0000 (19:57 +0200)
committerAnatol Belski <ab@php.net>
Wed, 23 Sep 2015 17:57:42 +0000 (19:57 +0200)
* 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


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.