suzanne.soy/racket
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

revert to allowing empty ports, but change the parsing for "file://x:/..." on windows so "x:/..." is the path

Browse Source 
svn: r3107
This commit is contained in:
Eli Barzilay 2006-05-29 15:47:40 +00:00
parent 7786d70d5b
commit 25c32fd6f0
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
collects/net/url-unit.ss
View File

@ -148,9 +148,6 @@
;; See the discussion in PR8060 for an explanation ;; See the discussion in PR8060 for an explanation
(if (eq? 'windows (system-type)) (if (eq? 'windows (system-type))
(let ([host (or (url-host url) "")]) (let ([host (or (url-host url) "")])
(when (and (not abs?) host (pair? elts) (equal? ":" (car elts)))
(set-car! elts (string-append host ":"))
(set! host ""))
(unless (equal? "" host) (set! elts (cons host elts))) (unless (equal? "" host) (set! elts (cons host elts)))
(if (null? elts) (if (null? elts)
(build-path) ; make it throw the error (build-path) ; make it throw the error
@ -381,7 +378,7 @@
"//" "//"
"(?:([^:/@;?#]*)@)?" ; =2 user-at-opt "(?:([^:/@;?#]*)@)?" ; =2 user-at-opt
"([^:/@;?#]*)?" ; =3 host-opt "([^:/@;?#]*)?" ; =3 host-opt
"(?::([0-9]+))?" ; =4 colon-port-opt "(?::([0-9]*))?" ; =4 colon-port-opt
")?" ; >B slashslash-opt ")?" ; >B slashslash-opt
")?" ; >A front-opt ")?" ; >A front-opt
"([^?#]*)" ; =5 path "([^?#]*)" ; =5 path
@ -392,6 +389,11 @@
(define (string->url str) (define (string->url str)
(apply (apply
(lambda (scheme user host port path query fragment) (lambda (scheme user host port path query fragment)
;; Windows => "file://xxx:/...." specifies a "xxx:/..." path
(when (and (equal? "" port) (equal? "file" scheme)
(eq? 'windows (system-type)))
(set! path (string-append host ":" path))
(set! host #f))
(let* ([user (uri-decode/maybe user)] (let* ([user (uri-decode/maybe user)]
[port (and port (string->number port))] [port (and port (string->number port))]
[abs? (and (not (= 0 (string-length path))) [abs? (and (not (= 0 (string-length path)))