small changes

dmaicher · dmaicher · commit 708b15811e2e · 2015-06-16T21:47:10.000+02:00
diff --git a/README.md b/README.md
@@ -14,6 +14,7 @@ What is working?
 - [x] gzip content encoding
 - [x] support for HTTP 1.1 keep-alive
 - [ ] maybe introduce some kind of URL rewriting like apache and nginx offer?
+- [ ] support for conditional GET requests (If-Modified-Since header) and corresponding 304 responses
 - [ ] more tests
 
 So far it looks like the performance is not too bad in comparison with apache2 or nginx for example. Maybe at some point I will put together some benchmarks.
diff --git a/src/main/scala/server/Server.scala b/src/main/scala/server/Server.scala
@@ -17,12 +17,13 @@ object Server {
   def main (args: Array[String]) {
     val config = new ServerConfig
     config.port = 8080
+    config.maxWorkers = 75
 
     val server = new Server(config)
 
     server.registerHandler(
       new StaticFileHandler(new MimeTypeRegistry, new FileUtils, "/var/www/php"),
-      new LocationRequestMatcher("/(js|css|images|bundles)/".r)
+      new LocationRequestMatcher("/(js|css|images|bundles|static)/".r)
     )
 
     server.registerHandler(
diff --git a/src/main/scala/server/handler/FastCgi/FastCgiHandler.scala b/src/main/scala/server/handler/FastCgi/FastCgiHandler.scala
@@ -8,7 +8,8 @@ import server.http.request.Request
 import server.http.response.Response
 
 class FastCgiHandler(val documentRoot: String) extends Handler with LazyLogging {
-  val reader = new ResponseReader(new RecordReader, new HeaderParser)
+  private val reader = new ResponseReader(new RecordReader, new HeaderParser)
+
   override def handle(request: Request): Response = {
     val socket = new Socket("127.0.0.1", 9000)
     socket.setSoTimeout(30000)
@@ -27,7 +28,6 @@ class FastCgiHandler(val documentRoot: String) extends Handler with LazyLogging
     params.add("REQUEST_METHOD", request.method)
     params.add("SYMFONY_ENV", "dev")
     params.add("SYMFONY_DEBUG", "1")
-    //params.add("HTTP_CONNECTION", "keep-alive") //TODO
 
     for((k,v) <- request.headers.foldValues) {
       params.add("HTTP_"+k.toString.replace("-", "_").toUpperCase, v)
diff --git a/src/main/scala/server/http/response/ResponseWriter.scala b/src/main/scala/server/http/response/ResponseWriter.scala
@@ -55,11 +55,11 @@ class ResponseWriter(private val keepAlivePolicy: KeepAlivePolicy) {
     }
 
     if(keepAlive) {
-      response.headers += Headers.CONNECTION -> "Keep-Alive"
+      response.headers += Headers.CONNECTION -> "keep-alive"
       response.headers += Headers.KEEP_ALIVE -> keepAliveHeader
     }
     else {
-      response.headers += Headers.CONNECTION -> "Close"
+      response.headers += Headers.CONNECTION -> "close"
     }
 
     //http://tools.ietf.org/html/rfc6265#section-4.1
diff --git a/src/test/scala/server/http/response/ResponseWriterTestSpec.scala b/src/test/scala/server/http/response/ResponseWriterTestSpec.scala
@@ -60,7 +60,7 @@ class ResponseWriterTestSpec  extends FlatSpec with Matchers with MockFactory {
 
     writer.write(out, new Request(HttpMethod.GET, "/", HttpProtocol.HTTP_1_1), response, 0)
     val responseContent = new String(out.toByteArray, "UTF-8")
-    responseContent should be("HTTP/1.1 200 OK\r\nX-Foo: Bar1,Bar2\r\nSet-Cookie: Bar1\r\nSet-Cookie: Bar2\r\nConnection: Close\r\n\r\n")
+    responseContent should be("HTTP/1.1 200 OK\r\nX-Foo: Bar1,Bar2\r\nSet-Cookie: Bar1\r\nSet-Cookie: Bar2\r\nConnection: close\r\n\r\n")
     out.reset()
   }
 }

Original file line number	Diff line number	Diff line change
`@@ -55,11 +55,11 @@ class ResponseWriter(private val keepAlivePolicy: KeepAlivePolicy) {`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`if(keepAlive) {`
`58`		`- response.headers += Headers.CONNECTION -> "Keep-Alive"`
	`58`	`+ response.headers += Headers.CONNECTION -> "keep-alive"`
`59`	`59`	`response.headers += Headers.KEEP_ALIVE -> keepAliveHeader`
`60`	`60`	`}`
`61`	`61`	`else {`
`62`		`- response.headers += Headers.CONNECTION -> "Close"`
	`62`	`+ response.headers += Headers.CONNECTION -> "close"`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`//http://tools.ietf.org/html/rfc6265#section-4.1`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ class ResponseWriterTestSpec extends FlatSpec with Matchers with MockFactory {`
`60`	`60`
`61`	`61`	`writer.write(out, new Request(HttpMethod.GET, "/", HttpProtocol.HTTP_1_1), response, 0)`
`62`	`62`	`val responseContent = new String(out.toByteArray, "UTF-8")`
`63`		`- responseContent should be("HTTP/1.1 200 OK\r\nX-Foo: Bar1,Bar2\r\nSet-Cookie: Bar1\r\nSet-Cookie: Bar2\r\nConnection: Close\r\n\r\n")`
	`63`	`+ responseContent should be("HTTP/1.1 200 OK\r\nX-Foo: Bar1,Bar2\r\nSet-Cookie: Bar1\r\nSet-Cookie: Bar2\r\nConnection: close\r\n\r\n")`
`64`	`64`	`out.reset()`
`65`	`65`	`}`
`66`	`66`	`}`