Remove default header.

Author: igr

src/main/java/jodd/http/HttpBase.java

@@ -81,10 +81,6 @@ public static class Defaults {
 		 * Default body encoding (UTF-8).
 		 */
 		public static String bodyEncoding = "UTF-8";
-		/**
-		 * Default user agent value.
-		 */
-		public static String userAgent = "Jodd HTTP";
 		/**
 		 * Flag that controls if headers should be rewritten and capitalized in PascalCase.
 		 * When disabled, header keys are used as they are passed.
@@ -105,6 +101,7 @@ public static class Defaults {
 	public static final String HEADER_CONNECTION = "Connection";
 	public static final String HEADER_KEEP_ALIVE = "Keep-Alive";
 	public static final String HEADER_CLOSE = "Close";
+	public static final String HEADER_USER_AGENT = "User-Agent";
 	public static final String HTTP_1_0 = "HTTP/1.0";
 	public static final String HTTP_1_1 = "HTTP/1.1";
 

src/main/java/jodd/http/HttpRequest.java

@@ -66,8 +66,10 @@ public HttpRequest() {
 	}
 
 	/**
-	 * Prepares request on creation. By default, it just
-	 * adds "Connection: Close" header.
+	 * Prepares request on creation. Does the following:
+	 * <ul>
+	 *     <li>adds "Connection: Close" header.</li>
+	 * </ul>
 	 */
 	protected void initRequest() {
 		connectionKeepAlive(false);
@@ -964,9 +966,9 @@ protected Buffer buffer(final boolean fullRequest) {
 
 		// user-agent
 
-		if (header("User-Agent") == null) {
-			header("User-Agent", Defaults.userAgent);
-		}
+//		if (header("User-Agent") == null) {
+//			header("User-Agent", Defaults.userAgent);
+//		}
 
 		// POST method requires Content-Type to be set
 

src/test/java/jodd/http/HttpConnectionTest.java

@@ -145,7 +145,7 @@ public void transferred(final int len) {
 		echoTestServer.stop();
 		file.delete();
 
-		assertEquals(":0:512:1024:148", StringUtil.substring(sb.toString(), 0, -1));
+		assertEquals(":0:512:1024:146", StringUtil.substring(sb.toString(), 0, -1));
 	}
 
 }

src/test/java/jodd/http/HttpRequestTest.java

@@ -355,7 +355,7 @@ void testCapitalizeHeaders() {
 		request.header("key-test2", "value3");
 		assertTrue(request.toString(false).contains("Key-Test2: value2, value3"), "Header key should have been modified");
 		assertEquals(2, request.headers("KEY-TEST2").size());
-		assertEquals(2 + 2, request.headerNames().size());		// 2 default and 2 added
+		assertEquals(1 + 2, request.headerNames().size());		// 2 default and 2 added
 
 		request.headerRemove("key-test2");
 		assertFalse(request.headers.contains("key-test2"));
@@ -375,7 +375,7 @@ void testCapitalizeHeaders() {
 		request.header("key-test1", "value4");
 		assertTrue(request.toString(false).contains("key-test1: VALUE1, value4"), "Header key should not have been modified");
 		assertEquals(2, request.headers("KEY-TEST1").size());
-		assertEquals(2 + 2, request.headerNames().size());		// 2 default and 2 added
+		assertEquals(1 + 2, request.headerNames().size());		// 2 default and 2 added
 
 		request.headerRemove("key-test1");
 		assertFalse(request.headers.contains("key-test1"));

src/test/java/jodd/http/RemoveHeaderTest.java

@@ -0,0 +1,45 @@
+package jodd.http;
+
+import org.junit.jupiter.api.Test;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
+class RemoveHeaderTest {
+
+	@Test
+	void testRemoveHeader() {
+		HttpRequest request = HttpRequest
+				.get("https://example.com")
+				.header("x-dummy-header", "remove me");
+
+		assertNotNull(request.header("x-dummy-header"));
+
+		request.headerRemove("x-dummy-header");
+
+		assertNull(request.header("x-dummy-header"));
+	}
+
+	@Test
+	void testRemoveHeaderUserAgent() throws IOException {
+		HttpRequest request = HttpRequest
+				.get("https://example.com")
+				.header("x-dummy-header", "remove me");
+
+		assertNull(request.header("User-Agent"));
+
+		request.headerRemove("User-Agent");
+
+		assertNull(request.header("User-Agent"));
+
+		ByteArrayOutputStream baos = new ByteArrayOutputStream();
+		request.sendTo(baos);
+		String out = baos.toString();
+
+		assertFalse(out.contains("User-Agent"));
+	}
+}