From: James Stout <james.wolf.stout@gmail.com>
Date: Mon, 28 Dec 2015 19:49:57 +0000 (+0100)
Subject: Make chunked encoding trailer detection more compliant
X-Git-Tag: emacs-25.0.90~339
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=57029f3d84232584ae43791f7b8d8804d516eadd;p=emacs.git

Make chunked encoding trailer detection more compliant

* lisp/url/url-http.el
(url-http-chunked-encoding-after-change-function): Make
trailer detection more compliant (bug#16345).

Copyright-paperwork-exempt: yes
---

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index b65affee7d4..c5b6ef3980a 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1056,7 +1056,7 @@ the end of the document."
 		  (when (looking-at "\r?\n")
 		    (url-http-debug "Removing terminator of last chunk")
 		    (delete-region (match-beginning 0) (match-end 0)))
-		  (if (re-search-forward "^\r*$" nil t)
+		  (if (re-search-forward "^\r?\n" nil t)
 		      (url-http-debug "Saw end of trailers..."))
 		  (if (url-http-parse-headers)
 		      (url-http-activate-callback))))))))))