Merge pull request playframework#482 from sammiq/lighthouse-1464-patch

[playframework#1464] http.exposePlayServer setting not checked on 404
sberan · May 10, 2012 · dceeeac · dceeeac
2 parents 6084047 + 889783d
commit dceeeac
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/framework/src/play/server/PlayHandler.java b/framework/src/play/server/PlayHandler.java
@@ -635,7 +635,9 @@ public static void serve404(NotFound e, ChannelHandlerContext ctx, Request reque
             Logger.trace("serve404: begin");
         }
         HttpResponse nettyResponse = new DefaultHttpResponse(HttpVersion.HTTP_1_1, HttpResponseStatus.NOT_FOUND);
-        nettyResponse.setHeader(SERVER, signature);
+        if (exposePlayServer) {
+            nettyResponse.setHeader(SERVER, signature);
+        }
 
         nettyResponse.setHeader(CONTENT_TYPE, "text/html");
         Map<String, Object> binding = getBindingForErrors(e, false);