(url-http-chunked-encoding-after-change-function):

Remove superfluous CRLF at end of file.  (bug #42)

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index 69f5a5c295ae2d93bd059871b2fbdf96fd874168..531dce8e7280ba349583dc3694ca75ff66a1e63d 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2008-03-09  Magnus Henoch  <mange@freemail.hu>
+
+       * url-http.el (url-http-chunked-encoding-after-change-function):
+       Remove superfluous CRLF at end of file.  (bug #42)
+
 2008-03-02  Andreas Schwab  <schwab@suse.de>
 
        * url-util.el: Require cl when compiling.

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 7b29eba05efa31963456efce4089ab0cf5d114e6..c9cecea65c194ecba5ea5d9bb34b46114aa4ad4c 100644 (file)
--- 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)