* lisp/url/url-http.el (url-http-create-request): Don't add extra \r\n after

http data.

Fixes: debbugs:16220

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 707419b3b6d229006b6349d1dccb0c40b1b0a79e..89efc71acd9d2a5673ccea937fd5a403102c45ae 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-08  Jarosław Rzeszótko  <sztywny@gmail.com>
+
+       * url-http.el (url-http-create-request): Don't add extra \r\n after
+       http data (bug#16220).
+
 2013-12-28  Glenn Morris  <rgm@gnu.org>
 
        * url-history.el (url-history-track):

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index bb11ec9473faa0a721b5d057e12bddeb2435202b..ac2e1403d03fe59940618c2d030253044f323f5f 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -356,9 +356,7 @@ request.")
              ;; End request
              "\r\n"
              ;; Any data
-             url-http-data
-            ;; If `url-http-data' is nil, avoid two CRLFs (Bug#8931).
-            (if url-http-data "\r\n")))
+             url-http-data))
            ""))
     (url-http-debug "Request is: \n%s" request)
     request))