[Yanel-commits] rev 22704 - public/yanel/trunk/src/core/java/org/wyona/yanel/servlet

[michi at wyona.com]

Author: michi
Date: 2007-02-16 00:04:10 +0100 (Fri, 16 Feb 2007)
New Revision: 22704

Modified:
   public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
Log:
header Content-Length implemented

Modified: public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java
===================================================================
--- public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-15 22:48:17 UTC (rev 22703)
+++ public/yanel/trunk/src/core/java/org/wyona/yanel/servlet/YanelServlet.java	2007-02-15 23:04:10 UTC (rev 22704)
@@ -441,6 +441,7 @@
 
         if (view != null) {
             // Check if the view contains the response, otherwise assume that the resource wrote the response, and just return.
+            // TODO: There seem like no header fields are being set (e.g. Content-Length, ...). Please see below ...
             if (!view.isResponse()) return;
             
             if (view.getEncoding() != null) {
@@ -485,13 +486,19 @@
                 if (ifModifiedSince != null) {
                     log.warn("TODO: Implement 304 ...");
                 }
+                if(lastModified >= 0) response.setDateHeader("Last-Modified", lastModified);
+                if(size > 0) {
+                    log.debug("Size of " + request.getRequestURI() + ": " + size);
+                    response.setContentLength((int) size);
+                } else {
+                    log.debug("No size for " + request.getRequestURI() + ": " + size);
+                }
 
                 java.io.OutputStream os = response.getOutputStream();
                 os.write(buffer, 0, bytesRead);
                 while ((bytesRead = is.read(buffer)) != -1) {
                     os.write(buffer, 0, bytesRead);
                 }
-                if(lastModified >= 0) response.setDateHeader("Last-Modified", lastModified);
                 return;
             } else {
                 String message = "InputStream of view is null!";