[nongnu] elpa/request 0d15faa5cd 4/6: clarify content-type logic

[ELPA Syncer]

branch: elpa/request
commit 0d15faa5cd3a2ff64efb6509bc7885c7d95a3b4c
Author: dickmao <none>
Commit: dickmao <none>

    clarify content-type logic
---
 request.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/request.el b/request.el
index e2d7952eb5..54e0e60dc2 100644
--- a/request.el
+++ b/request.el
@@ -334,6 +334,7 @@ Example::
                        &key
                        (params nil)
                        (data nil)
+                       (headers nil)
                        (encoding 'utf-8)
                        (error nil)
                        (sync nil)
@@ -498,8 +499,8 @@ and requests.request_ (Python).
                      "request-default-error-callback: %s %s"
                      url symbol-status))))
     (setq settings (plist-put settings :error error)))
-  (unless (or (stringp data)
-              (null data))
+  (when (and (consp data)
+             (not (assoc-string "Content-Type" headers t)))
     (setq data (request--urlencode-alist data))
     (setq settings (plist-put settings :data data)))
   (when params
@@ -692,7 +693,7 @@ associated process is exited."
   (when files
     (error "`url-retrieve' backend does not support FILES"))
   (when (and (equal type "POST")
-             data
+             (consp data)
              (not (assoc-string "Content-Type" headers t)))
     (push '("Content-Type" . "application/x-www-form-urlencoded") headers)
     (setq settings (plist-put settings :headers headers)))