You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hc.apache.org by mi...@apache.org on 2018/12/23 20:41:52 UTC

[httpcomponents-client] 01/01: [HTTPCLIENT-1952] Allow default User Agent to be disabled

This is an automated email from the ASF dual-hosted git repository.

michaelo pushed a commit to branch HTTPCLIENT-1952_5.0
in repository https://gitbox.apache.org/repos/asf/httpcomponents-client.git

commit 2017fc74e4a5df67083886ecdb553564e5747f8f
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Sun Dec 23 20:46:25 2018 +0100

    [HTTPCLIENT-1952] Allow default User Agent to be disabled
---
 .../hc/client5/http/impl/classic/HttpClientBuilder.java   | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
index 7298cfc..c286447 100644
--- a/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
+++ b/httpclient5/src/main/java/org/apache/hc/client5/http/impl/classic/HttpClientBuilder.java
@@ -229,6 +229,7 @@ public class HttpClientBuilder {
     private boolean cookieManagementDisabled;
     private boolean authCachingDisabled;
     private boolean connectionStateDisabled;
+    private boolean defaultUserAgentDisabled;
 
     private List<Closeable> closeables;
 
@@ -698,6 +699,18 @@ public class HttpClientBuilder {
     }
 
     /**
+     * Disables the default user agent set by this builder if none has been provided by the user.
+     *
+     * @see #setUserAgent(String)
+     *
+     * @since 5.0
+     */
+    public final HttpClientBuilder disableDefaultUserAgent() {
+        this.defaultUserAgentDisabled = true;
+        return this;
+    }
+
+    /**
      * Request exec chain customization and extension.
      * <p>
      * For internal use.
@@ -779,7 +792,7 @@ public class HttpClientBuilder {
             if (systemProperties) {
                 userAgentCopy = System.getProperty("http.agent");
             }
-            if (userAgentCopy == null) {
+            if (userAgentCopy == null && !defaultUserAgentDisabled) {
                 userAgentCopy = VersionInfo.getSoftwareInfo("Apache-HttpClient",
                         "org.apache.hc.client5", getClass());
             }