From dfc2157c1067b9958c182b25df103744cc8feb27 Mon Sep 17 00:00:00 2001
From: Stefano Zacchiroli <zack@upsilon.cc>
Date: Sun, 17 Nov 2002 16:19:07 +0000
Subject: [PATCH] renamed tcp_server module in http_tcp_server to avoid future
 name clashes

---
 helm/DEVEL/ocaml-http/.depend                             | 8 ++++----
 helm/DEVEL/ocaml-http/Makefile                            | 2 +-
 helm/DEVEL/ocaml-http/http_daemon.ml                      | 4 ++--
 .../ocaml-http/{tcp_server.ml => http_tcp_server.ml}      | 0
 .../ocaml-http/{tcp_server.mli => http_tcp_server.mli}    | 0
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename helm/DEVEL/ocaml-http/{tcp_server.ml => http_tcp_server.ml} (100%)
 rename helm/DEVEL/ocaml-http/{tcp_server.mli => http_tcp_server.mli} (100%)

diff --git a/helm/DEVEL/ocaml-http/.depend b/helm/DEVEL/ocaml-http/.depend
index ba64340b1..04dfd8ca1 100644
--- a/helm/DEVEL/ocaml-http/.depend
+++ b/helm/DEVEL/ocaml-http/.depend
@@ -1,9 +1,9 @@
 http_common.cmo: http_types.cmi http_common.cmi 
 http_common.cmx: http_types.cmx http_common.cmi 
 http_daemon.cmo: http_common.cmi http_misc.cmi http_parser.cmi \
-    http_request.cmi http_types.cmi tcp_server.cmi http_daemon.cmi 
+    http_request.cmi http_tcp_server.cmi http_types.cmi http_daemon.cmi 
 http_daemon.cmx: http_common.cmx http_misc.cmx http_parser.cmx \
-    http_request.cmx http_types.cmx tcp_server.cmx http_daemon.cmi 
+    http_request.cmx http_tcp_server.cmx http_types.cmx http_daemon.cmi 
 http_misc.cmo: http_misc.cmi 
 http_misc.cmx: http_misc.cmi 
 http_parser.cmo: http_common.cmi http_parser.cmi 
@@ -14,10 +14,10 @@ http_response.cmo: http_common.cmi http_daemon.cmi http_misc.cmi \
     http_types.cmi http_response.cmi 
 http_response.cmx: http_common.cmx http_daemon.cmx http_misc.cmx \
     http_types.cmx http_response.cmi 
+http_tcp_server.cmo: http_tcp_server.cmi 
+http_tcp_server.cmx: http_tcp_server.cmi 
 http_types.cmo: http_types.cmi 
 http_types.cmx: http_types.cmi 
-tcp_server.cmo: tcp_server.cmi 
-tcp_server.cmx: tcp_server.cmi 
 http_common.cmi: http_types.cmi 
 http_daemon.cmi: http_types.cmi 
 http_request.cmi: http_types.cmi 
diff --git a/helm/DEVEL/ocaml-http/Makefile b/helm/DEVEL/ocaml-http/Makefile
index 31f63cf97..22eb5fb80 100644
--- a/helm/DEVEL/ocaml-http/Makefile
+++ b/helm/DEVEL/ocaml-http/Makefile
@@ -1,6 +1,6 @@
 include Makefile.defs
 
-MODULES = http_common http_misc http_types http_request http_parser tcp_server http_daemon http_response
+MODULES = http_common http_misc http_types http_request http_parser http_tcp_server http_daemon http_response
 PUBLIC_MODULES = http_common http_types http_request http_daemon http_response
 DESTDIR = $(shell $(OCAMLFIND) printconf stdlib) 
 
diff --git a/helm/DEVEL/ocaml-http/http_daemon.ml b/helm/DEVEL/ocaml-http/http_daemon.ml
index c26d284ea..8dfc83e50 100644
--- a/helm/DEVEL/ocaml-http/http_daemon.ml
+++ b/helm/DEVEL/ocaml-http/http_daemon.ml
@@ -296,8 +296,8 @@ let start
           outchan
   in
   match fork with
-  | true -> Tcp_server.ocaml_builtin ~sockaddr ~timeout daemon_callback 
-  | false -> Tcp_server.simple ~sockaddr ~timeout daemon_callback
+  | true -> Http_tcp_server.ocaml_builtin ~sockaddr ~timeout daemon_callback 
+  | false -> Http_tcp_server.simple ~sockaddr ~timeout daemon_callback
 
   (* OO request *)
 let start'
diff --git a/helm/DEVEL/ocaml-http/tcp_server.ml b/helm/DEVEL/ocaml-http/http_tcp_server.ml
similarity index 100%
rename from helm/DEVEL/ocaml-http/tcp_server.ml
rename to helm/DEVEL/ocaml-http/http_tcp_server.ml
diff --git a/helm/DEVEL/ocaml-http/tcp_server.mli b/helm/DEVEL/ocaml-http/http_tcp_server.mli
similarity index 100%
rename from helm/DEVEL/ocaml-http/tcp_server.mli
rename to helm/DEVEL/ocaml-http/http_tcp_server.mli
-- 
2.39.2