]> granicus.if.org Git - php/commitdiff
Fix bug #71694
authormpyw <ryosuke_i_628@yahoo.co.jp>
Tue, 1 Mar 2016 06:30:04 +0000 (15:30 +0900)
committerNikita Popov <nikic@php.net>
Tue, 1 Mar 2016 22:31:58 +0000 (23:31 +0100)
Exports contants CURLM_ADDED_ALREADY.

NEWS
ext/curl/interface.c

diff --git a/NEWS b/NEWS
index d0575da9e928b1f63be43e147f1ef3bf2bb1bafa..5d372449ad96bf4551dffec07ca2d7513d3ba2f6 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -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)
index d9aab7541c8638c12bfe0d490950c5eb158ccd4d..98cc5e2bb4a2ec534e7a41c27ac0695d0a9b4a33 100644 (file)
@@ -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);