Fix: Bypass proxy for metadata based on libcurl version (googleapis#15155)

eliekozah · web-flow · commit 7fe2884400f1 · 2025-05-20T15:07:57.000-04:00
diff --git a/google/cloud/internal/curl_impl.cc b/google/cloud/internal/curl_impl.cc
@@ -370,8 +370,10 @@ Status CurlImpl::MakeRequest(HttpMethod method, RestContext& context,
     if (!status.ok()) return OnTransferError(context, std::move(status));
   }
 
+#if CURL_AT_LEAST_VERSION(7, 19, 4)
   status = handle_.SetOption(CURLOPT_NOPROXY, "metadata.google.internal");
   if (!status.ok()) return OnTransferError(context, std::move(status));
+#endif
 
   if (interface_) {
     status = handle_.SetOption(CURLOPT_INTERFACE, interface_->c_str());

Original file line number	Diff line number	Diff line change
`@@ -370,8 +370,10 @@ Status CurlImpl::MakeRequest(HttpMethod method, RestContext& context,`
`370`	`370`	`if (!status.ok()) return OnTransferError(context, std::move(status));`
`371`	`371`	`}`
`372`	`372`
	`373`	`+#if CURL_AT_LEAST_VERSION(7, 19, 4)`
`373`	`374`	`status = handle_.SetOption(CURLOPT_NOPROXY, "metadata.google.internal");`
`374`	`375`	`if (!status.ok()) return OnTransferError(context, std::move(status));`
	`376`	`+#endif`
`375`	`377`
`376`	`378`	`if (interface_) {`
`377`	`379`	`status = handle_.SetOption(CURLOPT_INTERFACE, interface_->c_str());`