From 200fd8dd85c0cec1061c0158b08e0c25cfc1f929 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 31 May 2007 05:33:31 +0000 Subject: [PATCH] No need to do uri-decode anymore, URL did not used to do it svn: r6426 --- collects/web-server/dispatchers/dispatch-files.ss | 5 ++--- collects/web-server/dispatchers/dispatch-filter.ss | 5 ++--- collects/web-server/dispatchers/dispatch-passwords.ss | 3 +-- collects/web-server/dispatchers/dispatch-pathprocedure.ss | 5 ++--- collects/web-server/dispatchers/dispatch-servlets.ss | 5 ++--- collects/web-server/servlet/helpers.ss | 8 +++----- 6 files changed, 12 insertions(+), 19 deletions(-) diff --git a/collects/web-server/dispatchers/dispatch-files.ss b/collects/web-server/dispatchers/dispatch-files.ss index db50d9dd0a..e90786c995 100644 --- a/collects/web-server/dispatchers/dispatch-files.ss +++ b/collects/web-server/dispatchers/dispatch-files.ss @@ -5,8 +5,7 @@ (lib "list.ss") (lib "string.ss") (lib "plt-match.ss") - (lib "contract.ss") - (lib "uri-codec.ss" "net")) + (lib "contract.ss")) (require "dispatch.ss" "../configuration/responders.ss" "../private/util.ss" @@ -52,7 +51,7 @@ (define path ; XXX Abstract this (url-path->path htdocs-path - (uri-decode (url-path->string (url-path uri))))) + (url-path->string (url-path uri)))) (cond [(file-exists? path) (match (headers-assq* #"Range" (request-headers/raw req)) diff --git a/collects/web-server/dispatchers/dispatch-filter.ss b/collects/web-server/dispatchers/dispatch-filter.ss index 70f11cc5c0..bc436b238c 100644 --- a/collects/web-server/dispatchers/dispatch-filter.ss +++ b/collects/web-server/dispatchers/dispatch-filter.ss @@ -1,7 +1,6 @@ (module dispatch-filter mzscheme (require (lib "contract.ss") - (lib "url.ss" "net") - (lib "uri-codec.ss" "net")) + (lib "url.ss" "net")) (require "dispatch.ss" "../request-structs.ss" "../private/util.ss") @@ -11,7 +10,7 @@ (define interface-version 'v1) (define ((make regex inner) conn req) - (define path (uri-decode (url-path->string (url-path (request-uri req))))) + (define path (url-path->string (url-path (request-uri req)))) (if (regexp-match regex path) (inner conn req) (next-dispatcher)))) \ No newline at end of file diff --git a/collects/web-server/dispatchers/dispatch-passwords.ss b/collects/web-server/dispatchers/dispatch-passwords.ss index 5797f5e6a2..0176ac2f30 100644 --- a/collects/web-server/dispatchers/dispatch-passwords.ss +++ b/collects/web-server/dispatchers/dispatch-passwords.ss @@ -1,7 +1,6 @@ (module dispatch-passwords mzscheme (require (lib "kw.ss") (lib "url.ss" "net") - (lib "uri-codec.ss" "net") (lib "contract.ss")) (require "dispatch.ss" "../private/util.ss" @@ -38,7 +37,7 @@ (unbox password-cache)) (lambda (conn req) (define uri (request-uri req)) - (define path (uri-decode (url-path->string (url-path uri)))) + (define path (url-path->string (url-path uri))) (define method (request-method req)) (define denied? (read-password-cache)) (cond diff --git a/collects/web-server/dispatchers/dispatch-pathprocedure.ss b/collects/web-server/dispatchers/dispatch-pathprocedure.ss index ee9d89ccd7..cb3e61a1ce 100644 --- a/collects/web-server/dispatchers/dispatch-pathprocedure.ss +++ b/collects/web-server/dispatchers/dispatch-pathprocedure.ss @@ -1,7 +1,6 @@ (module dispatch-pathprocedure mzscheme (require (lib "contract.ss") - (lib "url.ss" "net") - (lib "uri-codec.ss" "net")) + (lib "url.ss" "net")) (require "dispatch.ss" "../private/util.ss" "../private/response.ss" @@ -13,7 +12,7 @@ (define interface-version 'v1) (define ((make the-path procedure) conn req) - (define path (uri-decode (url-path->string (url-path (request-uri req))))) + (define path (url-path->string (url-path (request-uri req)))) (if (string=? the-path path) (output-response/method conn diff --git a/collects/web-server/dispatchers/dispatch-servlets.ss b/collects/web-server/dispatchers/dispatch-servlets.ss index 9e4582f7eb..b7040e5dc1 100644 --- a/collects/web-server/dispatchers/dispatch-servlets.ss +++ b/collects/web-server/dispatchers/dispatch-servlets.ss @@ -3,8 +3,7 @@ (lib "kw.ss") (lib "plt-match.ss") (lib "string.ss") - (lib "contract.ss") - (lib "uri-codec.ss" "net")) + (lib "contract.ss")) (require "dispatch.ss" "../private/web-server-structs.ss" "../private/connection-manager.ss" @@ -383,7 +382,7 @@ ;; return dispatcher (lambda (conn req) - (define path (uri-decode (url-path->string (url-path (request-uri req))))) + (define path (url-path->string (url-path (request-uri req)))) (cond [(string=? "/conf/refresh-servlets" path) ;; more here - this is broken - only out of date or specifically mentioned ;; scripts should be flushed. This destroys persistent state! diff --git a/collects/web-server/servlet/helpers.ss b/collects/web-server/servlet/helpers.ss index bd3bc7b30e..3a32123eae 100644 --- a/collects/web-server/servlet/helpers.ss +++ b/collects/web-server/servlet/helpers.ss @@ -1,8 +1,7 @@ (module helpers mzscheme (require (lib "contract.ss") (lib "kw.ss") - (lib "plt-match.ss") - (lib "uri-codec.ss" "net")) + (lib "plt-match.ss")) (require "../private/util.ss" "../request-structs.ss" "../response-structs.ss") @@ -53,10 +52,9 @@ (pre ,(exn->string exn)))))))]) (thunk))) - (provide ; all-from + (provide with-errors-to-browser - redirect-to - (rename uri-decode translate-escapes)) + redirect-to) (provide/contract [permanently redirection-status?] [temporarily redirection-status?]