Merge pull request #2953 from hi-rustin/rustin-patch-user-agent

Add the user agent for http requests

CONTRIBUTING.md

@@ -152,7 +152,7 @@ APIs, we should behave well if we can.
 Producing the final release artifacts is a bit involved because of the way
 Rustup is distributed. The steps for a release are:
 
-1. Update all `Cargo.toml` to have the new version
+1. Update `Cargo.toml` and `download/Cargo.toml`to have the same new version
    (optionally make a commit)
 2. Run `cargo build` and review `Cargo.lock` changes
    if all looks well, make a commit

download/Cargo.toml

@@ -4,7 +4,7 @@ authors = ["Brian Anderson <[email protected]>"]
 edition = "2021"
 license = "MIT/Apache-2.0"
 name = "download"
-version = "0.6.9"
+version = "1.24.3"
 
 [features]
 

download/src/lib.rs

@@ -10,6 +10,10 @@ use url::Url;
 mod errors;
 pub use crate::errors::*;
 
+/// User agent header value for HTTP request.
+/// See: https://github.com/rust-lang/rustup/issues/2860.
+const USER_AGENT: &str = concat!("rustup/", env!("CARGO_PKG_VERSION"));
+
 #[derive(Debug, Copy, Clone)]
 pub enum Backend {
     Curl,
@@ -164,6 +168,7 @@ pub mod curl {
 
             handle.url(url.as_ref())?;
             handle.follow_location(true)?;
+            handle.useragent(super::USER_AGENT)?;
 
             if resume_from > 0 {
                 handle.resume_from(resume_from)?;
@@ -303,6 +308,7 @@ pub mod reqwest_be {
     fn client_generic() -> ClientBuilder {
         Client::builder()
             .gzip(false)
+            .user_agent(super::USER_AGENT)
             .proxy(Proxy::custom(env_proxy))
             .timeout(Duration::from_secs(30))
     }