Merge remote-tracking branch 'origin/master'

Author: blaubaer

build.gradle

@@ -3,7 +3,7 @@ import org.echocat.gradle.plugins.golang.utils.Executor
 import static org.echocat.gradle.plugins.golang.model.Platform.currentPlatform
 
 plugins {
-    id 'org.echocat.golang' version '0.1.11'
+    id 'org.echocat.golang' version '0.1.16'
 }
 
 group 'github.com/echocat/caddy-filter'
@@ -12,7 +12,7 @@ golang {
     // For testing only the current platform is required.
     platforms = currentPlatform()
     dependencies {
-        build 'github.com/mholt/caddy:v0.9.5'
+        build 'github.com/mholt/caddy:v0.10.4'
         test 'github.com/stretchr/testify'
         tool 'github.com/mattn/goveralls'
     }
@@ -23,6 +23,9 @@ golang {
         coverProfile = "${buildDir}/testing/${name}.cover"
         coverProfileHtml = "${buildDir}/testing/${name}.cover.html"
     }
+    toolchain {
+        goversion = 'go1.8'
+    }
 }
 
 task baseBuild(type: GolangTask, overwrite: true) {

filter.go

@@ -17,8 +17,8 @@ type filterHandler struct {
 }
 
 func (instance filterHandler) ServeHTTP(writer http.ResponseWriter, request *http.Request) (int, error) {
-	header := writer.Header()
 	wrapper := newResponseWriterWrapperFor(writer, func(wrapper *responseWriterWrapper) bool {
+		header := wrapper.Header()
 		for _, rule := range instance.rules {
 			if rule.matches(request, &header) {
 				return true
@@ -49,6 +49,7 @@ func (instance filterHandler) ServeHTTP(writer http.ResponseWriter, request *htt
 	if !wrapper.isBodyAllowed() {
 		return result, logError
 	}
+	header := wrapper.Header()
 	var body []byte
 	bodyRetrieved := false
 	for _, rule := range instance.rules {

responseWriterWrapper.go

@@ -10,15 +10,21 @@ import (
 )
 
 func newResponseWriterWrapperFor(delegate http.ResponseWriter, beforeFirstWrite func(*responseWriterWrapper) bool) *responseWriterWrapper {
-	return &responseWriterWrapper{
-		skipped:    false,
+	wrapper := &responseWriterWrapper{
+		skipped:             false,
 		delegate:            delegate,
 		beforeFirstWrite:    beforeFirstWrite,
 		statusSetAtDelegate: 0,
 		bodyAllowed:         true,
 		maximumBufferSize:   -1,
-		header:              delegate.Header(),
+		header:              http.Header{},
 	}
+	for key, values := range delegate.Header() {
+		for _, value := range values {
+			wrapper.header.Add(key, value)
+		}
+	}
+	return wrapper
 }
 
 type responseWriterWrapper struct {
@@ -136,7 +142,7 @@ func (instance *responseWriterWrapper) writeHeadersToDelegate(defStatus int) err
 	w := instance.delegate
 	for key, values := range instance.header {
 		for _, value := range values {
-			w.Header().Set(key, value)
+			w.Header().Add(key, value)
 		}
 	}
 	w.WriteHeader(instance.selectStatus(defStatus))

responseWriterWrapper_test.go

@@ -38,8 +38,8 @@ func (s *responseWriterWrapperTest) Test_Header(c *C) {
 
 	wrapper.Header().Del("a")
 	wrapper.Header().Add("c", "3")
-	c.Assert(original.header.Get("a"), Equals, "")
-	c.Assert(original.header.Get("c"), Equals, "3")
+	c.Assert(wrapper.Header().Get("a"), Equals, "")
+	c.Assert(wrapper.Header().Get("c"), Equals, "3")
 }
 
 func (s *responseWriterWrapperTest) Test_WriteHeader(c *C) {