Merge branch 'pr/422'

Author: dakrone

changelog.org

@@ -19,6 +19,8 @@ List of user-visible changes that have gone into each release
   context
 - Merged https://github.com/dakrone/clj-http/pull/424 to add :mime-subtype request parameter to
   override mime subtype
+- create-multipart-entity with three arguments arity lets the selection of =HttpMultipartMode=
+- new request key :http-multipart-mode which is HttpMultipartMode/STRICT by default
 
 ** 3.8.0
 - Reintroduce the =:save-request= and =:debug-body= options

src/clj_http/core.clj

@@ -39,7 +39,8 @@
                                             HttpAsyncClients
                                             CloseableHttpAsyncClient)
            (org.apache.http.message BasicHttpResponse)
-           (java.util.concurrent ExecutionException)))
+           (java.util.concurrent ExecutionException)
+           (org.apache.http.entity.mime HttpMultipartMode)))
 
 (defn parse-headers
   "Takes a HeaderIterator and returns a map of names to values.
@@ -376,9 +377,9 @@
   ([req] (request req nil nil))
   ([{:keys [body conn-timeout conn-request-timeout connection-manager
             cookie-store cookie-policy headers multipart mime-subtype
-            query-string redirect-strategy max-redirects retry-handler
-            request-method scheme server-name server-port socket-timeout
-            uri response-interceptor proxy-host proxy-port async?
+            http-multipart-mode query-string redirect-strategy max-redirects
+            retry-handler request-method scheme server-name server-port
+            socket-timeout uri response-interceptor proxy-host proxy-port async?
             http-client-context http-request-config
             proxy-ignore-hosts proxy-user proxy-pass digest-auth ntlm-auth]
      :as req} respond raise]
@@ -423,7 +424,7 @@
             (.setCredentials authscope creds)))))
      (if multipart
        (.setEntity ^HttpEntityEnclosingRequest http-req
-                   (mp/create-multipart-entity multipart mime-subtype))
+                   (mp/create-multipart-entity multipart mime-subtype http-multipart-mode))
        (when (and body (instance? HttpEntityEnclosingRequest http-req))
          (if (instance? HttpEntity body)
            (.setEntity ^HttpEntityEnclosingRequest http-req body)

src/clj_http/multipart.clj

@@ -126,13 +126,17 @@
   content)
 
 (defn create-multipart-entity
-  "Takes a multipart vector of maps and creates a MultipartEntity with each
-  map added as a part, depending on the type of content."
-  [multipart mime-subtype]
+  "Takes a multipart vector of maps and creates a MultipartEntity with each map
+  added as a part, depending on the type of content. If a mime-subtype or
+  multipart-mode are specified, they are set on the multipart builder, otherwise
+  'form-data' and strict mode are used."
+  [multipart mime-subtype multipart-mode]
   (let [mp-entity (doto (MultipartEntityBuilder/create)
-                    (.setStrictMode)
                     (.setCharset (encoding-to-charset "UTF-8"))
                     (.setMimeSubtype (or mime-subtype "form-data")))]
+    (if multipart-mode
+      (.setMode mp-entity multipart-mode)
+      (.setStrictMode mp-entity))
     (doseq [m multipart]
       (let [name (or (:part-name m) (:name m))
             part (make-multipart-body m)]