sniper Sun Jan 25 23:59:59 2004 EDT
Modified files:
/php-src/ext/curl interface.c
Log:
- Fixed compile problem with CURLOPT_HTTPAUTH
http://cvs.php.net/diff.php/php-src/ext/curl/interface.c?r1=1.30&r2=1.31&ty=u
Index: php-src/ext/curl/interface.c
diff -u php-src/ext/curl/interface.c:1.30 php-src/ext/curl/interface.c:1.31
--- php-src/ext/curl/interface.c:1.30 Sun Jan 25 19:16:16 2004
+++ php-src/ext/curl/interface.c Sun Jan 25 23:59:59 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: interface.c,v 1.30 2004/01/26 00:16:16 sniper Exp $ */
+/* $Id: interface.c,v 1.31 2004/01/26 04:59:59 sniper Exp $ */
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS
@@ -212,15 +212,15 @@
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 @@
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:
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
