From f29a0717743b3a2bded10bef8f906d15ca5deb32 Mon Sep 17 00:00:00 2001 From: Jay McCarthy Date: Thu, 11 Apr 2013 08:31:10 -0600 Subject: [PATCH] Normalize max-waiting contracts --- .../configuration/configuration-table-structs.rkt | 2 +- collects/web-server/private/dispatch-server-sig.rkt | 2 +- collects/web-server/scribblings/ctable-structs.scrbl | 2 +- collects/web-server/scribblings/dispatch-server.scrbl | 2 +- collects/web-server/scribblings/web-config-unit.scrbl | 2 +- collects/web-server/web-server.rkt | 6 +++--- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/collects/web-server/configuration/configuration-table-structs.rkt b/collects/web-server/configuration/configuration-table-structs.rkt index 57eed26b50..5754c52287 100644 --- a/collects/web-server/configuration/configuration-table-structs.rkt +++ b/collects/web-server/configuration/configuration-table-structs.rkt @@ -30,7 +30,7 @@ (provide/contract [struct configuration-table ([port port-number?] - [max-waiting natural-number/c] + [max-waiting exact-nonnegative-integer?] [initial-connection-timeout natural-number/c] [default-host host-table?] [virtual-hosts (listof (cons/c string? host-table?))])] diff --git a/collects/web-server/private/dispatch-server-sig.rkt b/collects/web-server/private/dispatch-server-sig.rkt index dfa3e369ab..5d7ef45eed 100644 --- a/collects/web-server/private/dispatch-server-sig.rkt +++ b/collects/web-server/private/dispatch-server-sig.rkt @@ -15,7 +15,7 @@ ((contracted [port tcp-listen-port?] [listen-ip (or/c string? false/c)] - [max-waiting integer?] + [max-waiting exact-nonnegative-integer?] [initial-connection-timeout integer?] [read-request (connection? diff --git a/collects/web-server/scribblings/ctable-structs.scrbl b/collects/web-server/scribblings/ctable-structs.scrbl index de7dfeda66..c982c0a939 100644 --- a/collects/web-server/scribblings/ctable-structs.scrbl +++ b/collects/web-server/scribblings/ctable-structs.scrbl @@ -17,7 +17,7 @@ the configuration table S-expression file format described in @defstruct[configuration-table ([port port-number?] - [max-waiting natural-number/c] + [max-waiting exact-nonnegative-integer?] [initial-connection-timeout natural-number/c] [default-host host-table?] [virtual-hosts (listof (cons/c string? host-table?))])] diff --git a/collects/web-server/scribblings/dispatch-server.scrbl b/collects/web-server/scribblings/dispatch-server.scrbl index 46dbabfbe6..d5e7336ec5 100644 --- a/collects/web-server/scribblings/dispatch-server.scrbl +++ b/collects/web-server/scribblings/dispatch-server.scrbl @@ -42,7 +42,7 @@ The @racket[dispatch-server^] signature is an alias for @defthing[port tcp-listen-port?]{Specifies the port to serve on.} @defthing[listen-ip (or/c string? false/c)]{Passed to @racket[tcp-listen].} - @defthing[max-waiting exact-integer?]{Passed to @racket[tcp-listen].} + @defthing[max-waiting exact-nonnegative-integer?]{Passed to @racket[tcp-listen].} @defthing[initial-connection-timeout integer?]{Specifies the initial timeout given to a connection.} @defproc[(read-request [c connection?] [p tcp-listen-port?] diff --git a/collects/web-server/scribblings/web-config-unit.scrbl b/collects/web-server/scribblings/web-config-unit.scrbl index 8203dc66d8..c657139e3a 100644 --- a/collects/web-server/scribblings/web-config-unit.scrbl +++ b/collects/web-server/scribblings/web-config-unit.scrbl @@ -22,7 +22,7 @@ Provides contains the following identifiers. } -@defthing[max-waiting integer?]{ +@defthing[max-waiting exact-nonnegative-integer?]{ Passed to @racket[tcp-accept]. } diff --git a/collects/web-server/web-server.rkt b/collects/web-server/web-server.rkt index fa29140f1c..3b5b559be5 100644 --- a/collects/web-server/web-server.rkt +++ b/collects/web-server/web-server.rkt @@ -21,7 +21,7 @@ #:tcp@ (unit/c (import) (export tcp^)) #:port tcp-listen-port? #:listen-ip (or/c false/c string?) - #:max-waiting number? + #:max-waiting exact-nonnegative-integer? #:initial-connection-timeout number?) (-> void))] [serve/ports @@ -31,7 +31,7 @@ #:tcp@ (unit/c (import) (export tcp^)) #:ports (listof tcp-listen-port?) #:listen-ip (or/c false/c string?) - #:max-waiting number? + #:max-waiting exact-nonnegative-integer? #:initial-connection-timeout number?) (-> void))] [serve/ips+ports @@ -40,7 +40,7 @@ #:connection-close? boolean? #:tcp@ (unit/c (import) (export tcp^)) #:ips+ports (listof (cons/c (or/c false/c string?) (listof tcp-listen-port?))) - #:max-waiting number? + #:max-waiting exact-nonnegative-integer? #:initial-connection-timeout number?) (-> void))] [do-not-return (-> void)]