Anatol Belski
ec89c85054
cleaning up the version macros
2015-03-23 20:13:59 +01:00
Stanislav Malyshev
6929089db0
fix warning & improve error handling in CURL
2015-03-22 21:51:58 -07:00
Stanislav Malyshev
be2e0b39ba
Merge branch 'PHP-5.6'
...
* PHP-5.6:
add CURL_HTTP_VERSION_2_0 and CURL_VERSION_HTTP2
2015-03-22 18:55:04 -07: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
Dmitry Stogov
8633685675
Use specialized macro for string zval creation
2015-03-12 16:53:51 +03:00
Nikita Popov
b5184ef336
Remove unsafe curl file uploads
...
The option CURLOPT_SAFE_UPLOAD still exists, but cannot be disabled.
2015-03-09 11:00:04 +01:00
Julien Pauli
09c43bd398
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Updated NEWS
updated NEWS
curl: add new proxy constants
2015-02-23 11:23:57 +01: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
a31f4ef884
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix Win32 SSPI initialization for digest authentication in cURL
2015-02-22 16:27:27 +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
Dmitry Stogov
0053b4e899
Fixed possible memory leak
2015-02-11 09:39:38 +03:00
Dmitry Stogov
087102c6d3
Don't convert options in-place. They may be elements of constant array.
2015-02-11 00:02:45 +03:00
Xinchen Hui
e98caf27ea
found type is unnecessary
2015-02-02 14:45:19 +08:00
Xinchen Hui
942809909e
Cleanup resource handling APIs
2015-02-02 13:23:16 +08:00
Xinchen Hui
c9e44dc2df
Revert "Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"""
...
This reverts commit e78dd7ade2
.
2015-02-02 10:32:26 +08:00
Xinchen Hui
e78dd7ade2
Revert "Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0""
...
This reverts commit 348be58f86
.
2015-01-30 17:01:59 +08:00
Xinchen Hui
348be58f86
Fixed warning "(null)(): supplied resource is not a valid cURL handle resource in Unknown on line 0"
2015-01-30 16:50:13 +08:00
Xinchen Hui
007d5f2921
indent
2015-01-30 13:19:27 +08:00
Xinchen Hui
91ce41dc1e
Add more test for bug #68937
2015-01-30 13:17:35 +08:00
Xinchen Hui
73288bbea4
Fixed bug #68937 (Segfault in curl_multi_exec)
2015-01-30 13:12:58 +08:00
Dmitry Stogov
3e31838d19
zend_read_property() has to provide a holder for return value.
...
Previously it was possible that zend_read_property() returned pointer to zval allocated on stack.
2015-01-22 11:50:42 +03:00
Rasmus Lerdorf
57f456a39b
int -> size_t
2015-01-20 22:45:07 -08:00
Xinchen Hui
fc33f52d8c
bump year
2015-01-15 23:27:30 +08:00
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
b7a7b1a624
trailing whitespace removal
2015-01-10 15:07:38 -08:00
Xinchen Hui
124fb22a13
Fixed bug #68739 #68740 #68741
2015-01-08 16:09:02 +08:00
Andrea Faulds
e5eb9530ab
Use "float" and "integer" in typehint and zpp errors
2014-12-21 13:23:02 +00:00
Anatol Belski
3b6a8b1163
remove the thread ctx from curl
2014-12-17 11:38:46 +01:00
Anatol Belski
4acc56d5b2
Merge remote-tracking branch 'origin/master' into native-tls
...
* origin/master:
fix unserializer patch
move this entry to the correct version
add missing NEWS entry
add missing NEWS entry
Updated or skipped certain 32-bit tests
add NEWS entry for #68594
5.4.37
add more BC breaks
update news
add CVE
add missing test file
Fix bug #68594 - Use after free vulnerability in unserialize()
Fix typo
Hash value must not zero?
2014-12-17 05:29:36 +01:00
Andrea Faulds
1392102b0c
Updated or skipped certain 32-bit tests
2014-12-17 01:06:48 +00:00
Anatol Belski
bdeb220f48
first shot remove TSRMLS_* things
2014-12-13 23:06:14 +01:00
Adam Harvey
751aa92fe5
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Revert unintentional docblock change
2014-12-05 13:58:48 -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
8b2a8c46b0
Merge branch 'pull-request/728'
...
* pull-request/728:
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)
Conflicts:
ext/curl/multi.c
2014-11-30 22:22:15 -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
Jille Timmermans
00c6033f99
Add a test for bug #67643 (curl_multi_getcontent returns '' when RETURNTRANSFER isn't set)
2014-11-24 09:37:55 +01:00
Stanislav Malyshev
f782d6710d
Merge branch 'PHP-5.6'
...
* PHP-5.6:
test to function addcslashes
test
Test PHP Init Fail Without Params
Add my information to this test
Add a test for the exception cases of readline_read_history
added some tests to datetime and dateinterval functions
added various tests for XSLTProcessor and one test for iconv extension
teste basico da funcao timezone_version_get
2014-11-23 17:26:35 -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
4b8cc567cd
Merge branch 'PHP-5.6'
...
* PHP-5.6:
fix dir separator in test
2014-11-05 15:43:37 +01: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