summaryrefslogtreecommitdiff
path: root/ext/curl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-5.5' into PHP-5.6Adam Harvey2014-12-051-1/+1
|\ | | | | | | | | * PHP-5.5: Revert unintentional docblock change
| * Merge branch 'PHP-5.4' into PHP-5.5Adam Harvey2014-12-051-1/+1
| |\ | | | | | | | | | | | | * PHP-5.4: Revert unintentional docblock change
| | * Revert unintentional docblock changeChris Christoff2014-12-051-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Revert unintentional docblock change It looks like commit dd8e59da8f5aafd9d77a0f1f17e5e272d09f643f introduced an unintended docbloc change. I have reverted this change in this commit.
| | * Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-132-0/+24
| | | | | | | | | | | | | | | Conflicts: ext/curl/interface.c
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-302-2/+35
|\ \ \ | |/ / | | | | | | | | | | | | | | | * PHP-5.5: update NEWS Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set) Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
| * | Add a test for bug #67643 (curl_multi_getcontent returns '' when ↵Jille Timmermans2014-11-301-0/+30
| | | | | | | | | | | | RETURNTRANSFER isn't set)
| * | Fixed bug #67643 (curl_multi_getcontent returns '' when ↵Jille Timmermans2014-11-301-2/+5
| | | | | | | | | | | | CURLOPT_RETURNTRANSFER isn't set)
* | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2014-11-231-0/+27
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Test PHP Init Fail Without Params
| * | Merge branch 'pull-request/863' into PHP-5.5Stanislav Malyshev2014-11-231-0/+27
| |\ \ | | | | | | | | | | | | | | | | * pull-request/863: Test PHP Init Fail Without Params
| | * | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: fix dir separator in test
| * | | fix dir separator in testAnatol Belski2014-11-051-1/+1
| | | |
* | | | Merge branch 'PHP-5.5' into PHP-5.6Rasmus Lerdorf2014-10-161-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
| * | | 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
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.5: Fix return code (merges are hard :( )
| * | | 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
| |/ / | | | | | | | | | | | | Conflicts: ext/curl/interface.c
* | | Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-142-0/+23
| | | | | | | | | | | | | | | Conflicts: ext/curl/interface.c
* | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2014-09-111-1/+1
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
| * | 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
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | * PHP-5.5: fix test - output can be chunked Conflicts: ext/curl/tests/curl_basic_006.phpt
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-05-121-3/+5
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: fix test - output can be chunked
| | * 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: improve CURL tests to allow testing without separate server
| * | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix test locality inconsitency
| * | fix test locality inconsitencyMichael Wallner2014-04-301-2/+2
| | |
* | | Merge branch 'PHP-5.5' into PHP-5.6Michael Wallner2014-04-306-33/+95
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
| * | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
| * | Merge branch 'PHP-5.4' into PHP-5.5Stanislav Malyshev2014-04-131-0/+2
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: Fix #66562: Consistency bug where curl_multi_getcontent behaves different from curl_exec
| | * Fix #66562: Consistency bug where curl_multi_getcontent behaves different ↵Freek2014-04-131-0/+2
| | | | | | | | | | | | | | | | | | | | | from curl_exec curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent returned null. Now it returns an empty string fixing the incosistency
* | | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: don't compare constants on run time
| * | don't compare constants on run timeAnatol Belski2014-02-281-1/+5
| | |
* | | Merge branch '5.5' into 5.6Tjerk Meesters2014-02-288-109/+118
|\ \ \ | |/ / | | | | | | | | | | | | * 5.5: Fixed expected output of a few cURL test cases Allow NULL as value for CURLOPT_CUSTOMREQUEST option.
| * | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added test case. Refactored the code to isolate the string handling. Fixed return values to use SUCCESS and FAILURE. Removed unused error variable. Indentation fix. Removed the ugly goto.
* | | Remove cURL close policy related constantsChris Wright2014-02-261-9/+0
| | | | | | | | | | | | | | | | | | | | | | | | These options don't do anything and they never have. Refs: http://curl.haxx.se/libcurl/c/curl_easy_setopt.html#CURLOPTCLOSEPOLICY http://curl.haxx.se/mail/lib-2006-11/0301.html
* | | 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
|\ \ \ | |/ / | | | | | | | | | * PHP-5.5: adapt test to curl 7.35.0 upgrade
| * | Merge branch 'PHP-5.4' into PHP-5.5Anatol Belski2014-02-051-3/+1
| |\ \ | | |/ | | | | | | | | | * PHP-5.4: adapt test to curl 7.35.0 upgrade
| | * adapt test to curl 7.35.0 upgradeAnatol Belski2014-02-051-3/+1
| | | | | | | | | | | | | | | which is a security one and should be performed as in http://curl.haxx.se/docs/adv_20140129.html
| | * Bump yearXinchen Hui2014-01-034-4/+4
| | |
| | * Suppress compiler warning "warning: variable ‘length’ set but not used ↵Christopher Jones2013-08-211-2/+0
| | | | | | | | | | | | [-Wunused-but-set-variable]"
| * | Bump yearXinchen Hui2014-01-035-5/+5
| | |
* | | Bump yearXinchen Hui2014-01-035-5/+5
| | |
* | | Allow CURLOPT_FOLLOWLOCATION to be used with open_basedir.Adam Harvey2013-09-105-22/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Newer versions of libcurl prevent file:// location response headers by default, which means that the open_basedir check is unnecessary — the fact CURLOPT_REDIR_PROTOCOLS can't set CURLPROTO_FILE with open_basedir enabled means that there's no possibility of breaching the open_basedir restriction, and this allows HTTP redirects to be followed automatically. Implements FR #65646 (re-enable CURLOPT_FOLLOWLOCATION with open_basedir or safe_mode).
View Lorry Controller Status