diff --git a/lib/response.ml b/lib/response.ml index c1f7366c..c2782400 100644 --- a/lib/response.ml +++ b/lib/response.ml @@ -31,7 +31,7 @@ POSSIBILITY OF SUCH DAMAGE. ----------------------------------------------------------------------------*) -type t = Response0.t = +type t = { version : Version.t ; status : Status.t ; reason : string diff --git a/lib/response0.ml b/lib/response0.ml deleted file mode 100644 index 4e5f1aaf..00000000 --- a/lib/response0.ml +++ /dev/null @@ -1,38 +0,0 @@ -(*---------------------------------------------------------------------------- - Copyright (c) 2017 Inhabited Type LLC. - - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - 3. Neither the name of the author nor the names of his contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE CONTRIBUTORS ``AS IS'' AND ANY EXPRESS - OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED - WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR - ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, - STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN - ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. - ----------------------------------------------------------------------------*) - -type t = - { version : Version.t - ; status : Status.t - ; reason : string - ; headers : Headers.t } diff --git a/lib/serialize.ml b/lib/serialize.ml index 800ca1a8..56f1b1f4 100644 --- a/lib/serialize.ml +++ b/lib/serialize.ml @@ -61,7 +61,7 @@ let write_request t { Request.meth; target; version; headers } = write_version t version; write_crlf t; write_headers t headers -let write_response t { Response0.version; status; reason; headers } = +let write_response t { Response.version; status; reason; headers } = write_version t version; write_space t; write_status t status ; write_space t; write_string t reason ; write_crlf t;