summaryrefslogtreecommitdiff
path: root/lisp/url
diff options
context:
space:
mode:
authorJarosław Rzeszótko <sztywny@gmail.com>2014-01-08 13:29:16 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2014-01-08 13:29:16 -0500
commite3e52a015712023324c80a78213d542ec69c5b53 (patch)
treeb07835a9409b03f9ecc5163411d71747ca928530 /lisp/url
parent2167f25d0fb342b9a2c648127208fd9c18f88ee3 (diff)
downloademacs-e3e52a015712023324c80a78213d542ec69c5b53.tar.gz
* lisp/url/url-http.el (url-http-create-request): Don't add extra \r\n after
http data. Fixes: debbugs:16220
Diffstat (limited to 'lisp/url')
-rw-r--r--lisp/url/ChangeLog5
-rw-r--r--lisp/url/url-http.el4
2 files changed, 6 insertions, 3 deletions
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))