diff options
author | Pierrick Charron <pierrick@php.net> | 2012-12-22 19:10:35 -0500 |
---|---|---|
committer | Pierrick Charron <pierrick@php.net> | 2012-12-22 19:10:35 -0500 |
commit | ee453541ed5b7d1dc3dd96e3a9af4bfc9ae75956 (patch) | |
tree | 98983104c1abd0d9242bf14c8f380c16e7f3ca80 /ext/curl/php_curl.h | |
parent | e3c88d16b400cc4f69c5533239343bf14220ae2c (diff) | |
parent | 3f0dcc08e0bd748b8ea6c6d8d2e6245515e014d5 (diff) | |
download | php-git-ee453541ed5b7d1dc3dd96e3a9af4bfc9ae75956.tar.gz |
Merge branch 'PHP-5.4' into PHP-5.5
* PHP-5.4:
Update NEWS file
Fixed segfault due to libcurl connection caching
Diffstat (limited to 'ext/curl/php_curl.h')
0 files changed, 0 insertions, 0 deletions