Re: Change branch for HTTP chunking bug?

[Chong Yidong]

Magnus Henoch <address@hidden> writes:

> I recently committed the attached patch to trunk, fixing bug #42,
> "Superfluous CR from HTTP chunked download":
> http://emacsbugs.donarmstrong.com/cgi-bin/bugreport.cgi?bug=42
>
> Should this be changed on the Emacs 22 branch as well?
>
> Magnus
>
> diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
> index 7b29eba..c9cecea 100644
> --- a/lisp/url/url-http.el
> +++ b/lisp/url/url-http.el
> @@ -948,7 +948,11 @@ the end of the document."
>                 (url-http-debug "Saw end of stream chunk!")
>                 (setq read-next-chunk nil)
>                 (url-display-percentage nil nil)
> -               (goto-char (match-end 1))
> +               ;; Every chunk, even the last 0-length one, is
> +               ;; terminated by CRLF.  Skip it.
> +               (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)
>                     (url-http-debug "Saw end of trailers..."))
>                 (if (url-http-parse-headers)

Looks OK.  Please check it into Emacs 22 (assuming it's been tested).