Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

'Set' headers instead of 'Add' to prevent duplicate header fields #1

Merged
merged 1 commit into from
May 20, 2015
Merged

'Set' headers instead of 'Add' to prevent duplicate header fields #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions api/v1.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,8 +152,8 @@ func (apiv1 *APIv1) download(w http.ResponseWriter, req *http.Request) {

apiv1.defaultOptions(w, req)

w.Header().Add("Content-Type", "message/rfc822")
w.Header().Add("Content-Disposition", "attachment; filename=\""+id+".eml\"")
w.Header().Set("Content-Type", "message/rfc822")
w.Header().Set("Content-Disposition", "attachment; filename=\""+id+".eml\"")

switch apiv1.config.Storage.(type) {
case *storage.MongoDB:
Expand Down Expand Up @@ -185,17 +185,25 @@ func (apiv1 *APIv1) download_part(w http.ResponseWriter, req *http.Request) {
// TODO extension from content-type?
apiv1.defaultOptions(w, req)

w.Header().Add("Content-Disposition", "attachment; filename=\""+id+"-part-"+part+"\"")
w.Header().Set("Content-Disposition", "attachment; filename=\""+id+"-part-"+part+"\"")

message, _ := apiv1.config.Storage.Load(id)
contentTransferEncoding := ""
pid, _ := strconv.Atoi(part)
for h, l := range message.MIME.Parts[pid].Headers {
for _, v := range l {
if strings.ToLower(h) == "content-transfer-encoding" && contentTransferEncoding == "" {
contentTransferEncoding = v
switch strings.ToLower(h) {
case "content-disposition":
// Prevent duplicate "content-disposition"
w.Header().Set(h, v)
case "content-transfer-encoding":
if contentTransferEncoding == "" {
contentTransferEncoding = v
}
fallthrough
default:
w.Header().Add(h, v)
}
w.Header().Add(h, v)
}
}
body := []byte(message.MIME.Parts[pid].Body)
Expand Down