- Fixed compile problem with CURLOPT_HTTPAUTH

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index c823f78ee88a0001a1d5bf19f4a722e586c752be..8dc4bea3e4d3f24f62bea6719d6cde80dbe131ec 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -212,15 +212,15 @@ PHP_MINIT_FUNCTION(curl)
        REGISTER_CURL_CONSTANT(CURLOPT_FTP_USE_EPRT);
        REGISTER_CURL_CONSTANT(CURLOPT_HTTP200ALIASES);
 
-#ifdef CURLOPT_HTTPAUTH /* only in curl 7.10.6 */
+#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
        REGISTER_CURL_CONSTANT(CURLOPT_HTTPAUTH);
        /* http authentication options */
-       REGISTER_CURL_CONSTANT(CURLHTTP_BASIC);
-       REGISTER_CURL_CONSTANT(CURLHTTP_DIGEST);
-       REGISTER_CURL_CONSTANT(CURLHTTP_GSSNEGOTIATE);
-       REGISTER_CURL_CONSTANT(CURLHTTP_NTLM);
-       REGISTER_CURL_CONSTANT(CURLHTTP_ANY);
-       REGISTER_CURL_CONSTANT(CURLHTTP_ANYSAFE);
+       REGISTER_CURL_CONSTANT(CURLAUTH_BASIC);
+       REGISTER_CURL_CONSTANT(CURLAUTH_DIGEST);
+       REGISTER_CURL_CONSTANT(CURLAUTH_GSSNEGOTIATE);
+       REGISTER_CURL_CONSTANT(CURLAUTH_NTLM);
+       REGISTER_CURL_CONSTANT(CURLAUTH_ANY);
+       REGISTER_CURL_CONSTANT(CURLAUTH_ANYSAFE);
 #endif
        
        /* Constants effecting the way CURLOPT_CLOSEPOLICY works */
@@ -831,7 +831,7 @@ PHP_FUNCTION(curl_setopt)
                case CURLOPT_DNS_CACHE_TIMEOUT:
                case CURLOPT_PROXYPORT:
                case CURLOPT_FTP_USE_EPRT:
-#ifdef CURLOPT_HTTPAUTH /* only in curl 7.10.6 */
+#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6 */
                case CURLOPT_HTTPAUTH:
 #endif
                case CURLOPT_UNRESTRICTED_AUTH: