scsh-conservatory
/
sunet
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename PARSE-URI to PARSE-URL

This commit is contained in:
vibr 2005-04-05 10:50:12 +00:00
parent c3b855ae22
commit 1e93a6cb9f
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scheme/lib/uri.scm
View File

@ -3,6 +3,7 @@
;;; This file is part of the Scheme Untergrund Networking package. ;;; This file is part of the Scheme Untergrund Networking package.
;;; Copyright (c) 1995 by Olin Shivers. ;;; Copyright (c) 1995 by Olin Shivers.
;;; Copyright (c) 2004 by Viola Brunner.
;;; For copyright information, see the file COPYING which comes with ;;; For copyright information, see the file COPYING which comes with
;;; the distribution. ;;; the distribution.
@ -21,7 +22,7 @@
;;; Caution: ;;; Caution:
;;; a URI must be separated into its components (for a HTTP-URL e.g. parsed by ;;; a URI must be separated into its components (for a HTTP-URL e.g. parsed by
;;; PARSE-URI) before the escaped characters within those components ;;; PARSE-URL) before the escaped characters within those components
;;; can be safely decoded. Don't use UNESCAPE on an unparsed URI. ;;; can be safely decoded. Don't use UNESCAPE on an unparsed URI.
(define (unescape s) (define (unescape s)

7
scheme/lib/url.scm
View File

@ -161,7 +161,7 @@
;;; ;;;
;;; don't decode yet! ;;; don't decode yet!
(define (parse-uri request-uri) (define (parse-url request-uri)
(cond (cond
((regexp-search abs_path_with_frag request-uri) ((regexp-search abs_path_with_frag request-uri)
@ -226,7 +226,7 @@
(path http-url-path) (path http-url-path)
(query http-url-query)) (query http-url-query))
;;; decode various parts of the Request_URI as returned by PARSE-URI; ;;; decode various parts of the Request_URI as returned by PARSE-URL;
;;; returns a HTTP-URL record. ;;; returns a HTTP-URL record.
(define (parsed-uri->http-url host port path query) (define (parsed-uri->http-url host port path query)
@ -237,13 +237,12 @@
(make-http-url host portnumber decoded-path decoded-query))) (make-http-url host portnumber decoded-path decoded-query)))
;;really decode query here??
;;; parse a HTTP 1.1. Request_URI into a http-url record ;;; parse a HTTP 1.1. Request_URI into a http-url record
(define (uri-string->http-url uri-string) (define (uri-string->http-url uri-string)
(call-with-values (call-with-values
(lambda () (parse-uri uri-string)) (lambda () (parse-url uri-string))
parsed-uri->http-url)) parsed-uri->http-url))
;;; Unparse a http-url record into its corresponding Request_URI ;;; Unparse a http-url record into its corresponding Request_URI