summaryrefslogtreecommitdiff
path: root/ext/curl
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2017-03-271-1/+1
|\ | | | | | | | | | | * PHP-7.0: deps updated, cherry-pick 88642decf9ab59d206db515990886b0761bfa835 add test for bug #74230
| * deps updated, cherry-pick 88642decf9ab59d206db515990886b0761bfa835Anatol Belski2017-03-271-1/+1
| |
* | Merge branch 'PHP-7.0' into PHP-7.1Stanislav Malyshev2017-01-151-1/+1
|\ \ | |/ | | | | | | * PHP-7.0: Update more functions with path check
| * Merge branch 'PHP-5.6' into PHP-7.0Stanislav Malyshev2017-01-151-1/+1
| |\ | | | | | | | | | | | | * PHP-5.6: Update more functions with path check
| | * 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.0' into PHP-7.1Joe Watkins2017-01-132-4/+12
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Increase wait time for tests involving sockets to improve Travis relability
| * | Increase wait time for tests involving sockets to improve Travis relabilityMitch Hagstrand2017-01-132-4/+12
| | | | | | | | | | | | | | | 1. Increased sleep time from 25ms to 50ms 2. Added sleep to shutdown handlers
| * | Merge branch 'pull-request/1809'Joe Watkins2017-01-061-0/+38
| | | | | | | | | | | | | | | * pull-request/1809: test for function curl_multi_info_read();
| * | Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+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
| | | | | | | | | | | | | | | * pull-request/1809: test for function curl_multi_info_read();
* | | Update copyright headers to 2017Sammy Kaye Powers2017-01-045-5/+5
| | |
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | 1. Increased the time for the sapi/cli/tests/php_cli_server.inc to accept connections. 2. sapi/cli/tests/php_cli_server.inc has errors messages and a `stop` function. 3. bug67429.phpt uses the `stop` function to shutdown the webserver before starting a new one. 4. Removed ext/curl/tests/bug48203_multi-win32.phpt test now that ext/curl/tests/bug48203_multi.phpt runs on Windows also.
| * | Fixes the curl tests to be more reliable in Travis CIMitch Hagstrand2016-12-272-37/+55
| | | | | | | | | | | | | | | | | | 1. Increases the amount of time for the PHP built-in server to accept a connection 2. Outputs an error if the PHP built-in server fails 3. In bug48203_multi.phpt the test no longer starts and stops multiple PHP built-in servers
* | | Merge branch 'PHP-7.0' into PHP-7.1Sara Golemon2016-12-251-12/+7
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: Interpretation of curl_setopt values for boolean parameters
| * | Interpretation of curl_setopt values for boolean parametersdedal.qq2016-12-251-12/+7
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-041-4/+13
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fix test
| * | fix testAnatol Belski2016-12-041-4/+13
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-12-016-0/+204
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: fork tests
| * | fork testsAnatol Belski2016-12-016-0/+204
| | |
| * | Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-10-122-0/+21
| | | | | | | | | | | | (cherry picked from commit 0e6fe3a4c96be2d3e88389a5776f878021b4c59f)
* | | Fix bug #73147: Use After Free in PHP7 unserialize()Stanislav Malyshev2016-10-142-0/+21
| | | | | | | | | | | | | | | (cherry picked from commit 0e6fe3a4c96be2d3e88389a5776f878021b4c59f) (cherry picked from commit f42cbd749cde1f91274c1d03df9024baba141a8f)
* | | 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
| | | | | | | | | | | | | | | | | | | | | | | | This error constant is returned on key mismatch when CURLOPT_PINNEDPUBLICKEY is used. As the option had been introduced in PHP 7.0.7, it makes sense to also add the related error constant to PHP 7.0+. Cf. <https://curl.haxx.se/libcurl/c/CURLOPT_PINNEDPUBLICKEY.html>.
* | | Merge branch 'PHP-7.0' into PHP-7.1Anatol Belski2016-08-291-2/+3
|\ \ \ | |/ / | | | | | | | | | * PHP-7.0: ensure null termination
| * | Merge branch 'PHP-5.6' into PHP-7.0Anatol Belski2016-08-291-2/+3
| |\ \ | | |/ | | | | | | | | | * PHP-5.6: ensure null termination
| | * ensure null terminationAnatol Belski2016-08-291-2/+3
| | |
| | * Fix for bug #72807 - do not produce strings with negative lengthStanislav Malyshev2016-08-161-0/+4
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Xinchen Hui2016-08-171-2/+6
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (48 commits) Update NEWs Unused label Fixed bug #72853 (stream_set_blocking doesn't work) fix test Bug #72663 - part 3 Bug #72663 - part 2 Bug #72663 - part 1 Update NEWS BLock test with memory leak fix tests Fix TSRM build Fix bug #72850 - integer overflow in uuencode Fixed bug #72849 - integer overflow in urlencode Fix bug #72848 - integer overflow in quoted_printable_encode caused heap corruption Fix bug #72838 - Integer overflow lead to heap corruption in sql_regcase Fix bug #72837 - integer overflow in bzdecompress caused heap corruption Fix bug #72836 - integer overflow in base64_decode caused heap corruption Fix for bug #72807 - do not produce strings with negative length Fix for bug #72790 and bug #72799 Fix bug #72730 - imagegammacorrect allows arbitrary write access ... Conflicts: ext/standard/var_unserializer.c
| * | Fix bug #72674 - check both curl_escape and curl_unescapeStanislav Malyshev2016-08-031-2/+6
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Pierrick Charron2016-07-271-42/+1
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierrick Charron2016-07-271-42/+1
| |\ \ | | |/ | | | | | | | | | Conflicts: ext/curl/interface.c
| | * Fixed bug #71929 (CURLINFO_CERTINFO data parsing error).Pierrick Charron2016-07-271-43/+1
| | |
* | | Merge branch 'PHP-7.0' into PHP-7.1Pierrick Charron2016-07-261-4/+6
|\ \ \ | |/ /
| * | Merge branch 'PHP-5.6' into PHP-7.0Pierrick Charron2016-07-261-4/+6
| |\ \ | | |/
| | * Fixed bug #71709Pierrick Charron2016-07-261-5/+6
| | | | | | | | | | | | | | | When curl_setopt is called with an empty slist as value, we should not add the empty slist to the list of slist to free.
| | * Backported bug #71144 (Segmentation fault when using cURL with ZTS)Julien Pauli2016-07-082-0/+22
| | |
* | | Merge branch 'PHP-7.0'Stanislav Malyshev2016-07-191-0/+4
|\ \ \ | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-7.0: (27 commits) fix #72519, possible OOB using imagegif fix #72512, invalid read or write for palette image when invalid transparent index is used Apparently some envs miss SIZE_MAX Fix tests Fix bug #72618: NULL Pointer Dereference in exif_process_user_comment Partial fix for bug #72613 - do not allow reading past error read Partial fix for bug #72613 - do not treat negative returns from bz2 as size_t Fix bug #72606: heap-buffer-overflow (write) simplestring_addn simplestring.c Fix for bug #72558, Integer overflow error within _gdContributionsAlloc() Fix bug #72603: Out of bound read in exif_process_IFD_in_MAKERNOTE update NEWS Fixed bug #72570 Segmentation fault when binding parameters on a query without placeholders Fix bug #72562 - destroy var_hash properly Fix bug #72551 and bug #72552 - check before converting size_t->int Fix bug #72541 - size_t overflow lead to heap corruption Fix bug #72533 (locale_accept_from_http out-of-bounds access) Fix fir bug #72520 Fix for bug #72513 Fix for bug #72513 CS fix and comments with bug ID ... Conflicts: ext/standard/basic_functions.c
| * | Fix bug #72541 - size_t overflow lead to heap corruptionStanislav Malyshev2016-07-121-0/+4
| | |
* | | Implement curl server pushDavey Shafik2016-06-273-5/+124
| | |
* | | Refactor easy handle lookupDavey Shafik2016-06-271-29/+38
| | |
* | | Refactor setup of handlers on copied curl handlesDavey Shafik2016-06-272-70/+76
| | |
* | | Add curl_multi/share_errno() curl_share_strerror()Pierrick Charron2016-06-266-6/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | Add 3 new functions : - curl_multi_errno() - curl_share_errno() - curl_share_strerror() https://wiki.php.net/rfc/new-curl-error-functions
* | | Fixed compilation warningsDmitry Stogov2016-06-221-2/+2
| | |
* | | Added testDmitry Stogov2016-06-071-0/+36
| | |
* | | Fixed bug #72202 (curl_close doesn't close cURL handle)Dmitry Stogov2016-06-071-3/+1
| | | | | | | | | | | | | | | | | | Now curl_close() forces connection close, independently of other links to the same resource. This reverts commit 3ba4f8263d7940312668f4c364c988a67be2461a.
* | | Merge branch 'PHP-7.0'Anatol Belski2016-04-293-19/+201
|\ \ \ | |/ / | | | | | | | | | | | | * PHP-7.0: fix test Expose some of the new curl constants to PHP userspace
| * | fix testAnatol Belski2016-04-291-0/+3
| | |
View Lorry Controller Status