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
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
Anatol Belski
3b6a8b1163
remove the thread ctx from curl
2014-12-17 11:38:46 +01: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
Rasmus Lerdorf
2a8f7f8824
Merge branch 'PHP-5.6'
...
* PHP-5.6:
TLS 1.0, 1.1 and 1.2 Curl constants - bug #68247
2014-10-16 21:28:49 -07: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
01d17228dc
Merge branch 'PHP-5.6'
...
* PHP-5.6:
Fix return code (merges are hard :( )
2014-10-14 11:45:01 -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
d9559d0ecd
fix bad merge
2014-10-14 11:17:48 -07:00
Stanislav Malyshev
81b67937e4
Fix bug #68089 - do not accept options with embedded \0
...
Conflicts:
ext/curl/interface.c
2014-10-14 10:51:46 -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
Anatol Belski
d2161c8104
reveal some newer libcurl features in MINFO
2014-10-03 21:47:00 +02:00
Nikita Popov
e33f3d3b7c
Move smart_str implementation into Zend/
...
So we can use it there as well...
For now I've retained the zend_smart_str_public.h header, though
it would probably be better to just move that one struct into
zend_types.h.
2014-09-21 20:49:39 +02:00
Johannes Schlüter
d0cb715373
s/PHP 5/PHP 7/
2014-09-19 18:33:14 +02:00
Anatol Belski
635a23128b
better way to check for empty string
2014-09-14 22:07:38 +02:00
Anatol Belski
95a50f7322
fix type
2014-09-12 21:35:23 +02:00
Xinchen Hui
8002e2c06a
Fixed discards qualifiers from pointer target type
2014-09-05 09:31:05 +08:00
Anatol Belski
3234480827
first show to make 's' work with size_t
2014-08-27 20:49:31 +02:00
Anatol Belski
202e8db1dc
fixed several long vs zend_long casts
2014-08-26 11:26:53 +02:00