[Archive-access-cvs] SF.net SVN: archive-access:[3561] trunk/archive-access/projects/wayback/ wayback-core/src/main/java/org/archive/wayback/replay/ TransparentReplayRenderer.java

[<bra...@us...>]

Revision: 3561
          http://archive-access.svn.sourceforge.net/archive-access/?rev=3561&view=rev
Author:   bradtofel
Date:     2011-11-16 23:17:12 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
BUGFIX: if there were no headers, and no content, prevent Tomcat from making something up (transparently) by setting the Content-Length to 0

Modified Paths:
--------------
    trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java

Modified: trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java
===================================================================
--- trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java	2011-11-16 22:19:49 UTC (rev 3560)
+++ trunk/archive-access/projects/wayback/wayback-core/src/main/java/org/archive/wayback/replay/TransparentReplayRenderer.java	2011-11-16 23:17:12 UTC (rev 3561)
@@ -76,8 +76,16 @@
 		// and copy the raw byte-stream.
 		OutputStream os = httpResponse.getOutputStream();
 		byte[] buffer = new byte[BUFFER_SIZE];
+		long total = 0;
 		for (int r = -1; (r = resource.read(buffer, 0, BUFFER_SIZE)) != -1;) {
 			os.write(buffer, 0, r);
+			total += r;
 		}
+		if(total == 0) {
+			if(headers.size() == 0) {
+				// totally empty response
+				httpResponse.setContentLength(0);
+			}
+		}
 	}
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.