From e2d053bac12656b8821cb03773d97fc258c7c8ef Mon Sep 17 00:00:00 2001
From: Robby Findler <robby@racket-lang.org>
Date: Tue, 21 Mar 2006 02:11:14 +0000
Subject: [PATCH] PR 7976 fixed

svn: r2473
---
 collects/net/uri-codec-unit.ss | 27 ++++++++++++++++-----------
 collects/tests/mzscheme/net.ss |  8 ++++++++
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/collects/net/uri-codec-unit.ss b/collects/net/uri-codec-unit.ss
index d833fb3da5..874a84c079 100644
--- a/collects/net/uri-codec-unit.ss
+++ b/collects/net/uri-codec-unit.ss
@@ -102,8 +102,7 @@
 
       ;; The characters that always map to themselves
       (define alphanumeric-mapping
-        (map (lambda (char)
-               (cons char char))
+        (map (lambda (char) (cons char char))
              '(#\0 #\1 #\2 #\3 #\4 #\5 #\6 #\7 #\8 #\9
                #\A #\B #\C #\D #\E #\F #\G #\H #\I #\J
                #\K #\L #\M #\N #\O #\P #\Q #\R #\S #\T
@@ -190,17 +189,23 @@
            [() (list)]
            [(#\% (? hex-digit? char1) (? hex-digit? char2) . rest)
             ;; This used to consult the table again, but I think that's
-            ;;  wrong. For exmaple %2b should produce +, not a space.
+            ;;  wrong. For example %2b should produce +, not a space.
             (cons (string->number (string char1 char2) 16)
                   (internal-decode rest))]
-           [(char . rest)
+           [((? ascii-char? char) . rest)
             (cons
-             (vector-ref table
-                         (char->integer char))
+             (vector-ref table (char->integer char))
+             (internal-decode rest))]
+           [(char . rest)
+            (append
+             (bytes->list (string->bytes/utf-8 (string char)))
              (internal-decode rest))]))
 	(bytes->string/utf-8
 	 (apply bytes (internal-decode (string->list str)))))
-
+      
+      (define (ascii-char? c)
+        (<= (char->integer c) 127))
+      
       (define (hex-digit? c)
         (or (char<=? #\0 c #\9)
             (char<=? #\a c #\f)
@@ -259,11 +264,11 @@
       ;; http://www.w3.org/TR/html401/appendix/notes.html#ampersands-in-uris
       (define form-urlencoded->alist
 	(opt-lambda (str)
-	  (define key-regexp (regexp "[^=]*"))
+	  (define key-regexp #rx"[^=]*")
 	  (define value-regexp (case (current-alist-separator-mode)
-				 [(semi) (regexp "[^;]*")]
-				 [(amp) (regexp "[^&]*")]
-				 [else (regexp "[^&;]*")]))
+				 [(semi) #rx"[^;]*"]
+				 [(amp) #rx"[^&]*"]
+				 [else #rx"[^&;]*"]))
 	  (define (next-key str start)
 	    (if (>= start (string-length str))
 		#f
diff --git a/collects/tests/mzscheme/net.ss b/collects/tests/mzscheme/net.ss
index 8ac5c8153e..523c838988 100644
--- a/collects/tests/mzscheme/net.ss
+++ b/collects/tests/mzscheme/net.ss
@@ -255,6 +255,14 @@
   (test-s->u (vector "mailto" #f #f #f #f '(#("robby@plt-scheme.org")) '() #f)
              "mailto:robby@plt-scheme.org")
   
+  (test (vector "http" #f "www.drscheme.org" #f #f '() '((bar . "馨慧")) #f) 
+        string->url/vec
+        "http://www.drscheme.org?bar=馨慧")
+  
+  (test (vector "http" #f "www.drscheme.org" #f #f '() '((bár . "é")) #f) 
+        string->url/vec
+        "http://www.drscheme.org?bár=é")
+  
   (let ([empty-url (make-url #f #f #f #f #f '() '() #f)])
     (test-c-u/r (string->url "http://www.drscheme.org")
                 empty-url