Content Length for HEAD

arden · Jul 24, 2010 · b3d104b · b3d104b
1 parent 757dab3
commit b3d104b
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/src/play/modules/netty/PlayHandler.java b/src/play/modules/netty/PlayHandler.java
@@ -273,8 +273,8 @@ protected static void writeResponse(ChannelHandlerContext ctx, Response response
 
         if (keepAlive) {
             // Add 'Content-Length' header only for a keep-alive connection.
-            Logger.trace("writeResponse: content length [" + content.length + "]");
-            setContentLength(nettyResponse, content.length);
+            Logger.trace("writeResponse: content length [" + response.out.size() + "]");
+            setContentLength(nettyResponse, response.out.size());
         }
 
         ChannelFuture f = ctx.getChannel().write(nettyResponse);
@@ -754,7 +754,9 @@ private static HttpResponse addEtag(HttpRequest nettyRequest, HttpResponse httpR
         long last = file.lastModified();
         final String etag = "\"" + last + "-" + file.hashCode() + "\"";
         if (!isModified(etag, last, nettyRequest)) {
-            httpResponse.setStatus(HttpResponseStatus.NOT_MODIFIED);
+            if (nettyRequest.getMethod().equals(HttpMethod.GET)) {
+                httpResponse.setStatus(HttpResponseStatus.NOT_MODIFIED);
+            }
             if (useEtag) {
                 httpResponse.setHeader(ETAG, etag);
             }