]> granicus.if.org Git - php/commit
projects / php / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c7dffb5 b89f128)
Merge branch 'PHP-5.6'
authorChristoph M. Becker <cmb@php.net>
Wed, 9 Sep 2015 01:19:55 +0000 (03:19 +0200)
committerChristoph M. Becker <cmb@php.net>
Wed, 9 Sep 2015 01:19:55 +0000 (03:19 +0200)
commit71f90dfbad753bc00538dbb736ec023e63b72504
treebb7b61c285cd9b9d80f53900eff52b8c7c021d93tree | snapshot
parentc7dffb5673c5e2303e293cb71997f2fae6bdf2e9commit | diff
parentb89f128480e673c0c0981a0037c6f4af883881d0commit | diff
Merge branch 'PHP-5.6'

* PHP-5.6:
  Fix #70456: mysqlnd doesn't activate TCP keep-alive when connecting to a server

Resolved conflicts:
ext/mysqlnd/mysqlnd_net.c
ext/mysqlnd/mysqlnd_net.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.