summaryrefslogtreecommitdiff
path: root/ext/curl
Commit message (Expand)AuthorAgeFilesLines
* zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-222-6/+7
* int -> size_tRasmus Lerdorf2015-01-201-1/+2
* bump yearXinchen Hui2015-01-155-5/+5
* trailing whitespace removalStanislav Malyshev2015-01-103-14/+14
* Fixed bug #68739 #68740 #68741Xinchen Hui2015-01-081-0/+1
* Use "float" and "integer" in typehint and zpp errorsAndrea Faulds2014-12-212-8/+8
* remove the thread ctx from curlAnatol Belski2014-12-172-9/+0
* Merge remote-tracking branch 'origin/master' into native-tlsAnatol Belski2014-12-171-1/+2
|\
| * Updated or skipped certain 32-bit testsAndrea Faulds2014-12-171-1/+2
* | first shot remove TSRMLS_* thingsAnatol Belski2014-12-135-135/+134
|/
* Merge branch 'PHP-5.6'Adam Harvey2014-12-051-1/+1
|\
| * 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 'pull-request/728'Stanislav Malyshev2014-11-302-2/+35
|\ \ \ \
| * | | | Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSF...Jille Timmermans2014-11-241-0/+30
| * | | | Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFE...Jille Timmermans2014-07-171-2/+5
* | | | | Merge branch 'PHP-5.6'Stanislav Malyshev2014-11-231-0/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | 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.6'Anatol Belski2014-11-051-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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.6'Rasmus Lerdorf2014-10-161-0/+6
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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.6'Stanislav Malyshev2014-10-141-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 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
* | | | | fix bad mergeStanislav Malyshev2014-10-141-3/+16
* | | | | Fix bug #68089 - do not accept options with embedded \0Stanislav Malyshev2014-10-142-16/+26
* | | | | reveal some newer libcurl features in MINFOAnatol Belski2014-10-032-0/+8
* | | | | removed *.dsw and *.dsp filesAnatol Belski2014-09-281-190/+0
* | | | | Add smart_str_append for appending zend_stringsNikita Popov2014-09-211-1/+1
* | | | | Move smart_str implementation into Zend/Nikita Popov2014-09-212-2/+2
* | | | | Merge branch 'master' into issue-67910Florian MARGAINE2014-09-206-11/+11
|\ \ \ \ \
| * | | | | s/PHP 5/PHP 7/Johannes Schlüter2014-09-195-5/+5
| * | | | | better way to check for empty stringAnatol Belski2014-09-141-2/+2
| * | | | | fix typeAnatol Belski2014-09-121-1/+1
| * | | | | Merge branch 'PHP-5.6'Anatol Belski2014-09-111-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | 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
| * | | | Fixed discards qualifiers from pointer target typeXinchen Hui2014-09-051-2/+2