From: Jarosław Rzeszótko <sztywny@gmail.com>
Date: Wed, 8 Jan 2014 18:29:16 +0000 (-0500)
Subject: * lisp/url/url-http.el (url-http-create-request): Don't add extra \r\n after
X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~18
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=e3e52a015712023324c80a78213d542ec69c5b53;p=emacs.git

* 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 707419b3b6d..89efc71acd9 100644
--- 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 bb11ec9473f..ac2e1403d03 100644
--- 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))