summaryrefslogtreecommitdiff
path: root/ext/curl/interface.c
Commit message (Collapse)AuthorAgeFilesLines
* Use ZSTR_ API to access zend_string elements (this is just renaming without ↵Dmitry Stogov2015-06-301-21/+21
| | | | semantick changes).
* Improved zend_string API (Francois Laupretre)Dmitry Stogov2015-06-291-1/+1
| | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit d96eab8d79b75ac83d49d49ae4665f948d15a804 Author: Francois Laupretre <francois@tekwire.net> Date: Fri Jun 26 01:23:31 2015 +0200 Use the new 'ZSTR' macros in the rest of the code. Does not change anything to the generated code (thanks to compat macros) but cleaner. commit b3526439104ac7a89a8e0c79dbebf33b22bd01b8 Author: Francois Laupretre <francois@tekwire.net> Date: Thu Jun 25 13:45:06 2015 +0200 Improve zend_string API Add missing methods
* Fixed bug #69831 (Segmentation fault in curl_getinfo)Xinchen Hui2015-06-141-1/+1
|
* Attempt to fix #69643Xinchen Hui2015-05-291-2/+2
|
* Remove not necessary checksXinchen Hui2015-05-081-3/+2
|
* Reorder fields of curlXinchen Hui2015-05-081-1/+1
|
* Fixed commentXinchen Hui2015-05-061-1/+1
|
* micro optimizationsXinchen Hui2015-05-051-30/+16
|
* Fixed bug #69485 (Double free on zend_list_dtor).Xinchen Hui2015-04-201-1/+1
|
* Merge branch 'PHP-5.6'Stanislav Malyshev2015-04-141-0/+5
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.6: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: Zend/zend_exceptions.c ext/curl/interface.c ext/dom/document.c ext/fileinfo/libmagic/softmagic.c ext/gd/gd.c ext/hash/hash.c ext/pgsql/pgsql.c ext/phar/phar.c ext/phar/phar_internal.h ext/standard/http_fopen_wrapper.c ext/standard/link.c ext/standard/streamsfuncs.c ext/xmlwriter/php_xmlwriter.c ext/zlib/zlib.c
| * Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-04-141-0/+5
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.5: (27 commits) fix non-standard C update NEWS 5.4.41 next fix CVE num update NEWS Fix bug #69441 (Buffer Overflow when parsing tar/zip/phar in phar_set_inode) fix test fix type in fix for #69085 fix memory leak & add test Fix tests fix CVE num Fix bug #69337 (php_stream_url_wrap_http_ex() type-confusion vulnerability) Fix test Additional fix for bug #69324 More fixes for bug #69152 Fixed bug #69353 (Missing null byte checks for paths in various PHP extensions) Fixed bug #69324 (Buffer Over-read in unserialize when parsing Phar) Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) ... Conflicts: ext/standard/http_fopen_wrapper.c
| | * Merge branch 'PHP-5.4.40' into PHP-5.5-securityStanislav Malyshev2015-04-051-0/+5
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PHP-5.4.40: Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER) Fix bug #68486 and bug #69218 (segfault in apache2handler with apache 2.4) Fix bug #68819 (Fileinfo on specific file causes spurious OOM and/or segfault) Revert "Merge branch 'PHP-5.4' of https://git.php.net/repository/php-src into PHP-5.4" Fixed bug #69293 Add ZEND_ARG_CALLABLE_INFO to allow internal function to type hint against callable.
| | | * Fixed bug #69316 (Use-after-free in php_curl related to ↵Stanislav Malyshev2015-04-051-0/+4
| | | | | | | | | | | | | | | | CURLOPT_FILE/_INFILE/_WRITEHEADER)
| * | | Merge branch 'PHP-5.5' into PHP-5.6Lior Kaplan2015-04-011-0/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | | | | | * PHP-5.5: Fixed bug #68739 (Missing break / control flow in curl) Fixed bug #68740 (NULL Pointer Dereference) Fixed bug #68677 (Use After Free in OPcache)
| | * | Fixed bug #68739 (Missing break / control flow in curl)Xinchen Hui2015-04-011-0/+1
| | | | | | | | | | | | | | | | (cherry picked from commit 124fb22a13fafa3648e4e15b4f207c7096d8155e)
* | | | cleaning up the version macrosAnatol Belski2015-03-231-1/+1
| | | |
* | | | fix warning & improve error handling in CURLStanislav Malyshev2015-03-221-2/+11
| | | |
* | | | Merge branch 'PHP-5.6'Stanislav Malyshev2015-03-221-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
| * | | Merge branch 'PHP-5.5' into PHP-5.6Stanislav Malyshev2015-03-221-0/+6
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
| | * | add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2Masaki Kagaya2015-03-221-0/+6
| | | |
* | | | Use specialized macro for string zval creationDmitry Stogov2015-03-121-2/+2
| | | |
* | | | Remove unsafe curl file uploadsNikita Popov2015-03-091-39/+10
| | | | | | | | | | | | | | | | The option CURLOPT_SAFE_UPLOAD still exists, but cannot be disabled.
* | | | Merge branch 'PHP-5.6'Julien Pauli2015-02-231-0/+5
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | * PHP-5.6: Updated NEWS updated NEWS curl: add new proxy constants
| * | | Merge branch 'PHP-5.5' into PHP-5.6Julien Pauli2015-02-231-0/+5
| |\ \ \ | | |/ / | | | | | | | | | | | | | | | | * PHP-5.5: updated NEWS curl: add new proxy constants
| | * | curl: add new proxy constantsLinus Unnebäck2015-02-231-0/+5
| | | |
* | | | Merge branch 'PHP-5.6'Anatol Belski2015-02-221-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Fix Win32 SSPI initialization for digest authentication in cURL
| * | | Merge branch 'PHP-5.5' into PHP-5.6Anatol Belski2015-02-221-1/+1
| |\ \ \ | | |/ / | | | | | | | | | | | | * PHP-5.5: Fix Win32 SSPI initialization for digest authentication in cURL
| | * | Fix Win32 SSPI initialization for digest authentication in cURLGrant Pannell2015-02-221-1/+1
| | | |
| | * | Bump yearXinchen Hui2015-01-151-1/+1
| | | |
| * | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | Fixed possible memory leakDmitry Stogov2015-02-111-0/+1
| | | |
* | | | Don't convert options in-place. They may be elements of constant array.Dmitry Stogov2015-02-111-35/+53
| | | |
* | | | found type is unnecessaryXinchen Hui2015-02-021-7/+6
| | | |
* | | | Cleanup resource handling APIsXinchen Hui2015-02-021-23/+46
| | | |
* | | | Fixed bug #68937 (Segfault in curl_multi_exec)Xinchen Hui2015-01-301-2/+6
| | | |
* | | | zend_read_property() has to provide a holder for return value.Dmitry Stogov2015-01-221-4/+4
| | | | | | | | | | | | | | | | Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
* | | | int -> size_tRasmus Lerdorf2015-01-201-1/+2
| | | |
* | | | bump yearXinchen Hui2015-01-151-1/+1
| | | |
* | | | trailing whitespace removalStanislav Malyshev2015-01-101-1/+1
| | | |
* | | | Fixed bug #68739 #68740 #68741Xinchen Hui2015-01-081-0/+1
| | | |
* | | | remove the thread ctx from curlAnatol Belski2014-12-171-8/+0
| | | |
* | | | first shot remove TSRMLS_* thingsAnatol Belski2014-12-131-93/+93
| | | |
* | | | Merge branch 'PHP-5.6'Adam Harvey2014-12-051-1/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: Revert unintentional docblock change
| * | | 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-131-0/+6
| | | | | | | | | | | | | | | | | | | | Conflicts: ext/curl/interface.c
| | | * Bump yearXinchen Hui2014-01-031-1/+1
| | | |
| | | * Suppress compiler warning "warning: variable ‘length’ set but not used ↵Christopher Jones2013-08-211-2/+0
| | | | | | | | | | | | | | | | [-Wunused-but-set-variable]"
* | | | Merge branch 'PHP-5.6'Rasmus Lerdorf2014-10-161-0/+6
|\ \ \ \ | |/ / / | | | | | | | | | | | | * PHP-5.6: TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
View Lorry Controller Status