Stanislav Malyshev
5776fceb16
Merge branch 'PHP-5.5' into PHP-5.6
...
* 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
2015-04-14 01:05:01 -07:00
Stanislav Malyshev
be34c82bfd
fix test
2015-04-13 16:10:05 -07:00
Stanislav Malyshev
d19842f613
Merge branch 'PHP-5.4.40' into PHP-5.5-security
...
* 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.
2015-04-05 00:45:58 -07:00
Stanislav Malyshev
cb0d325066
Fixed bug #69316 (Use-after-free in php_curl related to CURLOPT_FILE/_INFILE/_WRITEHEADER)
2015-04-05 00:32:13 -07:00
Lior Kaplan
c22543b3f3
Merge branch 'PHP-5.5' into PHP-5.6
...
* 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)
2015-04-01 01:54:53 +03:00
Xinchen Hui
1add8401a3
Fixed bug #68739 (Missing break / control flow in curl)
...
(cherry picked from commit 124fb22a13
)
2015-04-01 01:24:26 +03:00
Stanislav Malyshev
c6384a7908
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:54:48 -07:00
Masaki Kagaya
1badfd8171
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:52:42 -07:00
Julien Pauli
5256ffd4fe
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:00 +01:00
Linus Unnebäck
63ab6d8249
curl: add new proxy constants
2015-02-23 11:19:36 +01:00
Anatol Belski
e656932d0e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:26:52 +01:00
Grant Pannell
7988f703f8
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 23:34:55 +10:30
Xinchen Hui
0579e8278d
bump year
2015-01-15 23:26:37 +08:00
Xinchen Hui
73c1be2653
Bump year
2015-01-15 23:26:03 +08:00
Stanislav Malyshev
b75867fff0
add missing test file
2014-12-16 10:15:17 -08:00
Adam Harvey
381fd62ccf
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Revert unintentional docblock change
2014-12-05 13:58:19 -08:00
Adam Harvey
79131b4617
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Revert unintentional docblock change
2014-12-05 13:57:46 -08:00
Chris Christoff
0e985d3726
Revert unintentional docblock change
...
Revert unintentional docblock change
It looks like commit dd8e59da8f
introduced an unintended docbloc change. I have reverted this
change in this commit.
2014-12-05 13:57:03 -08:00
Stanislav Malyshev
e0b6e5222b
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
update NEWS
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:22:01 -08:00
Jille Timmermans
1b4368db77
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
2014-11-30 22:18:22 -08:00
Jille Timmermans
7049d3450e
Fixed bug #67643 (curl_multi_getcontent returns '' when CURLOPT_RETURNTRANSFER isn't set)
2014-11-30 22:18:12 -08:00
Stanislav Malyshev
2c67c0246e
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Test PHP Init Fail Without Params
2014-11-23 17:21:29 -08:00
Stanislav Malyshev
fa76fa8e32
Merge branch 'pull-request/863' into PHP-5.5
...
* pull-request/863:
Test PHP Init Fail Without Params
2014-11-23 17:21:20 -08:00
Anatol Belski
d4050f42fd
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix dir separator in test
2014-11-05 15:43:13 +01:00
Anatol Belski
53266476e6
fix dir separator in test
2014-11-05 15:42:45 +01:00
Rasmus Lerdorf
5606466624
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:28:20 -07:00
Rasmus Lerdorf
2b5bffe6c7
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:25:29 -07:00
Stanislav Malyshev
47a1447cc8
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix return code (merges are hard :( )
2014-10-14 11:43:34 -07:00
Stanislav Malyshev
bb3d43fa05
Fix return code (merges are hard :( )
2014-10-14 11:42:33 -07:00
Stanislav Malyshev
71b63fc701
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:45:35 -07:00
Stanislav Malyshev
d1e030db02
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:43:59 -07:00
Stanislav Malyshev
ab0939e5e5
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-13 23:16:06 -07:00
Paulo Eduardo
17759439d7
Test PHP Init Fail Without Params
2014-09-30 08:56:46 -03:00
Anatol Belski
13280a9e36
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:31:16 +02:00
Anatol Belski
69ea7f9509
reflect in the test that GSS-Negotiate is deprecated since libcurl 7.38.0
2014-09-11 23:30:01 +02:00
Stanislav Malyshev
2152e2f127
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test - output can be chunked
Conflicts:
ext/curl/tests/curl_basic_006.phpt
2014-05-12 10:56:03 -07:00
Stanislav Malyshev
e3ca87265d
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
fix test - output can be chunked
2014-05-12 10:54:34 -07:00
Stanislav Malyshev
6ef8e0f088
fix test - output can be chunked
2014-05-12 10:54:16 -07:00
Stanislav Malyshev
9c27063a65
fix test
2014-05-12 01:27:18 -07:00
Stanislav Malyshev
89798f57d4
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
improve CURL tests to allow testing without separate server
2014-05-11 23:03:21 -07:00
Stanislav Malyshev
c507c9f01b
improve CURL tests to allow testing without separate server
2014-05-11 22:43:08 -07:00
Michael Wallner
42fbb952d7
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix test locality inconsitency
2014-04-30 13:02:43 +02:00
Michael Wallner
b79301d11f
fix test locality inconsitency
2014-04-30 13:01:59 +02:00
Michael Wallner
407612083f
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:28:21 +02:00
Michael Wallner
54fee59598
fix bug #64247 (CURLOPT_INFILE doesn't allow reset)
2014-04-30 09:27:58 +02:00
Stanislav Malyshev
1ef0bd2633
Merge branch 'PHP-5.5' into PHP-5.6
...
* PHP-5.5:
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:52 -07:00
Stanislav Malyshev
f1206aef70
Merge branch 'PHP-5.4' into PHP-5.5
...
* PHP-5.4:
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
2014-04-13 18:13:09 -07:00
Freek
5558d0db9b
Fix #66562 : Consistency bug where curl_multi_getcontent behaves different from curl_exec
...
curl_exec returns an empty string when data is received from a domain that returns zero content. curl_multi_getcontent
returned null. Now it returns an empty string fixing the incosistency
2014-04-13 18:12:17 -07:00
Adam Harvey
1a14eb53c4
Merge branch 'PHP-5.5' into PHP-5.6
2014-03-11 11:06:39 -07:00
Adam Harvey
f8252aa537
Fix compile error with theoretically supported versions of libcurl < 7.12.3.
2014-03-11 11:04:26 -07:00