diff options
| author | Pierrick Charron <pierrick@php.net> | 2012-12-21 19:24:28 -0500 |
|---|---|---|
| committer | Pierrick Charron <pierrick@php.net> | 2012-12-21 19:24:28 -0500 |
| commit | 5499c7d201ad22f551dfc370ae09132acf4f75ec (patch) | |
| tree | a353f8a390986070d4b6ab10c0666641e20a2485 /ext/curl/php_curl.h | |
| parent | 59a4514dc0e8950ce210036332cc64c414fdcc22 (diff) | |
| parent | 1c553eba196b823439e69f003e63afd6d202d582 (diff) | |
| download | php-git-5499c7d201ad22f551dfc370ae09132acf4f75ec.tar.gz | |
Merge branch 'PHP-5.3' into PHP-5.4
* PHP-5.3:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
Conflicts:
ext/curl/interface.c
ext/curl/tests/bug63363.phpt
Diffstat (limited to 'ext/curl/php_curl.h')
0 files changed, 0 insertions, 0 deletions