Commit:    d41fb16a52a374b070d35253c9599c8d6f609b7a
Author:    Your Name <william.be...@gmail.com>         Sun, 27 May 2012 
00:21:08 -0700
Parents:   f75c1ed201102aedfe9e04b24c6d74fe2f74b53d
Branches:  master

Link:       
http://git.php.net/?p=php-src.git;a=commitdiff;h=d41fb16a52a374b070d35253c9599c8d6f609b7a

Log:
Fixed the libcurl version checking for CURLOPT_MAIL_AUTH

Changed paths:
  M  ext/curl/interface.c


Diff:
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index 09f4974..f6e0b05 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


--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to