summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Adam Chlipala <adamc@hcoop.net>2009-06-28 11:49:04 -0400
committerGravatar Adam Chlipala <adamc@hcoop.net>2009-06-28 11:49:04 -0400
commit5952e97040dd9331865368bb726b8059dbedbc5a (patch)
tree9e83f2e78b98d6cc69ff3cb5449fe298920bf1aa
parentaf332ab2219bf9c424c80593cb885915abed8738 (diff)
Move http protocol into its own file
-rw-r--r--src/http.sig30
-rw-r--r--src/http.sml37
-rw-r--r--src/settings.sml10
-rw-r--r--src/sources3
4 files changed, 73 insertions, 7 deletions
diff --git a/src/http.sig b/src/http.sig
new file mode 100644
index 00000000..a9c13e88
--- /dev/null
+++ b/src/http.sig
@@ -0,0 +1,30 @@
+(* Copyright (c) 2008-2009, Adam Chlipala
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - 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.
+ * - The names of contributors may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 COPYRIGHT OWNER 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.
+ *)
+
+signature HTTP = sig
+
+end
diff --git a/src/http.sml b/src/http.sml
new file mode 100644
index 00000000..b835a4ac
--- /dev/null
+++ b/src/http.sml
@@ -0,0 +1,37 @@
+(* Copyright (c) 2008-2009, Adam Chlipala
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ * - 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.
+ * - The names of contributors may not be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 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 COPYRIGHT OWNER 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.
+ *)
+
+structure Http :> HTTP = struct
+
+open Settings
+
+val () = addProtocol {name = "http",
+ link = clibFile "request.o" ^ " " ^ clibFile "queue.o" ^ " " ^ clibFile "http.o",
+ persistent = true}
+val () = setProtocol "http"
+
+end
diff --git a/src/settings.sml b/src/settings.sml
index e9f3e4b9..845683a7 100644
--- a/src/settings.sml
+++ b/src/settings.sml
@@ -261,13 +261,9 @@ fun getProtocol s = List.find (fn p => #name p = s) (!protocols)
fun clibFile s = OS.Path.joinDirFile {dir = Config.libC,
file = s}
-val http = {name = "http",
- link = clibFile "request.o" ^ " " ^ clibFile "queue.o" ^ " " ^ clibFile "http.o",
- persistent = true}
-
-val () = addProtocol http
-
-val curProto = ref http
+val curProto = ref {name = "",
+ link = "",
+ persistent = false}
fun setProtocol name =
case getProtocol name of
NONE => raise Fail ("Unknown protocol " ^ name)
diff --git a/src/sources b/src/sources
index b176301d..0ed28654 100644
--- a/src/sources
+++ b/src/sources
@@ -16,6 +16,9 @@ errormsg.sml
settings.sig
settings.sml
+http.sig
+http.sml
+
cgi.sig
cgi.sml