iliaa Wed Aug 18 17:30:41 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src NEWS
/php-src/ext/curl curl.c
Log:
MFH: Fixed bug #29727 (Added missing CURL authentication directives).
http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1247.2.718&r2=1.1247.2.719&ty=u
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.718 php-src/NEWS:1.1247.2.719
--- php-src/NEWS:1.1247.2.718 Tue Aug 17 10:10:03 2004
+++ php-src/NEWS Wed Aug 18 17:30:40 2004
@@ -2,6 +2,7 @@
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? ??? 2004, Version 4.3.9
- Fixed a file-descriptor leak with phpinfo() and other 'special' URLs (Zeev)
+- Fixed bug #29727 (Added missing CURL authentication directives). (Ilia)
- Fixed bug #29719 (fgetcsv() has problem parsing strings ending with escaped
enclosures). (Ilia)
- Fixed bug #29599 (domxml_error segfaults another apache module). (Rob)
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.22&r2=1.124.2.23&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.22 php-src/ext/curl/curl.c:1.124.2.23
--- php-src/ext/curl/curl.c:1.124.2.22 Thu Jul 1 02:51:48 2004
+++ php-src/ext/curl/curl.c Wed Aug 18 17:30:40 2004
@@ -16,7 +16,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: curl.c,v 1.124.2.22 2004/07/01 06:51:48 sterling Exp $ */
+/* $Id: curl.c,v 1.124.2.23 2004/08/18 21:30:40 iliaa Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -205,6 +205,21 @@
REGISTER_CURL_CONSTANT(CURLOPT_ENCODING);
#endif
+#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(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
+
+#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl
7.10.7 */
+ REGISTER_CURL_CONSTANT(CURLOPT_PROXYAUTH);
+#endif
+
/* Constants effecting the way CURLOPT_CLOSEPOLICY works */
REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_RECENTLY_USED);
REGISTER_CURL_CONSTANT(CURLCLOSEPOLICY_LEAST_TRAFFIC);
@@ -764,6 +779,12 @@
case CURLOPT_HTTPGET:
case CURLOPT_HTTP_VERSION:
case CURLOPT_CRLF:
+#if LIBCURL_VERSION_NUM > 0x070a05 /* CURLOPT_HTTPAUTH is available since curl 7.10.6
*/
+ case CURLOPT_HTTPAUTH:
+#endif
+#if LIBCURL_VERSION_NUM > 0x070a06 /* CURLOPT_PROXYAUTH is available since curl
7.10.7 */
+ case CURLOPT_PROXYAUTH:
+#endif
convert_to_long_ex(zvalue);
error = curl_easy_setopt(ch->cp, option, Z_LVAL_PP(zvalue));
break;
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
