Anatol Belski
c560678c14
Merge branch 'PHP-7.0' into PHP-7.1
...
* PHP-7.0:
ensure null termination
2016-08-29 21:15:55 +02:00
Anatol Belski
2004585d03
Merge branch 'PHP-5.6' into PHP-7.0
...
* PHP-5.6:
ensure null termination
2016-08-29 21:13:39 +02:00
Anatol Belski
d787b0ea13
ensure null termination
2016-08-29 21:03:03 +02:00
Xinchen Hui
ce6ad9bdd9
Merge branch 'PHP-7.0' into PHP-7.1
...
* 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
2016-08-17 17:14:30 +08:00
Stanislav Malyshev
1cd6bc6463
Fix for bug #72807 - do not produce strings with negative length
2016-08-16 22:55:41 -07:00
Stanislav Malyshev
72dbb7f416
Fix bug #72674 - check both curl_escape and curl_unescape
2016-08-03 00:58:55 -07:00
Pierrick Charron
8d44942912
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-27 23:39:34 -04:00
Pierrick Charron
bf37b97d9c
Merge branch 'PHP-5.6' into PHP-7.0
...
Conflicts:
ext/curl/interface.c
2016-07-27 23:36:22 -04:00
Pierrick Charron
30a5ed3a79
Fixed bug #71929 (CURLINFO_CERTINFO data parsing error).
2016-07-27 23:30:20 -04:00
Pierrick Charron
ca493af862
Merge branch 'PHP-7.0' into PHP-7.1
2016-07-26 19:23:08 -04:00
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
70d6ce3368
Merge branch 'PHP-7.0'
...
* 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
2016-07-19 01:44:14 -07: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
Davey Shafik
ad15e1ccda
Implement curl server push
2016-06-27 01:17:32 -07:00
Davey Shafik
d56d2f452b
Refactor easy handle lookup
2016-06-27 00:52:46 -07:00
Davey Shafik
63275a1e58
Refactor setup of handlers on copied curl handles
2016-06-27 00:52:46 -07:00
Pierrick Charron
3d71c1de7a
Add curl_multi/share_errno() curl_share_strerror()
...
Add 3 new functions :
- curl_multi_errno()
- curl_share_errno()
- curl_share_strerror()
https://wiki.php.net/rfc/new-curl-error-functions
2016-06-26 13:29:42 -04:00
Dmitry Stogov
323b2733f6
Fixed compilation warnings
2016-06-22 00:40:50 +03:00
Dmitry Stogov
b12dfbad6a
Added test
2016-06-07 14:08:12 +03:00
Dmitry Stogov
5b81f9d92e
Fixed bug #72202 (curl_close doesn't close cURL handle)
...
Now curl_close() forces connection close, independently of other links to the same resource.
This reverts commit 3ba4f8263d
.
2016-06-07 14:03:14 +03:00
Anatol Belski
2c5704bdc2
Merge branch 'PHP-7.0'
...
* PHP-7.0:
fix test
Expose some of the new curl constants to PHP userspace
2016-04-29 14:31:49 +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
Dmitry Stogov
f0a2e8eb13
Removed "zend_fcall_info.function_table". It was assigned in many places, but is never used.
2016-04-27 13:46:38 +03:00
Pierrick Charron
62240f2653
Merge branch 'PHP-7.0'
2016-04-23 22:55:46 -04:00
Pierrick Charron
a2d78d1a5f
Fixed bug #68658 (Define CURLE_SSL_CACERT_BADFILE)
2016-04-23 22:55:00 -04:00
Pierrick Charron
083f74659f
Merge branch 'PHP-7.0'
2016-04-23 18:38:51 -04:00
Pierrick Charron
043ce195c6
Fix cURL test to use local server instead of google
2016-04-23 18:37:55 -04:00
Anatol Belski
e015faaf8f
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Adds new curl option CURLOPT_SSL_VERIFYSTATUS to enable OCSP verification
Add test for bug #72028
2016-04-16 19:25:13 +02: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
63958350d8
Merge branch 'PHP-7.0'
...
* PHP-7.0:
Update NEWS
Update NEWS for efacdc3
FIX #71831 : CURLOPT_NOPROXY applied as long instead of string
2016-03-21 16:44:42 +08: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
Dmitry Stogov
c67c166f93
Removed zend_fcall_info.symbol_table
2016-03-02 17:50:55 +03: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