Skip to content

Commit 410e595

Browse files
authored
Merge pull request #180 from chriskuehl/dont-use-multipart-for-fpb
Don't use multipart form for fpb cli
2 parents 9df4a09 + 2b75362 commit 410e595

File tree

1 file changed

+6
-11
lines changed

1 file changed

+6
-11
lines changed

cli/fpb/fpb.go

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import (
66
"encoding/json"
77
"fmt"
88
"io"
9-
"mime/multipart"
109
"net/http"
10+
"net/url"
1111
"os"
1212
"regexp"
1313
"runtime/debug"
@@ -105,9 +105,8 @@ Example usage:
105105
path = args[0]
106106
}
107107

108-
body := &bytes.Buffer{}
109-
writer := multipart.NewWriter(body)
110-
writer.WriteField("language", language)
108+
form := url.Values{}
109+
form.Set("language", language)
111110

112111
content := &bytes.Buffer{}
113112
if path == "-" {
@@ -135,17 +134,13 @@ Example usage:
135134
return fmt.Errorf("copying file: %w", err)
136135
}
137136
}
138-
writer.WriteField("text", content.String())
137+
form.Set("text", content.String())
139138

140-
if err := writer.Close(); err != nil {
141-
return fmt.Errorf("closing writer: %w", err)
142-
}
143-
144-
req, err := http.NewRequest("POST", server+"/paste?json", body)
139+
req, err := http.NewRequest("POST", server+"/paste?json", strings.NewReader(form.Encode()))
145140
if err != nil {
146141
return fmt.Errorf("creating request: %w", err)
147142
}
148-
req.Header.Set("Content-Type", writer.FormDataContentType())
143+
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
149144
if creds != nil {
150145
req.SetBasicAuth(creds.Username, creds.Password)
151146
}

0 commit comments

Comments
 (0)