[PHP-CVS] svn: /php/php-src/ branches/PHP_5_3/ext/curl/interface.c trunk/ext/curl/interface.c

[Ilia Alshanetsky]

iliaa                                    Tue, 22 Sep 2009 01:17:16 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=288546

Log:
Fixed build with older version of libcurl

Changed paths:
    U   php/php-src/branches/PHP_5_3/ext/curl/interface.c
    U   php/php-src/trunk/ext/curl/interface.c

Modified: php/php-src/branches/PHP_5_3/ext/curl/interface.c
===================================================================
--- php/php-src/branches/PHP_5_3/ext/curl/interface.c   2009-09-21 19:28:12 UTC 
(rev 288545)
+++ php/php-src/branches/PHP_5_3/ext/curl/interface.c   2009-09-22 01:17:16 UTC 
(rev 288546)
@@ -629,7 +629,7 @@
        REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
        REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
        REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM >  0x071301
        REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
 #endif

@@ -747,7 +747,7 @@
        REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
        REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
        REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO);
 #endif

@@ -1342,7 +1342,7 @@
 }
 /* }}} */

-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
 /* {{{ split_certinfo
  */
 static void split_certinfo(char *string, zval *hash)
@@ -1644,7 +1644,7 @@
 #if LIBCURL_VERSION_NUM >= 0x070f01
                case CURLOPT_FTP_FILEMETHOD:
 #endif
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM >  0x071301
                case CURLOPT_CERTINFO:
 #endif
                        convert_to_long_ex(zvalue);
@@ -2265,7 +2265,7 @@
                if (curl_easy_getinfo(ch->cp, CURLINFO_REDIRECT_TIME, &d_code) 
== CURLE_OK) {
                        CAAD("redirect_time", d_code);
                }
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
                if (curl_easy_getinfo(ch->cp, CURLINFO_CERTINFO, &ci) == 
CURLE_OK) {
                        MAKE_STD_ZVAL(listcode);
                        array_init(listcode);
@@ -2332,7 +2332,7 @@
                                } else {
                                        RETURN_FALSE;
                                }
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
                        case CURLINFO_CERTINFO: {
                                struct curl_certinfo *ci = NULL;


Modified: php/php-src/trunk/ext/curl/interface.c
===================================================================
--- php/php-src/trunk/ext/curl/interface.c      2009-09-21 19:28:12 UTC (rev 
288545)
+++ php/php-src/trunk/ext/curl/interface.c      2009-09-22 01:17:16 UTC (rev 
288546)
@@ -629,7 +629,7 @@
        REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_COUNT);
        REGISTER_CURL_CONSTANT(CURLINFO_HEADER_OUT);
        REGISTER_CURL_CONSTANT(CURLINFO_PRIVATE);
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM >  0x071301
        REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
 #endif

@@ -747,7 +747,7 @@
        REGISTER_CURL_CONSTANT(CURLFTPSSL_CONTROL);
        REGISTER_CURL_CONSTANT(CURLFTPSSL_ALL);
 #endif
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
        REGISTER_CURL_CONSTANT(CURLOPT_CERTINFO);
 #endif

@@ -1345,7 +1345,7 @@
 }
 /* }}} */

-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
 /* {{{ split_certinfo
  */
 static void split_certinfo(char *string, zval *hash)
@@ -1660,7 +1660,7 @@
 #if LIBCURL_VERSION_NUM >= 0x070f01
                case CURLOPT_FTP_FILEMETHOD:
 #endif
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM >  0x071301
                case CURLOPT_CERTINFO:
 #endif
                        convert_to_long_ex(zvalue);
@@ -2331,7 +2331,7 @@
                if (curl_easy_getinfo(ch->cp, CURLINFO_REDIRECT_TIME, &d_code) 
== CURLE_OK) {
                        CAAD("redirect_time", d_code);
                }
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
                if (curl_easy_getinfo(ch->cp, CURLINFO_CERTINFO, &ci) == 
CURLE_OK) {
                        MAKE_STD_ZVAL(listcode);
                        array_init(listcode);
@@ -2398,7 +2398,7 @@
                                } else {
                                        RETURN_FALSE;
                                }
-#if LIBCURL_VERSION_NUM >  0x071202
+#if LIBCURL_VERSION_NUM > 0x071301
                        case CURLINFO_CERTINFO: {
                                struct curl_certinfo *ci = NULL;



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