diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-12-22 19:04:45 -0500 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-12-22 19:04:45 -0500 |
| commit | b10a3b9466b77bccf7e9a6e6207df2de1a997855 (patch) | |
| tree | b75aab62a9ba4aa153ca985e5b9a2134add6781f /ext/json/php_json.h | |
| parent | 5499c7d201ad22f551dfc370ae09132acf4f75ec (diff) | |
| parent | a2b6d9c1047a4e5f3419ebc3489a66d62aa12d07 (diff) | |
| download | php-git-b10a3b9466b77bccf7e9a6e6207df2de1a997855.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Fixed segfault due to libcurl connection caching
Diffstat (limited to 'ext/json/php_json.h')
0 files changed, 0 insertions, 0 deletions