summaryrefslogtreecommitdiff
path: root/ext/curl
Commit message (Expand)AuthorAgeFilesLines
* fix test, yet master staging onlyAnatol Belski2017-02-241-1/+1
* Merge branch 'PHP-7.1'Stanislav Malyshev2017-01-151-1/+1
|\
| * Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-01-151-1/+1
| |\
| | * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2017-01-151-1/+1
| | |\
| | | * Update more functions with path checkStanislav Malyshev2017-01-151-1/+1
| | | * Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-09-252-1/+24
* | | | Merge branch 'PHP-7.1'Joe Watkins2017-01-132-4/+12
|\ \ \ \ | |/ / /
| * | | Merge branch 'PHP-7.0' into PHP-7.1Joe Watkins2017-01-132-4/+12
| |\ \ \ | | |/ /
| | * | Increase wait time for tests involving sockets to improve Travis relabilityMitch Hagstrand2017-01-132-4/+12
| | * | Merge branch 'pull-request/1809'Joe Watkins2017-01-061-0/+38
| | * | Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
* | | | Merge branch 'PHP-7.1'Anatol Belski2017-01-081-6/+5
|\ \ \ \ | |/ / /
| * | | move various places to the centralized OpenSSL setup routineAnatol Belski2017-01-081-6/+5
| * | | Merge branch 'pull-request/1809'Joe Watkins2017-01-061-0/+38
| * | | Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
* | | | Merge branch 'pull-request/1809'Joe Watkins2017-01-061-0/+38
|\ \ \ \
| * | | | Update curl_multi_info_read.phptmarcosptf2016-10-261-2/+2
| * | | | Update curl_multi_info_read.phptmarcosptf2016-10-261-2/+2
| * | | | Update curl_multi_info_read.phptmarcosptf2016-10-261-1/+1
| * | | | Update curl_multi_info_read.phptmarcosptf2016-03-171-1/+0
| * | | | Update curl_multi_info_read.phptmarcosptf2016-03-161-10/+2
| * | | | Update curl_multi_info_read.phptmarcosptf2016-03-131-2/+2
| * | | | Update curl_multi_info_read.phptmarcosptf2016-03-131-1/+1
| * | | | test to function curl_multi_info_read();marcosptf2016-03-131-0/+47
* | | | | Update copyright headers to 2017Sammy Kaye Powers2017-01-025-5/+5
* | | | | Migrate curl to new parameters APISara Golemon2016-12-284-92/+106
* | | | | Merge branch 'PHP-7.1'Nikita Popov2016-12-273-140/+71
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Nikita Popov2016-12-273-140/+71
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Makes the sapi web server and curl tests more reliableMitch Hagstrand2016-12-273-105/+18
| | * | | Fixes the curl tests to be more reliable in Travis CIMitch Hagstrand2016-12-272-37/+55
* | | | | New parsing parameters in curldedal.qq2016-12-261-27/+33
* | | | | Merge branch 'PHP-7.1'Sara Golemon2016-12-251-12/+7
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2016-12-251-12/+7
| |\ \ \ \ | | |/ / /
| | * | | Interpretation of curl_setopt values for boolean parametersdedal.qq2016-12-251-12/+7
* | | | | Include strings.h for strncasecmpSara Golemon2016-12-121-0/+2
* | | | | Merge branch 'PHP-7.1'Anatol Belski2016-12-041-4/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-041-4/+13
| |\ \ \ \ | | |/ / /
| | * | | fix testAnatol Belski2016-12-041-4/+13
* | | | | Merge branch 'PHP-7.1'Anatol Belski2016-12-016-0/+204
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-016-0/+204
| |\ \ \ \ | | |/ / /
| | * | | fork testsAnatol Belski2016-12-016-0/+204
| * | | | Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-10-142-0/+21
* | | | | Remove more PHP 6 leftovers from testsNikita Popov2016-11-247-7/+7
* | | | | Fix CRLF line-endings in testsNikita Popov2016-11-203-240/+240
* | | | | Save some more calls to strlen() on the CURLFile helper methodsKalle Sommer Nielsen2016-10-201-9/+9
* | | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-10-122-0/+21
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-10-122-0/+21
* | | | Merge branch 'PHP-7.0' into PHP-7.1Christoph M. Becker2016-09-291-0/+3
|\ \ \ \ | |/ / /
| * | | Add CURLE_SSL_PINNEDPUBKEYNOTMATCHChristoph M. Becker2016-09-151-0/+3
* | | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-291-2/+3
|\ \ \ \ | |/ / /