clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-23 19:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity
94,674 Commits 491 Branches 1,363 Tags 846 MiB
12628e9a46
Commit Graph

860 Commits

Author SHA1 Message Date
Pierrick Charron
31ed322b06 Merge branch 'PHP-5.6' into PHP-7.0 2016-07-26 19:20:12 -04:00
Pierrick Charron
24d8f6ed7c Fixed bug #71709 
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.
 2016-07-26 18:50:15 -04:00
Stanislav Malyshev
2ca8d85dd4 Fix bug #72541 - size_t overflow lead to heap corruption 2016-07-12 22:59:19 -07:00
Julien Pauli
78d5783b62 Backported bug #71144 (Segmentation fault when using cURL with ZTS) 2016-07-08 14:58:56 +02:00
Anatol Belski
8c74f03c10 fix test 2016-04-29 14:30:19 +02:00
Pierrick Charron
3c92f113e4 Expose some of the new curl constants to PHP userspace 2016-04-29 14:19:55 +02:00
Pierrick Charron
a2d78d1a5f Fixed bug #68658 (Define CURLE_SSL_CACERT_BADFILE) 2016-04-23 22:55:00 -04:00
Pierrick Charron
043ce195c6 Fix cURL test to use local server instead of google 2016-04-23 18:37:55 -04:00
Dominic Luechinger
02766d0180 Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification 2016-04-16 18:30:19 +02:00
Xinchen Hui
ead0dfc3c9 Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Update NEWS for efacdc3
  FIX #71831: CURLOPT_NOPROXY applied as long instead of string
 2016-03-21 16:43:55 +08:00
Michael Sierks
efacdc3511 FIX #71831: CURLOPT_NOPROXY applied as long instead of string 
The CURLOPT_NOPROXY option value is converted to a long before
being applied as a curl option. This causes the option to have
no effect. This patch changes this conversion to a string.
 2016-03-18 07:29:01 -05:00
Nikita Popov
dea2e1bc64 Merge branch 'PHP-5.6' into PHP-7.0 2016-03-01 23:32:47 +01:00
mpyw
0bbea60524 Fix bug #71694 
Exports contants CURLM_ADDED_ALREADY.
 2016-03-01 23:31:58 +01:00
Stanislav Malyshev
9afb29aa68 Remove TSRMLS_* from code, they are not used anymore 2016-02-17 22:44:05 -08:00
Leigh
3ef57f8d5d Fixed memory leak in curl_getinfo() 
The "v ? v" in the CAASTR macro caused zend_string_copy to be
called twice
 2016-02-08 11:36:14 +00:00
Xinchen Hui
d645706547 Online test 2016-02-05 19:56:23 +08:00
Xinchen Hui
095096c7ab Merge branch 'PHP-5.6' into PHP-7.0 
Conflicts:
	ext/curl/interface.c
 2016-02-05 19:51:33 +08:00
Xinchen Hui
5fdfab743d Fixed bug #71523 (Copied handle with new option CURLOPT_HTTPHEADER crashes while curl_multi_exec) 2016-02-05 19:49:26 +08:00
Antony Dovgal
3a2c9e6e1d fix build 
sorry about that =\
 2016-02-03 18:03:28 +03:00
Antony Dovgal
52e120fa90 use correct element size, avoid reading stack 2016-02-03 15:14:10 +03:00
Anatol Belski
1fb763ccab Fixed bug #71227 Can't compile php_curl statically 2016-01-07 18:55:05 +01:00
Anatol Belski
42a145273c add SKIPIF condition 2016-01-07 17:54:26 +01:00
Lior Kaplan
ed35de784f Merge branch 'PHP-5.6' into PHP-7.0 
* PHP-5.6:
  Happy new year (Update copyright to 2016)
 2016-01-01 19:48:25 +02:00
Lior Kaplan
49493a2dcf Happy new year (Update copyright to 2016) 2016-01-01 19:21:47 +02:00
Xinchen Hui
2453a48ab5 Fixed bug #71225 (curl_setopt() fails to set CURLOPT_POSTFIELDS with reference to CURLFile) 2015-12-26 22:55:38 -08:00
Xinchen Hui
8f9af36da3 Fixed bug #71144 (Sementation fault when using cURL with ZTS) 2015-12-19 00:29:19 +08:00
Xinchen Hui
512498d083 Fixed test skip 2015-12-19 00:19:21 +08:00
Xinchen Hui
241e340f78 Make these tests fail faster, Thanks to GFW 2015-10-29 15:01:43 +08:00
Davey Shafik
9ec6a44c5e Add CURLPIPE_* constants to properly expose HTTP/2 multiplexing 2015-09-02 17:16:43 +12:00
Xinchen Hui
4df6f26442 Fixed bug #70330 (Segmentation Fault with multiple "curl_copy_handle") 2015-08-23 13:01:47 +08:00
Pierrick Charron
fb37da2a48 Fixed Bug #69998 curl multi leaking memory 
Fix the pointer address passed to the comparator and call
zend_list_delete instead of zend_list_close to avoid closing
the resource if still used.
 2015-08-01 14:55:00 -04:00
Xinchen Hui
6c0feb0665 Fixed bug #70163 (curl_setopt_array() type confusion) 2015-07-30 13:40:59 +08:00
Anatol Belski
9db46a392b remove #ifdef 2015-07-14 00:12:35 +02:00
Anatol Belski
b19aea3742 remove comment, it's not right 2015-07-13 23:43:43 +02:00
Anatol Belski
cefd010739 Fixed bug #70065 curl_getinfo() returns corrupted values 2015-07-13 21:47:42 +02:00
Dmitry Stogov
53403fe56d Get rid of ZVAL_ZVAL() macro usages. Replace them with more clear and optimal equialent sequences. 2015-07-01 02:05:21 +03:00
Dmitry Stogov
4a2e40bb86 Use ZSTR_ API to access zend_string elements (this is just renaming without semantick changes). 2015-06-30 04:05:24 +03:00
Dmitry Stogov
4bd22cf1c1 Improved zend_string API (Francois Laupretre) 
Squashed commit of the following:

commit d96eab8d79
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 b352643910
Author: Francois Laupretre <francois@tekwire.net>
Date:   Thu Jun 25 13:45:06 2015 +0200

    Improve zend_string API

    Add missing methods
 2015-06-29 16:44:54 +03:00
Kalle Sommer Nielsen
055755a4ae Fix typo + DSP reference 2015-06-22 13:30:12 +02:00
Xinchen Hui
b7e477a8f9 Fixed bug #69831 (Segmentation fault in curl_getinfo) 2015-06-14 23:10:21 +08:00
Xinchen Hui
50e08d60b6 Attempt to fix #69643 2015-05-29 00:03:19 +08:00
Nikita Popov
3ae995f03c Tweak uncaught exception message display 
This implements a reduced variant of #1226 with just the following
change:

-Fatal error: Uncaught exception 'EngineException' with message 'Call to private method foo::bar() from context ''' in %s:%d
+Fatal error: Uncaught EngineException: Call to private method foo::bar() from context '' in %s:%d

The '' wrapper around messages is very weird if the exception
message itself contains ''. Futhermore having the message wrapped
in '' doesn't work for the "and defined" suffix of
TypeExceptions.
 2015-05-17 18:47:06 +02:00
Xinchen Hui
9d4465e480 Sorry, missed here should be checked 2015-05-08 14:03:08 +08:00
Xinchen Hui
33097bcff6 Remove not necessary checks 2015-05-08 13:54:28 +08:00
Xinchen Hui
f05baec0db Reorder fields of curl 2015-05-08 13:36:55 +08:00
Xinchen Hui
0c92538e6f revert previously change to this 2015-05-08 10:33:19 +08:00
Xinchen Hui
c734587303 Fixed comment 2015-05-06 11:03:44 +08:00
Xinchen Hui
13eb630eeb use zval_get_long 2015-05-06 10:58:01 +08:00
Xinchen Hui
9b3a92a1ca micro optimizations 2015-05-05 18:22:38 +08:00
Xinchen Hui
d66045fe73 Fixed bug #69485 (Double free on zend_list_dtor). 2015-04-20 11:48:21 +08:00