Rebase faster-boundary-find

2 files changed, 8 insertions, 3 deletions

diff --git a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
index d961e51..b35dc15 100644
--- a/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
+++ b/core/src/main/java/fi/iki/elonen/NanoHTTPD.java
@@ -533,7 +533,11 @@ public abstract class NanoHTTPD {
                 // followed by HTTP headers. Ignore version but parse headers.
                 // NOTE: this now forces header names lower case since they are
                 // case insensitive and vary by client.
-                if (!st.hasMoreTokens()) {
+                if (st.hasMoreTokens()) {
+                    if (!st.nextToken().equals("HTTP/1.1")) {
+                        throw new ResponseException(Response.Status.UNSUPPORTED_HTTP_VERSION, "Only HTTP/1.1 is supported.");
+                    }
+                } else {
                     NanoHTTPD.LOG.log(Level.FINE, "no protocol version specified, strange..");
                 }
                 String line = in.readLine();
@@ -1081,7 +1085,8 @@ public abstract class NanoHTTPD {
             NOT_FOUND(404, "Not Found"),
             METHOD_NOT_ALLOWED(405, "Method Not Allowed"),
             RANGE_NOT_SATISFIABLE(416, "Requested Range Not Satisfiable"),
-            INTERNAL_ERROR(500, "Internal Server Error");
+            INTERNAL_ERROR(500, "Internal Server Error"),
+            UNSUPPORTED_HTTP_VERSION(505, "HTTP Version Not Supported");
 
             private final int requestStatus;
 
diff --git a/core/src/test/java/fi/iki/elonen/HttpChunkedResponseTest.java b/core/src/test/java/fi/iki/elonen/HttpChunkedResponseTest.java
index b3113fd..5d06ae4 100644
--- a/core/src/test/java/fi/iki/elonen/HttpChunkedResponseTest.java
+++ b/core/src/test/java/fi/iki/elonen/HttpChunkedResponseTest.java
@@ -89,7 +89,7 @@ public class HttpChunkedResponseTest extends HttpServerTest {
         }.newChunkedResponse(OK, "what/ever", pipedInputStream);
         this.testServer.response.setChunkedTransfer(true);
 
-        ByteArrayOutputStream byteArrayOutputStream = invokeServer("GET / HTTP/1.0");
+        ByteArrayOutputStream byteArrayOutputStream = invokeServer("GET / HTTP/1.1");
 
         assertResponse(byteArrayOutputStream, expected);
     }