From: mpyw <ryosuke_i_628@yahoo.co.jp>
Date: Tue, 1 Mar 2016 06:30:04 +0000 (+0900)
Subject: Fix bug #71694
X-Git-Tag: php-5.6.20RC1~21
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0bbea605241932eba24d82378b6ea5fcf8307029;p=php

Fix bug #71694

Exports contants CURLM_ADDED_ALREADY.
---

diff --git a/NEWS b/NEWS
index d0575da9e9..5d372449ad 100644
--- 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)
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);