Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/curl/interface.c

s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,

Merge branch 'PHP-5.5'

Merge branch 'PHP-5.4' into PHP-5.5

Conflicts:
ext/curl/interface.c

Add CURL_WRAPPERS_ENABLE constant

see http://news.php.net/php.internals/66871

Merge branch 'PHP-5.5'

* PHP-5.5:
fix free vs. curl_free

fix free vs. curl_free

post-5.5 changes for bug #46439 as described in the RFC

Implement fix for bug #46439 - add CURLFile class for safer uploads

Improve resource management for curl handle

Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own

Improve resource management for curl handle

Previous implementation was using its own refcounting (uses field of
the php_curl struct). zend_list_add/remove already implements its own
refcount, so we don't need to use an other one.

show more ...

Remove passwd handler from struct when not needed

CURLOPT_PASSWDFUNCTION was removed in cURL 7.15.5, the passwd field
will not be used for version greater than this one

Happy New Year

Happy New Year

Add new curl options

Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION,
CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE,
CURLOPT_TCP_KEEPID

Add new curl options

Addes new curl options CURLOPT_TELNETOPTIONS, CURLOPT_GSSAPI_DELEGATION,
CURLOPT_ACCEPTTIMEOUT_MS, CURLOPT_SSL_OPTIONS, CURLOPT_TCP_KEEPALIVE,
CURLOPT_TCP_KEEPIDLE and CURLOPT_TCP_KEEPINTVL.

show more ...

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Fixed #63859 Memory leak when reusing curl-handle

Fixed #63859 Memory leak when reusing curl-handle

When CURLOPT_POSTFIELDS is called more than once on the same
curl handle, php/curl did not free the memory of the previous
post data

Fixed #63859 Memory leak when reusing curl-handle

When CURLOPT_POSTFIELDS is called more than once on the same
curl handle, php/curl did not free the memory of the previous
post data. This commit will fix the problem unless the curl
handle was previously duplicated using the curl_copy_handle()
function in which case we can not know if the post data is
still in use or not by any curl handle

show more ...

New curl_pause() function

Add the curl_pause function (binding of curl_easy_pause).
Using this function, you can explicitly mark a running connection
to get paused, and you can unpau

New curl_pause() function

Add the curl_pause function (binding of curl_easy_pause).
Using this function, you can explicitly mark a running connection
to get paused, and you can unpause a connection that was
previously paused.

show more ...

Support for curl_strerror and curl_multi_strerror

Add the support for both curl_strerror and curl_multi_strerror.
Those function will return a string describing the error code
passed

Support for curl_strerror and curl_multi_strerror

Add the support for both curl_strerror and curl_multi_strerror.
Those function will return a string describing the error code
passed in the argument errornum

show more ...

Add curl_multi_setopt and clean curl_share_setopt

curl_multi_setopt is now available and supports CURLMOPT_PIPELINING
and CURLMOPT_MAXCONNECTS

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS file
Fixed segfault due to libcurl connection caching

Merge branch 'PHP-5.3' into PHP-5.4

* PHP-5.3:
Fixed segfault due to libcurl connection caching

Fixed segfault due to libcurl connection caching

Libcurl is doing connection caching. When easy handle is cleaned up,
if the handle was previously used by the curl_multi_api, the connect

Fixed segfault due to libcurl connection caching

Libcurl is doing connection caching. When easy handle is cleaned up,
if the handle was previously used by the curl_multi_api, the connection
remains open un the curl multi handle is cleaned up. Some protocols are
sending content like the FTP one, and libcurl try to use the
WRITEFUNCTION or the HEADERFUNCTION. Since structures used in those
callback are freed, we need to use an other callback to which avoid
segfaults.

Libcurl commit d021f2e8a00 fix this issue and should be part of 7.28.2

show more ...

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
Update NEWS file
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
CURL >= 7.28.0 no longer

Merge branch 'PHP-5.4' into PHP-5.5

* PHP-5.4:
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)

show more ...

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

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

show more ...

CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)

Fixed bug #63795