[PHP-CVS] cvs: php-src(PHP_4_3) /ext/curl curl.c

[Ilia Alshanetsky]

iliaa           Fri Mar 26 14:04:17 2004 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/curl   curl.c 
  Log:
  MFH: Fixes to allow curl extension to compile against libcurl 7.11.1
  
  
http://cvs.php.net/diff.php/php-src/ext/curl/curl.c?r1=1.124.2.18&r2=1.124.2.19&ty=u
Index: php-src/ext/curl/curl.c
diff -u php-src/ext/curl/curl.c:1.124.2.18 php-src/ext/curl/curl.c:1.124.2.19
--- php-src/ext/curl/curl.c:1.124.2.18  Fri Mar 12 12:43:17 2004
+++ php-src/ext/curl/curl.c     Fri Mar 26 14:04:17 2004
@@ -16,7 +16,7 @@
    +----------------------------------------------------------------------+
 */
 
-/* $Id: curl.c,v 1.124.2.18 2004/03/12 17:43:17 iliaa Exp $ */
+/* $Id: curl.c,v 1.124.2.19 2004/03/26 19:04:17 iliaa Exp $ */
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
@@ -37,6 +37,11 @@
 #include <curl/curl.h>
 #include <curl/easy.h>
 
+/* As of curl 7.11.1 this is no longer defined inside curl.h */
+#ifndef HttpPost
+#define HttpPost curl_httppost
+#endif
+
 #define SMART_STR_PREALLOC 4096
 
 #include "ext/standard/php_smart_str.h"
@@ -133,7 +138,9 @@
        REGISTER_CURL_CONSTANT(CURLOPT_FOLLOWLOCATION);
        REGISTER_CURL_CONSTANT(CURLOPT_FTPASCII);
        REGISTER_CURL_CONSTANT(CURLOPT_PUT);
+#if CURLOPT_MUTE != 0
        REGISTER_CURL_CONSTANT(CURLOPT_MUTE);
+#endif
        REGISTER_CURL_CONSTANT(CURLOPT_USERPWD);
        REGISTER_CURL_CONSTANT(CURLOPT_PROXYUSERPWD);
        REGISTER_CURL_CONSTANT(CURLOPT_RANGE);
@@ -506,6 +513,7 @@
 }
 /* }}} */
 
+#if CURLOPT_PASSWDFUNCTION != 0
 /* {{{ curl_passwd
  */
 static size_t curl_passwd(void *ctx, char *prompt, char *buf, int buflen)
@@ -552,6 +560,7 @@
        return ret;
 }
 /* }}} */
+#endif
 
 /* {{{ curl_free_string
  */
@@ -697,7 +706,9 @@
                case CURLOPT_NETRC:
                case CURLOPT_FOLLOWLOCATION:
                case CURLOPT_PUT:
-               case CURLOPT_MUTE:
+#if CURLOPT_MUTE != 0
+                case CURLOPT_MUTE:
+#endif
                case CURLOPT_TIMEOUT:
                case CURLOPT_FTP_USE_EPSV:
                case CURLOPT_LOW_SPEED_LIMIT:
@@ -842,6 +853,7 @@
                        ch->handlers->write_header->func   = *zvalue;
                        ch->handlers->write_header->method = PHP_CURL_USER;
                        break;
+#if CURLOPT_PASSWDFUNCTION != 0
                case CURLOPT_PASSWDFUNCTION:
                        if (ch->handlers->passwd) {
                                zval_ptr_dtor(&ch->handlers->passwd);
@@ -851,6 +863,7 @@
                        error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDFUNCTION, 
curl_passwd);
                        error = curl_easy_setopt(ch->cp, CURLOPT_PASSWDDATA,     (void 
*) ch);
                        break;
+#endif
                case CURLOPT_POSTFIELDS:
                        if (Z_TYPE_PP(zvalue) == IS_ARRAY || Z_TYPE_PP(zvalue) == 
IS_OBJECT) {
                                zval            **current;

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