From: Your Name <william.betts@gmail.com>
Date: Sun, 27 May 2012 07:21:08 +0000 (-0700)
Subject: Fixed the libcurl version checking for CURLOPT_MAIL_AUTH
X-Git-Tag: php-5.5.0alpha1~129^2~8^2~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d41fb16a52a374b070d35253c9599c8d6f609b7a;p=php

Fixed the libcurl version checking for CURLOPT_MAIL_AUTH
---

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 09f497452c..f6e0b05327 100644
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -1036,7 +1036,6 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLINFO_RTSP_SERVER_CSEQ);
 	REGISTER_CURL_CONSTANT(CURLINFO_RTSP_SESSION_ID);
 	REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_PRET);
-	REGISTER_CURL_CONSTANT(CURLOPT_MAIL_AUTH);
 	REGISTER_CURL_CONSTANT(CURLOPT_MAIL_FROM);
 	REGISTER_CURL_CONSTANT(CURLOPT_MAIL_RCPT);
 	REGISTER_CURL_CONSTANT(CURLOPT_RTSP_CLIENT_CSEQ);
@@ -1107,6 +1106,10 @@ PHP_MINIT_FUNCTION(curl)
 	REGISTER_CURL_CONSTANT(CURLOPT_DNS_SERVERS);
 #endif
 
+#if LIBCURL_VERSION_NUM >= 0x071900 /* Available since 7.25.0 */
+	REGISTER_CURL_CONSTANT(CURLOPT_MAIL_AUTH);
+#endif
+
 #if CURLOPT_FTPASCII != 0
 	REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
 #endif