summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/php_mysqlnd.c
diff options
context:
space:
mode:
authorStanislav Malyshev <stas@php.net>2014-04-13 18:13:24 -0700
committerStanislav Malyshev <stas@php.net>2014-04-13 18:13:52 -0700
commit1ef0bd2633c981f538399f4ea22fb9429bcf50e0 (patch)
tree6878d48e0161708656f8c63a3e6a60607446fd48 /ext/mysqlnd/php_mysqlnd.c
parentc1d5937f7fba1230f14af47877615c8973abf7ff (diff)
parentf1206aef701c1017a700a134f70e876e9a3754a1 (diff)
downloadphp-git-1ef0bd2633c981f538399f4ea22fb9429bcf50e0.tar.gz
Merge branch 'PHP-5.5' into PHP-5.6
* PHP-5.5: Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
Diffstat (limited to 'ext/mysqlnd/php_mysqlnd.c')
0 files changed, 0 insertions, 0 deletions