Skip to content
This repository has been archived by the owner on Mar 1, 2023. It is now read-only.

Commit

Permalink
#33 Remove duplicated headers (#43)
Browse files Browse the repository at this point in the history
  • Loading branch information
blaubaer authored May 31, 2019
1 parent 60ce2ee commit ff88a0f
Showing 1 changed file with 16 additions and 6 deletions.
22 changes: 16 additions & 6 deletions responseWriterWrapper.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,12 @@ func newResponseWriterWrapperFor(delegate http.ResponseWriter, beforeFirstWrite
header: http.Header{},
}
for key, values := range delegate.Header() {
for _, value := range values {
wrapper.header.Add(key, value)
for i, value := range values {
if i == 0 {
wrapper.header.Set(key, value)
} else {
wrapper.header.Add(key, value)
}
}
}
return wrapper
Expand Down Expand Up @@ -79,7 +83,9 @@ func (instance *responseWriterWrapper) Write(content []byte) (int, error) {
}

if instance.buffer == nil {
instance.writeHeadersToDelegate(200)
if err := instance.writeHeadersToDelegate(200); err != nil {
return 0, err
}
return instance.delegate.Write(content)
}

Expand Down Expand Up @@ -140,13 +146,17 @@ func (instance *responseWriterWrapper) writeToDelegateAndEncodeIfRequired(conten

func (instance *responseWriterWrapper) writeHeadersToDelegate(defStatus int) error {
if instance.headerSetAtDelegate {
return errors.New("Headers already set at response.")
return errors.New("headers already set at response")
}
instance.headerSetAtDelegate = true
w := instance.delegate
for key, values := range instance.header {
for _, value := range values {
w.Header().Add(key, value)
for i, value := range values {
if i == 0 {
w.Header().Set(key, value)
} else {
w.Header().Add(key, value)
}
}
}
w.WriteHeader(instance.selectStatus(defStatus))
Expand Down

0 comments on commit ff88a0f

Please sign in to comment.