comparison lisp/url/url-http.el @ 73600:fe1f7fc1d1d6

(url-http-create-request): Use buffer-locale equivalents of dynamically bound variables.

73599:65d9fbabd719

	      (concat " (" (or url-system-type url-os-type) ")"))
	     (t "")))))

(defun url-http-create-request (url &optional ref-url)
  "Create an HTTP request for URL, referred to by REF-URL."
  (declare (special proxy-object proxy-info))
  (let* ((extra-headers)
	 (request nil)
	 (no-cache (cdr-safe (assoc "Pragma" url-request-extra-headers)))
	 (proxy-obj (and (boundp 'proxy-object) proxy-object))
	 (proxy-auth (if (or (cdr-safe (assoc "Proxy-Authorization"
					      url-request-extra-headers))
			     (not proxy-obj))
			 nil
		       (let ((url-basic-auth-storage
			      'url-http-proxy-basic-auth-storage))
			 (url-get-authentication url nil 'any nil))))
	 (real-fname (concat (url-filename (or proxy-obj url))
			     (url-recreate-url-attributes (or proxy-obj url))))
	 (host (url-host (or proxy-obj url)))
	 (auth (if (cdr-safe (assoc "Authorization" url-request-extra-headers))
		   nil
		 (url-get-authentication (or
					  (and (boundp 'proxy-info)
					       proxy-info)
					  url) nil 'any nil))))

    (if (or (memq url-privacy-level '(low high paranoid))
	    (and (listp url-privacy-level)
		 (memq 'lastloc url-privacy-level)))
	(setq ref-url nil))

    ;; url-request-extra-headers contains an assoc-list of
    ;; header/value pairs that we need to put into the request.
    (setq extra-headers (mapconcat
			 (lambda (x)
			   (concat (car x) ": " (cdr x)))
			 url-request-extra-headers "\r\n"))
    (if (not (equal extra-headers ""))
	(setq extra-headers (concat extra-headers "\r\n")))

    ;; This was done with a call to `format'.  Concatting parts has
    ;; the advantage of keeping the parts of each header together and

           ;; of the strings contains a multibyte char.
           'string-as-unibyte
           (delq nil
            (list
             ;; The request
             (or url-request-method "GET") " "
             (if proxy-obj (url-recreate-url proxy-obj) real-fname)
             " HTTP/" url-http-version "\r\n"
             ;; Version of MIME we speak
             "MIME-Version: 1.0\r\n"
             ;; (maybe) Try to keep the connection open

             ;; Cookies
             (url-cookie-generate-header-lines host real-fname
                                               (equal "https" (url-type url)))
             ;; If-modified-since
             (if (and (not no-cache)
                      (member url-request-method '("GET" nil)))
                 (let ((tm (url-is-cached (or proxy-obj url))))
                   (if tm
                       (concat "If-modified-since: "
                               (url-get-normalized-date tm) "\r\n"))))
             ;; Whence we came
             (if ref-url (concat
                          "Referer: " ref-url "\r\n"))
             extra-headers
             ;; Length of data
             (if url-request-data
                 (concat
                  "Content-length: " (number-to-string
                                      (length url-request-data))
                  "\r\n"))
             ;; End request
             "\r\n"
             ;; Any data
             url-request-data))
           ""))
    (url-http-debug "Request is: \n%s" request)
    request))

;; Parsing routines

73600:fe1f7fc1d1d6

	      (concat " (" (or url-system-type url-os-type) ")"))
	     (t "")))))

(defun url-http-create-request (url &optional ref-url)
  "Create an HTTP request for URL, referred to by REF-URL."
  (declare (special proxy-object proxy-info 
		    url-http-method url-http-data
		    url-http-extra-headers))
  (let* ((extra-headers)
	 (request nil)
	 (no-cache (cdr-safe (assoc "Pragma" url-http-extra-headers)))
	 (proxy-obj (and (boundp 'proxy-object) proxy-object))
	 (proxy-auth (if (or (cdr-safe (assoc "Proxy-Authorization"
					      url-http-extra-headers))
			     (not proxy-obj))
			 nil
		       (let ((url-basic-auth-storage
			      'url-http-proxy-basic-auth-storage))
			 (url-get-authentication url nil 'any nil))))
	 (real-fname (concat (url-filename (or proxy-obj url))
			     (url-recreate-url-attributes (or proxy-obj url))))
	 (host (url-host (or proxy-obj url)))
	 (auth (if (cdr-safe (assoc "Authorization" url-http-extra-headers))
		   nil
		 (url-get-authentication (or
					  (and (boundp 'proxy-info)
					       proxy-info)
					  url) nil 'any nil))))

    (if (or (memq url-privacy-level '(low high paranoid))
	    (and (listp url-privacy-level)
		 (memq 'lastloc url-privacy-level)))
	(setq ref-url nil))

    ;; url-http-extra-headers contains an assoc-list of
    ;; header/value pairs that we need to put into the request.
    (setq extra-headers (mapconcat
			 (lambda (x)
			   (concat (car x) ": " (cdr x)))
			 url-http-extra-headers "\r\n"))
    (if (not (equal extra-headers ""))
	(setq extra-headers (concat extra-headers "\r\n")))

    ;; This was done with a call to `format'.  Concatting parts has
    ;; the advantage of keeping the parts of each header together and

           ;; of the strings contains a multibyte char.
           'string-as-unibyte
           (delq nil
            (list
             ;; The request
             (or url-http-method "GET") " "
             (if proxy-obj (url-recreate-url proxy-obj) real-fname)
             " HTTP/" url-http-version "\r\n"
             ;; Version of MIME we speak
             "MIME-Version: 1.0\r\n"
             ;; (maybe) Try to keep the connection open

             ;; Cookies
             (url-cookie-generate-header-lines host real-fname
                                               (equal "https" (url-type url)))
             ;; If-modified-since
             (if (and (not no-cache)
                      (member url-http-method '("GET" nil)))
                 (let ((tm (url-is-cached (or proxy-obj url))))
                   (if tm
                       (concat "If-modified-since: "
                               (url-get-normalized-date tm) "\r\n"))))
             ;; Whence we came
             (if ref-url (concat
                          "Referer: " ref-url "\r\n"))
             extra-headers
             ;; Length of data
             (if url-http-data
                 (concat
                  "Content-length: " (number-to-string
                                      (length url-http-data))
                  "\r\n"))
             ;; End request
             "\r\n"
             ;; Any data
             url-http-data))
           ""))
    (url-http-debug "Request is: \n%s" request)
    request))

;; Parsing routines