(url-http-create-request): Avoid incorrect implicit uni->multibyte conversion.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9424020464f6f85ee4249ce7e9d1a8de36367a2a..8e5d78668cf5554246ec2b28c64a780e149f621e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * textmodes/ispell.el (ispell-find-aspell-dictionaries):
+       Remove interactive spec.
+
 2005-10-03  Kim F. Storm  <storm@cua.dk>
 
        * ido.el (ido-mode): Use custom-initialize-set.
@@ -56,9 +61,9 @@
 
 2005-10-01  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
-       * term/mac-win.el: Add charset info for "iso10646-1".  Modify
-       default fontset to use ATSUI-compatible fonts for some charsets if
-       available.
+       * term/mac-win.el: Add charset info for "iso10646-1".
+       Modify default fontset to use ATSUI-compatible fonts for some charsets
+       if available.
 
 2005-10-01  Chong Yidong  <cyd@stupidchicken.com>
 

diff --git a/lisp/url/ChangeLog b/lisp/url/ChangeLog
index be772251fd574a6cf549a0993953dcd5e5f9d6c5..3eb850f85f389cd26f6af4721f980124f6325136 100644 (file)
--- a/lisp/url/ChangeLog
+++ b/lisp/url/ChangeLog
@@ -1,3 +1,8 @@
+2005-10-03  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * url-http.el (url-http-create-request): Avoid incorrect implicit
+       unibyte->multibyte conversion.
+
 2005-09-17  Richard M. Stallman  <rms@gnu.org>
 
        * url-vars.el (url-mail-command): Don't test fboundp of `compose-mail'.

diff --git a/lisp/url/url-http.el b/lisp/url/url-http.el
index 14f5eab1b16e8e101a81db067e68a66a5da12d9a..89b7be42c476c4d7f71d4f4a0bacab6683515cd4 100644 (file)
--- a/lisp/url/url-http.el
+++ b/lisp/url/url-http.el
@@ -194,79 +194,92 @@ request.
        (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 togther and
+    ;; the advantage of keeping the parts of each header together and
     ;; allows us to elide null lines directly, at the cost of making
     ;; the layout less clear.
     (setq request
-         (concat
-          ;; 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
-          "Connection: " (if (or proxy-obj
-                                 (not url-http-attempt-keepalives))
-                             "close" "keep-alive") "\r\n"
-          ;; HTTP extensions we support
-          (if url-extensions-header
-              (format
-               "Extension: %s\r\n" url-extensions-header))
-          ;; Who we want to talk to
-          (if (/= (url-port (or proxy-obj url))
-                  (url-scheme-get-property
-                   (url-type (or proxy-obj url)) 'default-port))
-              (format
-               "Host: %s:%d\r\n" host (url-port (or proxy-obj url)))
-            (format "Host: %s\r\n" host))
-          ;; Who its from
-          (if url-personal-mail-address
-              (concat
-               "From: " url-personal-mail-address "\r\n"))
-          ;; Encodings we understand
-          (if url-mime-encoding-string
-              (concat
-               "Accept-encoding: " url-mime-encoding-string "\r\n"))
-          (if url-mime-charset-string
-              (concat
-               "Accept-charset: " url-mime-charset-string "\r\n"))
-          ;; Languages we understand
-          (if url-mime-language-string
-              (concat
-               "Accept-language: " url-mime-language-string "\r\n"))
-          ;; Types we understand
-          "Accept: " (or url-mime-accept-string "*/*") "\r\n"
-          ;; User agent
-          (url-http-user-agent-string)
-          ;; Proxy Authorization
-          proxy-auth
-          ;; Authorization
-          auth
-          ;; 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))
+          ;; We used to concat directly, but if one of the strings happens
+          ;; to being multibyte (even if it only contains pure ASCII) then
+          ;; every string gets converted with `string-MAKE-multibyte' which
+          ;; turns the 127-255 codes into things like latin-1 accented chars
+          ;; (it would work right if it used `string-TO-multibyte' instead).
+          ;; So to avoid the problem we force every string to be unibyte.
+          (mapconcat
+           ;; FIXME: Instead of `string-AS-unibyte' we'd want
+           ;; `string-to-unibyte', so as to properly signal an error if one
+           ;; 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
+             "Connection: " (if (or proxy-obj
+                                    (not url-http-attempt-keepalives))
+                                "close" "keep-alive") "\r\n"
+                                ;; HTTP extensions we support
+             (if url-extensions-header
+                 (format
+                  "Extension: %s\r\n" url-extensions-header))
+             ;; Who we want to talk to
+             (if (/= (url-port (or proxy-obj url))
+                     (url-scheme-get-property
+                      (url-type (or proxy-obj url)) 'default-port))
+                 (format
+                  "Host: %s:%d\r\n" host (url-port (or proxy-obj url)))
+               (format "Host: %s\r\n" host))
+             ;; Who its from
+             (if url-personal-mail-address
+                 (concat
+                  "From: " url-personal-mail-address "\r\n"))
+             ;; Encodings we understand
+             (if url-mime-encoding-string
+                 (concat
+                  "Accept-encoding: " url-mime-encoding-string "\r\n"))
+             (if url-mime-charset-string
+                 (concat
+                  "Accept-charset: " url-mime-charset-string "\r\n"))
+             ;; Languages we understand
+             (if url-mime-language-string
+                 (concat
+                  "Accept-language: " url-mime-language-string "\r\n"))
+             ;; Types we understand
+             "Accept: " (or url-mime-accept-string "*/*") "\r\n"
+             ;; User agent
+             (url-http-user-agent-string)
+             ;; Proxy Authorization
+             proxy-auth
+             ;; Authorization
+             auth
+             ;; 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))