Merge pull request #546 from wing9405/master

LordFokas · web-flow · commit efb2ebf85a2b · 2019-07-03T19:16:33.000+01:00
removed remoteHostName from HTTPSession: it can take too long time to…
diff --git a/core/src/main/java/org/nanohttpd/protocols/http/HTTPSession.java b/core/src/main/java/org/nanohttpd/protocols/http/HTTPSession.java
@@ -72,7 +72,7 @@
 import org.nanohttpd.protocols.http.tempfiles.ITempFileManager;
 
 public class HTTPSession implements IHTTPSession {
-    
+
     public static final String POST_DATA = "postData";
 
     private static final int REQUEST_BUFFER_LEN = 512;
@@ -109,8 +109,6 @@ public class HTTPSession implements IHTTPSession {
 
     private String remoteIp;
 
-    private String remoteHostname;
-
     private String protocolVersion;
 
     public HTTPSession(NanoHTTPD httpd, ITempFileManager tempFileManager, InputStream inputStream, OutputStream outputStream) {
@@ -126,7 +124,6 @@ public HTTPSession(NanoHTTPD httpd, ITempFileManager tempFileManager, InputStrea
         this.inputStream = new BufferedInputStream(inputStream, HTTPSession.BUFSIZE);
         this.outputStream = outputStream;
         this.remoteIp = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "127.0.0.1" : inetAddress.getHostAddress().toString();
-        this.remoteHostname = inetAddress.isLoopbackAddress() || inetAddress.isAnyLocalAddress() ? "localhost" : inetAddress.getHostName().toString();
         this.headers = new HashMap<String, String>();
     }
 
@@ -698,9 +695,4 @@ private String saveTmpFile(ByteBuffer b, int offset, int len, String filename_hi
     public String getRemoteIpAddress() {
         return this.remoteIp;
     }
-
-    @Override
-    public String getRemoteHostName() {
-        return this.remoteHostname;
-    }
 }
diff --git a/core/src/main/java/org/nanohttpd/protocols/http/IHTTPSession.java b/core/src/main/java/org/nanohttpd/protocols/http/IHTTPSession.java
@@ -90,11 +90,4 @@ public interface IHTTPSession {
      * @return the IP address.
      */
     String getRemoteIpAddress();
-
-    /**
-     * Get the remote hostname of the requester.
-     * 
-     * @return the hostname.
-     */
-    String getRemoteHostName();
 }
diff --git a/core/src/test/java/org/nanohttpd/junit/protocols/http/HttpSessionHeadersTest.java b/core/src/test/java/org/nanohttpd/junit/protocols/http/HttpSessionHeadersTest.java
@@ -60,7 +60,6 @@ public void testHeadersRemoteIp() throws Exception {
         for (String ipAddress : ipAddresses) {
             InetAddress inetAddress = InetAddress.getByName(ipAddress);
             HTTPSession session = this.testServer.createSession(HttpSessionHeadersTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);
-            assertNotNull(ipAddress, session.getRemoteHostName());
             assertEquals(ipAddress, session.getRemoteIpAddress());
         }
     }
diff --git a/core/src/test/java/org/nanohttpd/junit/protocols/http/HttpSessionTest.java b/core/src/test/java/org/nanohttpd/junit/protocols/http/HttpSessionTest.java
@@ -49,24 +49,6 @@ public class HttpSessionTest extends HttpServerTest {
 
     private static final TestTempFileManager TEST_TEMP_FILE_MANAGER = new TestTempFileManager();
 
-    @Test
-    public void testSessionRemoteHostnameLocalhost() throws UnknownHostException {
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(HttpSessionTest.DUMMY_REQUEST_CONTENT.getBytes());
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        InetAddress inetAddress = InetAddress.getByName("127.0.0.1");
-        HTTPSession session = this.testServer.createSession(HttpSessionTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);
-        assertEquals("localhost", session.getRemoteHostName());
-    }
-
-    @Test
-    public void testSessionRemoteHostname() throws UnknownHostException {
-        ByteArrayInputStream inputStream = new ByteArrayInputStream(HttpSessionTest.DUMMY_REQUEST_CONTENT.getBytes());
-        ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
-        InetAddress inetAddress = InetAddress.getByName("google.com");
-        HTTPSession session = this.testServer.createSession(HttpSessionTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);
-        assertEquals("google.com", session.getRemoteHostName());
-    }
-
     @Test
     public void testSessionRemoteIPAddress() throws UnknownHostException {
         ByteArrayInputStream inputStream = new ByteArrayInputStream(HttpSessionTest.DUMMY_REQUEST_CONTENT.getBytes());

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,6 @@ public void testHeadersRemoteIp() throws Exception {`
`60`	`60`	`for (String ipAddress : ipAddresses) {`
`61`	`61`	`InetAddress inetAddress = InetAddress.getByName(ipAddress);`
`62`	`62`	`HTTPSession session = this.testServer.createSession(HttpSessionHeadersTest.TEST_TEMP_FILE_MANAGER, inputStream, outputStream, inetAddress);`
`63`		`- assertNotNull(ipAddress, session.getRemoteHostName());`
`64`	`63`	`assertEquals(ipAddress, session.getRemoteIpAddress());`
`65`	`64`	`}`
`66`	`65`	`}`