diff options
| author | mpyw <ryosuke_i_628@yahoo.co.jp> | 2016-03-01 15:30:04 +0900 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-03-01 23:31:58 +0100 |
| commit | 0bbea605241932eba24d82378b6ea5fcf8307029 (patch) | |
| tree | 11c02860649e07752dee2be0968bba6bf104e932 | |
| parent | 50b4cafd286eb9d96d71df04e8dc46d321d420b5 (diff) | |
| download | php-git-0bbea605241932eba24d82378b6ea5fcf8307029.tar.gz | |
Fix bug #71694
Exports contants CURLM_ADDED_ALREADY.
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | ext/curl/interface.c | 3 |
2 files changed, 6 insertions, 0 deletions
@@ -6,6 +6,9 @@ PHP NEWS . Fixed bug #71596 (Segmentation fault on ZTS with date function (setlocale)). (Anatol) +- Curl: + . Fixed bug #71694 (Support constant CURLM_ADDED_ALREADY). (mpyw) + - ODBC: . Fixed bug #47803, #69526 (Executing prepared statements is succesfull only for the first two statements). (einavitamar at gmail dot com, Anatol) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index d9aab7541c..98cc5e2bb4 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -831,6 +831,9 @@ PHP_MINIT_FUNCTION(curl) REGISTER_CURL_CONSTANT(CURLM_INTERNAL_ERROR); REGISTER_CURL_CONSTANT(CURLM_OK); REGISTER_CURL_CONSTANT(CURLM_OUT_OF_MEMORY); +#if LIBCURL_VERSION_NUM >= 0x072001 /* Available since 7.32.1 */ + REGISTER_CURL_CONSTANT(CURLM_ADDED_ALREADY); +#endif /* Curl proxy constants */ REGISTER_CURL_CONSTANT(CURLPROXY_HTTP); |