Fixed bug #62912 (CURLINFO_PRIMARY_IP is not exposed)

CURLINFO_PRIMARY_* and CURLINFO_LOCAL_* where available in curl_getinfo
but the constant itself was not exposed to php userland

diff --git a/NEWS b/NEWS
index b51f28e821cb6cd3dbec8ab72b8601a8fd5cc980..5e482d2b2b98077c49739779e7d729a413f08a06 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,6 +22,8 @@ PHP                                                                        NEWS
     constructor). (Stas)
 
 - CURL:
+  . Fixed bug #62912 (CURLINFO_PRIMARY_* AND CURLINFO_LOCAL_* not exposed).
+       (Pierrick)
   . Fixed bug #62839 (curl_copy_handle segfault with CURLOPT_FILE). (Pierrick)
 
 - DateTime:

diff --git a/ext/curl/interface.c b/ext/curl/interface.c
index b57ce1bd0790094daf9864c0f30d36f5517d1d06..d75e5c058b1c2be8592d69db52df2e7256eb4b4b 100644 (file)
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@@ -713,6 +713,14 @@ PHP_MINIT_FUNCTION(curl)
 #if LIBCURL_VERSION_NUM >= 0x071202
     REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL);
 #endif
+#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
+       REGISTER_CURL_CONSTANT(CURLINFO_PRIMARY_IP);
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071500 /* 7.21.0 */
+       REGISTER_CURL_CONSTANT(CURLINFO_PRIMARY_PORT);
+       REGISTER_CURL_CONSTANT(CURLINFO_LOCAL_IP);
+       REGISTER_CURL_CONSTANT(CURLINFO_LOCAL_PORT);
+#endif
 
 
        /* cURL protocol constants (curl_version) */
@@ -2447,6 +2455,8 @@ PHP_FUNCTION(curl_getinfo)
                        create_certinfo(ci, listcode TSRMLS_CC);
                        CAAZ("certinfo", listcode);
                }
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
                if (curl_easy_getinfo(ch->cp, CURLINFO_PRIMARY_IP, &s_code) == CURLE_OK) {
                        CAAS("primary_ip", s_code);
                }
@@ -2473,10 +2483,10 @@ PHP_FUNCTION(curl_getinfo)
        } else {
                switch (option) {
                        /* string variable types */
-#if LIBCURL_VERSION_NUM >= 0x071500
+#if LIBCURL_VERSION_NUM >= 0x071300 /* 7.19.0 */
                        case CURLINFO_PRIMARY_IP:
 #endif
-#if LIBCURL_VERSION_NUM >= 0x071500
+#if LIBCURL_VERSION_NUM >= 0x071500 /* 7.21.0 */
                        case CURLINFO_LOCAL_IP:
 #endif
                        case CURLINFO_PRIVATE:
@@ -2496,7 +2506,7 @@ PHP_FUNCTION(curl_getinfo)
                                break;
                        }
                        /* Long variable types */
-#if LIBCURL_VERSION_NUM >= 0x071500
+#if LIBCURL_VERSION_NUM >= 0x071500 /* 7.21.0 */
                        case CURLINFO_PRIMARY_PORT:
                        case CURLINFO_LOCAL_PORT:
 #endif