From 7ffec913dd43629ba3387219629a27d3f824014c Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Wed, 13 Jun 2007 02:00:47 +0000 Subject: [PATCH] Contracts svn: r6623 --- collects/web-server/docs/reference/private.scrbl | 11 ++++------- collects/web-server/private/util.ss | 6 +++++- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/collects/web-server/docs/reference/private.scrbl b/collects/web-server/docs/reference/private.scrbl index be3f5c7463..3d02f33040 100644 --- a/collects/web-server/docs/reference/private.scrbl +++ b/collects/web-server/docs/reference/private.scrbl @@ -303,16 +303,14 @@ needs. They are provided by @file{private/util.ss}. } @subsection{Paths} -@; XXX path-element? @defproc[(explode-path* [p path?]) - (listof (or/c symbol? path?))]{ + (listof path-element?)]{ Like @scheme[normalize-path], but does not resolve symlinks. } -@; XXX path-element? or no list? @defproc[(path-without-base [base path?] [p path?]) - list?]{ + (listof path-element?)]{ Returns, as a list, the portion of @scheme[p] after @scheme[base], assuming @scheme[base] is a prefix of @scheme[p]. } @@ -329,9 +327,8 @@ needs. They are provided by @file{private/util.ss}. Prepends @scheme[base] to @scheme[p], unless @scheme[p] is absolute. } -@; XXX path-element? -@defproc[(strip-prefix-ups [p list?]) - list?]{ +@defproc[(strip-prefix-ups [p (listof path-element?)]) + (listof path-element?)]{ Removes all the prefix @scheme[".."]s from @scheme[p]. } diff --git a/collects/web-server/private/util.ss b/collects/web-server/private/util.ss index 84f96deb35..639d628f39 100644 --- a/collects/web-server/private/util.ss +++ b/collects/web-server/private/util.ss @@ -10,10 +10,14 @@ (provide/contract [pretty-print-invalid-xexpr (exn:invalid-xexpr? any/c . -> . void)] [url-replace-path ((list? . -> . list?) url? . -> . url?)] + ; XXX need path-element? [explode-path* (path? . -> . (listof (or/c symbol? path?)))] + ; XXX need path-element? [path-without-base (path? path? . -> . list?)] + ; XXX need path-element? [list-prefix? (list? list? . -> . boolean?)] - [strip-prefix-ups (list? . -> . list?)] ; XXX need path-element? + ; XXX need path-element? + [strip-prefix-ups (list? . -> . list?)] [url-path->string ((listof (or/c string? path/param?)) . -> . string?)] [network-error ((symbol? string?) (listof any/c) . ->* . (void))] [directory-part (path? . -> . path?)]