In order to make the compress work with the go server engine, it needed to prevent the results from setting the header and triggering a write. Also in the adapter we cannot use the http.ServerContent method if the output stream is using the compressor.

notzippy · notzippy · commit 0019da77819e · 2017-04-05T21:21:26.000-07:00
diff --git a/compress.go b/compress.go
@@ -41,6 +41,7 @@ type WriteFlusher interface {
 
 type CompressResponseWriter struct {
 	Header          ServerHeader
+	ControllerResponse *Response
 	OriginalWriter  io.Writer
 	compressWriter  WriteFlusher
 	compressionType string
@@ -56,11 +57,13 @@ func CompressFilter(c *Controller, fc []Filter) {
 	if Config.BoolDefault("results.compressed", false) {
 		if c.Response.Status != http.StatusNoContent && c.Response.Status != http.StatusNotModified {
 			if found, compressType, compressWriter := detectCompressionType(c.Request, c.Response); found {
-				writer := CompressResponseWriter{c.Response.Out.Header(), c.Response.Out.GetWriter(), compressWriter, compressType, false, make(chan bool, 1), nil, false}
+				writer := CompressResponseWriter{c.Response.Out.Header(), c.Response, c.Response.Out.GetWriter(), compressWriter, compressType, false, make(chan bool, 1), nil, false}
 				if w, ok := c.Response.Out.(http.CloseNotifier); ok {
 					writer.parentNotify = w.CloseNotify()
 				}
 				c.Response.Out.SetWriter(&writer)
+                // Block the results from writing there own header
+                c.Response.headerWritten = true
 			}
 		} else {
 			TRACE.Printf("Compression disabled for response status (%d)", c.Response.Status)
@@ -108,8 +111,10 @@ func (c *CompressResponseWriter) WriteHeader(status int) {
 
 func (c *CompressResponseWriter) Close() error {
 	if c.compressionType != "" {
+        c.Header.Del("Content-Length")
 		if err := c.compressWriter.Close(); err != nil {
-			ERROR.Println("Error closing compress writer", err)
+            // TODO When writing directly to stream
+			ERROR.Println("Error closing compress writer",c.compressionType, err)
 		}
 	}
 	// Non-blocking write to the closenotifier, if we for some reason should
diff --git a/engine_adapter_go.go b/engine_adapter_go.go
@@ -223,9 +223,12 @@ func (r *GOResponse) SetWriter(writer io.Writer) {
 }
 func (r *GOResponse) WriteStream(name string, contentlen int64, modtime time.Time,reader io.Reader) error {
 
-    if rs, ok := reader.(io.ReadSeeker); ok {
-        // Call ServeContent to serve the content
-        http.ServeContent(r.Original, r.Request, name, modtime, rs)
+    // Check to see if the output stream is modified, if not send it using the
+    // Native writer
+    if _,ok:=r.Writer.(http.ResponseWriter);ok {
+        if rs, ok := reader.(io.ReadSeeker); ok {
+            http.ServeContent(r.Original, r.Request, name, modtime, rs)
+        }
     } else {
         // Else, do a simple io.Copy.
         ius := r.Request.Header.Get("If-Unmodified-Since")
diff --git a/results.go b/results.go
@@ -214,7 +214,9 @@ func (r *RenderTemplateResult) Apply(req *Request, resp *Response) {
 	}
 
 	if !chunked {
-		resp.Out.Header().Set("Content-Length", strconv.Itoa(b.Len()))
+        if !resp.headerWritten {
+            resp.Out.Header().Set("ContentBeater-Length", strconv.Itoa(b.Len()))
+        }
 	}
 	resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")
 	if _, err := b.WriteTo(out); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -214,7 +214,9 @@ func (r RenderTemplateResult) Apply(req Request, resp *Response) {`
`214`	`214`	`}`
`215`	`215`
`216`	`216`	`if !chunked {`
`217`		`- resp.Out.Header().Set("Content-Length", strconv.Itoa(b.Len()))`
	`217`	`+ if !resp.headerWritten {`
	`218`	`+ resp.Out.Header().Set("ContentBeater-Length", strconv.Itoa(b.Len()))`
	`219`	`+ }`
`218`	`220`	`}`
`219`	`221`	`resp.WriteHeader(http.StatusOK, "text/html; charset=utf-8")`
`220`	`222`	`if _, err := b.WriteTo(out); err != nil {`