diff options
| author | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2015-12-29 21:39:08 -0800 |
| commit | ec0a80cc283badc7f7fd5ef78512dde6d34b1355 (patch) | |
| tree | 7190e0fb3d4aa06018d8cf997f06b806fb09a9c8 /lisp/url/url-http.el | |
| parent | d259328fb87db8cc67d52771efcfa653e52c5b71 (diff) | |
| parent | e823c34072bf045800d91e12c7ddb61fa23c6e30 (diff) | |
| download | emacs-25-merge.tar.gz | |
Merge emacs-25 into master (using imerge)emacs-25-merge
Diffstat (limited to 'lisp/url/url-http.el')
| -rw-r--r-- | lisp/url/url-http.el | 17 |
1 files changed, 3 insertions, 14 deletions
diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el index 258f8025662..36cc2f32bbc 100644 --- a/lisp/url/url-http.el +++ b/lisp/url/url-http.el @@ -136,17 +136,6 @@ request.") (507 insufficient-storage "Insufficient storage")) "The HTTP return codes and their text.") -(defcustom url-user-agent (format "User-Agent: %sURL/%s\r\n" - (if url-package-name - (concat url-package-name "/" - url-package-version " ") - "") url-version) - "User Agent used by the URL package." - :type '(choice (string :tag "A static User-Agent string") - (function :tag "Call a function to get the User-Agent string")) - :version "25.1" - :group 'url) - ;(eval-when-compile ;; These are all macros so that they are hidden from external sight ;; when the file is byte-compiled. @@ -433,7 +422,7 @@ Return the number of characters removed." (progn (widen) (goto-char (point-max)) - (insert "<hr>Sorry, but I do not know how to handle " type + (insert "<hr>Sorry, but I do not know how to handle " (or type auth url "") " authentication. If you'd like to write it," " please use M-x report-emacs-bug RET.<hr>") ;; We used to set a `status' var (declared "special") but I can't @@ -988,7 +977,7 @@ the callback to be triggered." (url-http-activate-callback))))) (defun url-http-chunked-encoding-after-change-function (st nd length) - "Function used when dealing with 'chunked' encoding. + "Function used when dealing with chunked encoding. Cannot give a sophisticated percentage, but we need a different function to look for the special 0-length chunk that signifies the end of the document." @@ -1069,7 +1058,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)))))))))) |