]> granicus.if.org Git - php/commitdiff
- add CURLINFO_REDIRECT_URL
authorPierre Joye <pajoye@php.net>
Fri, 1 Apr 2011 17:19:08 +0000 (17:19 +0000)
committerPierre Joye <pajoye@php.net>
Fri, 1 Apr 2011 17:19:08 +0000 (17:19 +0000)
ext/curl/interface.c

index cd9d5a46e2e3181c17786ce1e96d667672f5a75c..88502df8bf12369db343068a5f12933496dd2cda 100644 (file)
@@ -644,6 +644,10 @@ PHP_MINIT_FUNCTION(curl)
 #if LIBCURL_VERSION_NUM >  0x071301
        REGISTER_CURL_CONSTANT(CURLINFO_CERTINFO);
 #endif
+#if LIBCURL_VERSION_NUM >= 0x071202
+    REGISTER_CURL_CONSTANT(CURLINFO_REDIRECT_URL);
+#endif
+
 
        /* cURL protocol constants (curl_version) */
        REGISTER_CURL_CONSTANT(CURL_VERSION_IPV6);
@@ -2346,6 +2350,11 @@ PHP_FUNCTION(curl_getinfo)
                if (curl_easy_getinfo(ch->cp, CURLINFO_LOCAL_PORT, &l_code) == CURLE_OK) {
                        CAAL("local_port", l_code);
                }
+#endif
+#if LIBCURL_VERSION_NUM >= 0x071202
+               if (curl_easy_getinfo(ch->cp, CURLINFO_REDIRECT_URL, &s_code) == CURLE_OK) {
+                       CAAS("redirect_url", s_code);
+               }
 #endif
                if (ch->header.str_len > 0) {
                        CAAS("request_header", ch->header.str);
@@ -2361,7 +2370,11 @@ PHP_FUNCTION(curl_getinfo)
 #endif
                        case CURLINFO_PRIVATE:
                        case CURLINFO_EFFECTIVE_URL:
-                       case CURLINFO_CONTENT_TYPE: {
+                       case CURLINFO_CONTENT_TYPE:
+#if LIBCURL_VERSION_NUM >= 0x071202
+                       case CURLINFO_REDIRECT_URL:
+#endif
+                       {
                                char *s_code = NULL;
 
                                if (curl_easy_getinfo(ch->cp, option, &s_code) == CURLE_OK && s_code) {