admin/NanoHttpd-nanohttpd
1
0
Fork 0
mirror of https://github.com/NanoHttpd/nanohttpd synced 2026-06-08 11:57:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #546 from wing9405/master

Browse Source 
removed remoteHostName from HTTPSession: it can take too long time to…
This commit is contained in:
LordFokas
2019-07-03 19:16:33 +01:00
committed by GitHub
parent b04a342a4b cd37235110
commit efb2ebf85a
4 changed files with 1 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/org/nanohttpd/protocols/http/HTTPSession.java
+1 -9
View File
@@ -72,7 +72,7 @@ import org.nanohttpd.protocols.http.tempfiles.ITempFile;
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 class HTTPSession implements IHTTPSession {
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 @@ public class HTTPSession implements IHTTPSession {
public String getRemoteIpAddress() {
return this.remoteIp;
}
@Override
public String getRemoteHostName() {
return this.remoteHostname;
}
}
core/src/main/java/org/nanohttpd/protocols/http/IHTTPSession.java
-7
View File
@@ -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();
}
core/src/test/java/org/nanohttpd/junit/protocols/http/HttpSessionHeadersTest.java
-1
View File
@@ -60,7 +60,6 @@ public class HttpSessionHeadersTest extends HttpServerTest {
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());
}
}
core/src/test/java/org/nanohttpd/junit/protocols/http/HttpSessionTest.java
-18
View File
@@ -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());