summaryrefslogtreecommitdiff
path: root/ext/curl
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-231-0/+5
|\
| * curl: add new proxy constantsLinus Unnebäck2015-02-231-0/+5
* | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-221-1/+1
|\ \ | |/
| * Fix Win32 SSPI initialization for digest authentication in cURLGrant Pannell2015-02-221-1/+1
| * Bump yearXinchen Hui2015-01-155-5/+5
* | bump yearXinchen Hui2015-01-155-5/+5
* | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-12-051-1/+1
|\ \ | |/
| * Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-12-051-1/+1
| |\
| | * Revert unintentional docblock changeChris Christoff2014-12-051-1/+1
| | * Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-132-0/+24
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-302-2/+35
|\ \ \ | |/ /
| * | Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSF...Jille Timmermans2014-11-301-0/+30
| * | Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFE...Jille Timmermans2014-11-301-2/+5
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-231-0/+27
|\ \ \ | |/ /
| * | Merge branch 'pull-request/863' into PHP-5.5Stanislav Malyshev2014-11-231-0/+27
| |\ \
| | * | Test PHP Init Fail Without ParamsPaulo Eduardo2014-09-301-0/+27
* | | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-11-051-1/+1
|\ \ \ \ | |/ / /
| * | | fix dir separator in testAnatol Belski2014-11-051-1/+1
* | | | Merge branch 'PHP-5.5' into PHP-5.6Rasmus Lerdorf2014-10-161-0/+6
|\ \ \ \ | |/ / /
| * | | TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247Rasmus Lerdorf2014-10-161-0/+6
* | | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-10-141-1/+1
|\ \ \ \ | |/ / /
| * | | Fix return code (merges are hard :( )Stanislav Malyshev2014-10-141-1/+1
| * | | Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-142-0/+23
| |/ /
* | | Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-142-0/+23
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-111-1/+1
|\ \ \ | |/ /
| * | reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0Anatol Belski2014-09-111-1/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-121-3/+4
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-121-3/+5
| |\ \ | | |/
| | * fix test - output can be chunkedStanislav Malyshev2014-05-121-3/+5
* | | fix testStanislav Malyshev2014-05-121-0/+1
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-05-1145-187/+231
|\ \ \ | |/ /
| * | improve CURL tests to allow testing without separate serverStanislav Malyshev2014-05-1145-187/+229
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-301-2/+2
|\ \ \ | |/ /
| * | fix test locality inconsitencyMichael Wallner2014-04-301-2/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-306-33/+95
|\ \ \ | |/ /
| * | fix bug #64247 (CURLOPT_INFILE doesn't allow reset)Michael Wallner2014-04-306-33/+95
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-04-131-0/+2
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-0/+2
| |\ \ | | |/
| | * Fix #66562: Consistency bug where curl_multi_getcontent behaves different fro...Freek2014-04-131-0/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-03-111-0/+2
|\ \ \ | |/ /
| * | Fix compile error with theoretically supported versions of libcurl < 7.12.3.Adam Harvey2014-03-111-0/+2
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-02-281-1/+5
|\ \ \ | |/ /
| * | don't compare constants on run timeAnatol Belski2014-02-281-1/+5
* | | Merge branch '5.5' into 5.6Tjerk Meesters2014-02-288-109/+118
|\ \ \ | |/ /
| * | Fixed expected output of a few cURL test casesTjerk Meesters2014-02-284-8/+4
| * | Allow NULL as value for CURLOPT_CUSTOMREQUEST option.datibbaw2014-02-284-101/+114
* | | Remove cURL close policy related constantsChris Wright2014-02-261-9/+0
* | | Add openssl.cafile ini check when loading cainfoDaniel Lowrey2014-02-251-1/+4
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-02-051-3/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-02-051-3/+1
| |\ \ | | |/