bug#16345: 24.3; url-http sometimes closes connection prematurely

[James Stout <james.wolf.stout@gmail.com>]

[-- Attachment #1.1: Type: text/plain, Size: 756 bytes --]

This is the first Emacs patch I've ever sent; let me know if I'm doing it
wrong.

On Mon, Dec 28, 2015 at 9:49 AM, Lars Ingebrigtsen <larsi@gnus.org> wrote:

> James Stout <james.wolf.stout@gmail.com> writes:
>
> > I'm suggesting the following change:
> >
> > Before: (if (re-search-forward "^\r*$" nil t) (url-http-debug "Saw end of
> > trailers..."))
> > After: (if (re-search-forward "^\r?\n" nil t) (url-http-debug "Saw end of
> > trailers..."))
> >
> > This is based purely on my reading of the spec; this wasn't actually a
> problem
> > I ran into (and it's just going to affect a debug message).
>
> Can you send a patch for the change?
>
> --
> (domestic pets only, the antidote for overdose, milk.)
>    bloggy blog: http://lars.ingebrigtsen.no
>

[-- Attachment #1.2: Type: text/html, Size: 1383 bytes --]

[-- Attachment #2: 0001-Fixed-regular-expression-for-end-of-HTTP-trailers-to.patch --]
[-- Type: application/octet-stream, Size: 891 bytes --]

From ab2c4b31a6619dd0dbdcaab55e32e2b6a80826b4 Mon Sep 17 00:00:00 2001
From: James Stout <james.wolf.stout@gmail.com>
Date: Mon, 28 Dec 2015 10:47:31 -0800
Subject: [PATCH] Fixed regular expression for end of HTTP trailers to match
 spec.

---
 lisp/url/url-http.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 916f263..e5c2c3a 100644
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -1067,7 +1067,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))))))))))
-- 
2.6.2