From: Christopher J. White <chris@grierwhite.com>
Date: Sat, 24 Sep 2011 22:58:40 +0000 (-0400)
Subject: * url-http.el (url-http-create-request): Avoid adding extra CRLF (Bug#8931).
X-Git-Tag: emacs-pretest-24.0.90~12
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b02ba905b4a8b0b95b858639db8bd6632a9fe57f;p=emacs.git

* url-http.el (url-http-create-request): Avoid adding extra CRLF (Bug#8931).
---

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 8ad0a8ee43f..fbc267df44a 100644
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2011-09-24  Christopher J. White  <chris@grierwhite.com>  (tiny change)
+
+	* url-http.el (url-http-create-request): Avoid adding extra CRLF
+	(Bug#8931).
+
 2011-09-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
 	* url-http.el (url-http-find-free-connection): If there was an
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 0ba3aa2c5fe..557ef33919c 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -342,7 +342,9 @@ request.")
              ;; End request
              "\r\n"
              ;; Any data
-             url-http-data))
+             url-http-data
+	     ;; If `url-http-data' is nil, avoid two CRLFs (Bug#8931).
+	     (if url-http-data "\r\n")))
            ""))
     (url-http-debug "Request is: \n%s" request)
     request))