a sketch of passing curl options down to curl…

…but it clearly shows that the backend needs to be abstracted or else we can't have general HTTP options as are implied by the way git works.

Sebastian Thiel committed 4 years ago

Commit 63e24fc1 parent 7c5b37d3 files · +48 −1Browse files

Unified · Split

3 files

 mod remote;
+/// Options to configure curl requests.
+#[derive(Default, Clone)]
+pub struct Options {
+    /// Corresponds to the `http.extraHeader` configuration, a multi-var.
+    /// They are applied unconditionally and are expected to be valid.
+    pub extra_headers: Vec<String>,
+    /// How to handle redirects.
+    pub follow_redirects: http::options::FollowRedirects,
+}
 pub struct Curl {
     req: SyncSender<remote::Request>,
     res: Receiver<remote::Response>,
     handle: Option<thread::JoinHandle<Result<(), curl::Error>>>,
+    options: Options,
 }
 impl Curl {
                 url: url.to_owned(),
                 headers: list,
                 upload,
+                config: self.options.clone(),
             })
             .is_err()
         {
             handle: Some(handle),
             req,
             res,
+            options: Options::default(),
         }
     }
 }

     pub url: String,
     pub headers: curl::easy::List,
     pub upload: bool,
+    pub config: http::curl::Options,
 }
 pub struct Response {
     let handle = std::thread::spawn(move || -> Result<(), curl::Error> {
         let mut handle = Easy2::new(Handler::default());
-        for Request { url, headers, upload } in req_recv {
+        for Request {
+            url,
+            mut headers,
+            upload,
+            config,
+        } in req_recv
+        {
             handle.url(&url)?;
             // GitHub sends 'chunked' to avoid unknown clients to choke on the data, I suppose
             handle.post(upload)?;
+            for header in config.extra_headers {
+                headers.append(&header)?;
+            }
             handle.http_headers(headers)?;
             handle.transfer_encoding(false)?;
             handle.connect_timeout(Duration::from_secs(20))?;

@@ -21,6 +21,30 @@ mod reqwest; · 20 unmodified lines
21	///	21	///
22	mod traits;	22	mod traits;
23		23
		24	///
		25	pub mod options {
		26	/// possible settings for the `http.followRedirects` configuration option.
		27	#[derive(Copy, Clone, PartialEq, Eq)]
		28	pub enum FollowRedirects {
		29	/// Follow only the first redirect request, most suitable for typical git requests.
		30	Initial,
		31	/// Follow all redirect requests from the server unconditionally
		32	All,
		33	/// Follow no redirect request.
		34	None,
		35	}
		36
		37	impl Default for FollowRedirects {
		38	fn default() -> Self {
		39	FollowRedirects::Initial
		40	}
		41	}
		42	}
		43
		44	/// The http client configuration when using reqwest
		45	#[cfg(feature = "http-client-curl")]
		46	pub type Options = curl::Options;
		47
24	/// The http client configuration when using reqwest	48	/// The http client configuration when using reqwest
25	#[cfg(feature = "http-client-reqwest")]	49	#[cfg(feature = "http-client-reqwest")]
26	pub type Options = reqwest::Options;	50	pub type Options = reqwest::Options;