From f75c1ed201102aedfe9e04b24c6d74fe2f74b53d Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 27 May 2012 00:02:53 -0700 Subject: [PATCH 1/4] Added support for CURLOPT_MAIL_AUTH --- ext/curl/interface.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 35339911bad0d..09f497452ca9a 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -18,6 +18,7 @@ /* $Id$ */ +#include #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H @@ -1035,6 +1036,7 @@ 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); @@ -2214,6 +2216,9 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu #if LIBCURL_VERSION_NUM >= 0x071800 /* Available since 7.24.0 */ case CURLOPT_DNS_SERVERS: #endif +#if LIBCURL_VERSION_NUM >= 0x071900 /* Available since 7.25.0 */ + case CURLOPT_MAIL_AUTH: +#endif { #if LIBCURL_VERSION_NUM < 0x071100 char *copystr = NULL; From d41fb16a52a374b070d35253c9599c8d6f609b7a Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 27 May 2012 00:21:08 -0700 Subject: [PATCH 2/4] Fixed the libcurl version checking for CURLOPT_MAIL_AUTH --- ext/curl/interface.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index 09f497452ca9a..f6e0b053273b1 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 From 0667da8cb42d7df70175b47a910ae127d5cf6246 Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 27 May 2012 01:50:29 -0700 Subject: [PATCH 3/4] Removed syslog.h. That should never have been commited. --- ext/curl/interface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index f6e0b053273b1..c066d6be0e40f 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -18,7 +18,6 @@ /* $Id$ */ -#include #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS #ifdef HAVE_CONFIG_H From 60c47285941490a5cc91aada4a7f0cfbbc42561d Mon Sep 17 00:00:00 2001 From: Your Name Date: Sun, 27 May 2012 15:39:45 -0700 Subject: [PATCH 4/4] VIM uses spaces as tabs and that doesn't comply with the coding standard. I think I'd fixed it so it's using real tabs now. --- ext/curl/interface.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ext/curl/interface.c b/ext/curl/interface.c index c066d6be0e40f..14836cc5ab3a3 100644 --- a/ext/curl/interface.c +++ b/ext/curl/interface.c @@ -2219,7 +2219,7 @@ static int _php_curl_setopt(php_curl *ch, long option, zval **zvalue, zval *retu case CURLOPT_DNS_SERVERS: #endif #if LIBCURL_VERSION_NUM >= 0x071900 /* Available since 7.25.0 */ - case CURLOPT_MAIL_AUTH: + case CURLOPT_MAIL_AUTH: #endif { #if LIBCURL_VERSION_NUM < 0x071100