]> granicus.if.org Git - php/commitdiff
Fix compile error with theoretically supported versions of libcurl < 7.12.3.
authorAdam Harvey <aharvey@php.net>
Tue, 11 Mar 2014 18:04:26 +0000 (11:04 -0700)
committerAdam Harvey <aharvey@php.net>
Tue, 11 Mar 2014 18:04:26 +0000 (11:04 -0700)
NEWS
ext/curl/interface.c

diff --git a/NEWS b/NEWS
index de44e388daabb370b2c54cfaaa30d20a639592b5..94a09272f5619a52dde6b99112a85614c13c698b 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,6 +11,8 @@ PHP                                                                        NEWS
 
 - cURL:
   . Fixed bug #66109 (Can't reset CURLOPT_CUSTOMREQUEST to default behaviour) (Tjerk)
+  . Fix compilation on libcurl versions between 7.10.5 and 7.12.2, inclusive.
+    (Adam)
 
 - GD:
   . Fixed bug #66714 ( imageconvolution breakage). (Brad Daily)
index 09e20d3a67d2ecbdde3322abd95014b84b482d75..87b871f2032b9b5a9c70fb4f9e15341879a1831d 100644 (file)
@@ -3142,6 +3142,7 @@ PHP_FUNCTION(curl_getinfo)
                                                }
                                                break;
                                        }
+#if LIBCURL_VERSION_NUM >= 0x070c03 /* Available since 7.12.3 */
                                        case CURLINFO_SLIST:
                                        {
                                                struct curl_slist *slist;
@@ -3157,6 +3158,7 @@ PHP_FUNCTION(curl_getinfo)
                                                }
                                                break;
                                        }
+#endif
                                        default:
                                                RETURN_FALSE;
                                }