Felipe Pena
802a25e0c9
Merge branch 'PHP-5.5'
...
* PHP-5.5:
- Fixed typo on condition
2013-06-25 21:53:42 -03:00
Felipe Pena
623386d799
- Fixed typo on condition
2013-06-25 21:53:20 -03:00
David Soria Parra
e04baf692a
Fix curl build on windows
2013-04-25 08:04:30 +02:00
David Soria Parra
4c0746228d
Merge branch 'PHP-5.5'
...
* PHP-5.5:
NEWS for RC1
NEWS for PHP 5.5.0 Beta 4 again
Fix curl build on windows
2013-04-25 08:25:10 +02:00
Pierrick Charron
74394733ed
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Remove curl wrappers
2013-04-23 17:01:50 -04:00
Pierrick Charron
b79e65f268
Remove curl wrappers
2013-04-23 17:01:17 -04:00
Anatol Belski
cd3dc3308b
Merge branch 'PHP-5.5'
...
* PHP-5.5:
Added curl config test for windows
2013-04-17 14:26:26 +02:00
Anatol Belski
2d9cbf720d
Added curl config test for windows
2013-04-17 14:25:45 +02:00
Xinchen Hui
2794d455ea
Merge branch 'PHP-5.5'
2013-04-04 19:31:21 +08:00
Xinchen Hui
01ca2bf8c3
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-04 19:31:14 +08:00
Xinchen Hui
185e5e15ae
s ,CURL_WRAPPERS_ENABLE,CURL_WRAPPERS_ENABLED,
2013-04-04 19:28:17 +08:00
Xinchen Hui
bd6a90dac7
Merge branch 'PHP-5.5'
2013-04-03 10:17:49 +08:00
Xinchen Hui
6ace9c646b
Merge branch 'PHP-5.4' into PHP-5.5
...
Conflicts:
ext/curl/interface.c
2013-04-03 10:15:41 +08:00
Xinchen Hui
d7f709a032
Add CURL_WRAPPERS_ENABLE constant
...
see http://news.php.net/php.internals/66871
2013-04-03 10:09:51 +08:00
Anatol Belski
15a182a2d0
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix the test for curl 7.29.0+
2013-02-19 09:05:45 +01:00
Anatol Belski
43664e656d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix the test for curl 7.29.0+
2013-02-19 09:05:27 +01:00
Anatol Belski
cc34dfce16
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
fix the test for curl 7.29.0+
2013-02-19 09:04:52 +01:00
Anatol Belski
558c5dbe65
fix the test for curl 7.29.0+
2013-02-19 09:04:06 +01:00
Stanislav Malyshev
c389d33f0c
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix protos
2013-02-17 13:34:07 -08:00
Stanislav Malyshev
17c6389e9e
fix protos
2013-02-17 13:33:48 -08:00
Anatol Belski
9a85dca7a5
Merge branch 'PHP-5.5'
...
* PHP-5.5:
fix free vs. curl_free
2013-02-17 20:29:58 +01:00
Anatol Belski
432d59ab55
fix free vs. curl_free
2013-02-17 20:29:20 +01:00
Xinchen Hui
34381de5f3
Merge branch 'PHP-5.5'
2013-02-04 14:22:17 +08:00
Xinchen Hui
53159f6e05
implicit declaration of zend_throw_exception
2013-02-04 14:20:50 +08:00
Stanislav Malyshev
7ae80c585f
Merge branch 'PHP-5.5'
...
* PHP-5.5:
forgot this file :(
2013-01-29 15:03:19 -08:00
Stanislav Malyshev
15e76e6a98
forgot this file :(
2013-01-29 15:02:55 -08:00
Stanislav Malyshev
24447dca5d
post-5.5 changes for bug #46439 as described in the RFC
2013-01-28 22:26:59 -08:00
Stanislav Malyshev
a9d013bb02
Implement fix for bug #46439 - add CURLFile class for safer uploads
2013-01-28 22:22:59 -08:00
Pierrick Charron
f85e5950ab
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.
2013-01-05 11:07:59 -05:00
Pierrick Charron
343a9199bb
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
2013-01-01 21:12:02 -05:00
Xinchen Hui
a666285bc2
Happy New Year
2013-01-01 16:37:09 +08:00
Xinchen Hui
0a7395e009
Happy New Year
2013-01-01 16:28:54 +08:00
Xinchen Hui
a2045ff332
Happy New Year~
2013-01-01 16:02:16 +08:00
Pierrick Charron
722b8fb80e
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.
2012-12-28 00:51:04 -05:00
Pierrick Charron
8b67981b67
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fixed #63859 Memory leak when reusing curl-handle
2012-12-27 13:37:11 -05:00
Pierrick Charron
ac3d227e28
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
2012-12-27 13:31:55 -05:00
Pierrick Charron
8456cef1db
Fix ext/curl tests to work on every libcurl versions
...
Thanks Laruence :)
2012-12-26 00:43:37 -05:00
Pierrick Charron
33f44af1a7
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.
2012-12-23 17:13:49 -05:00
Pierrick Charron
4b4f3db731
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
2012-12-23 15:45:39 -05:00
Pierrick Charron
64595a5d1a
Add curl_multi_setopt and clean curl_share_setopt
...
curl_multi_setopt is now available and supports CURLMOPT_PIPELINING
and CURLMOPT_MAXCONNECTS
2012-12-23 14:59:41 -05:00
Pierrick Charron
ded889e865
Remove duplicated function definition
2012-12-23 14:05:04 -05:00
Pierrick Charron
ee453541ed
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Update NEWS file
Fixed segfault due to libcurl connection caching
2012-12-22 19:10:35 -05:00
Pierrick Charron
b10a3b9466
Merge branch 'PHP-5.3' into PHP-5.4
...
* PHP-5.3:
Fixed segfault due to libcurl connection caching
2012-12-22 19:04:45 -05:00
Pierrick Charron
a2b6d9c104
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
2012-12-22 19:03:24 -05:00
Pierrick Charron
e3c88d16b4
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)
2012-12-21 19:27:51 -05:00
Pierrick Charron
5499c7d201
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
2012-12-21 19:24:28 -05:00
Pierrick Charron
af10e698a2
Fixed bug #63352 (Can't enable hostname validation when using curl stream wrappers)
2012-12-21 19:12:43 -05:00
Pierrick Charron
517f800277
CURL >= 7.28.0 no longer support value 1 for CURLOPT_SSL_VERIFYHOST)
...
Fixed bug #63795
2012-12-21 19:10:55 -05:00
Pierrick Charron
9d235eadc8
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix test
2012-12-21 11:49:00 -05:00
Pierrick Charron
763bce0303
Fix test
...
This test is only valid if libcurl < 7.28.1 since
libcurl removed support for the 1 value in CURLOPT_SSL_VERIFYHOST.
2012-12-21 11:45:59 -05:00