Ocsigen_server.start: Rename 'File' to 'Unix'

The name 'Unix' makes it more clear that it will make a unix-domain
socket and not a regular file.

Author: Julow

src/extensions/accesscontrol.ml

@@ -41,7 +41,7 @@ let ip s =
     let r =
       match Ocsigen_request.remote_ip_parsed ri with
       | `Ip ip -> Ipaddr.Prefix.mem ip prefix
-      | `File _ -> false
+      | `Unix _ -> false
     in
     if r
     then
@@ -224,7 +224,7 @@ let allow_forward_for_handler ?(check_equal_ip = false) () =
             let equal_ip =
               match Ocsigen_request.remote_ip_parsed request_info with
               | `Ip r_ip -> Ipaddr.compare proxy_ip r_ip = 0
-              | `File _ -> false
+              | `Unix _ -> false
             in
             if equal_ip || not check_equal_ip
             then

src/server/ocsigen_cohttp.ml

@@ -226,7 +226,7 @@ let service ?ssl ~address ~port ~connector () =
   (* We create a specific context for Conduit and Cohttp. *)
   let src =
     match address with
-    | `File _ -> None
+    | `Unix _ -> None
     | _ -> Some (Ocsigen_config.Socket_type.to_string address)
   in
   Conduit_lwt_unix.init ?src ~tls_own_key () >>= fun conduit_ctx ->
@@ -239,7 +239,7 @@ let service ?ssl ~address ~port ~connector () =
   let config = Cohttp_lwt_unix.Server.make ~conn_closed ~callback () in
   let mode =
     match address, tls_own_key with
-    | (`File _ as s), _ -> `Unix_domain_socket s
+    | `Unix f, _ -> `Unix_domain_socket (`File f)
     | _, `None -> `TCP (`Port port)
     | _, `TLS (crt, key, pass) -> `OpenSSL (crt, key, pass, `Port port)
   in

src/server/ocsigen_config.ml

@@ -29,13 +29,13 @@ type ssl_info =
 
 module Socket_type = struct
   type t =
-    [`All | `IPv4 of Unix.inet_addr | `IPv6 of Unix.inet_addr | `File of string]
+    [`All | `IPv4 of Unix.inet_addr | `IPv6 of Unix.inet_addr | `Unix of string]
 
   let to_string = function
     | `All -> Unix.string_of_inet_addr Unix.inet_addr_any
     | `IPv4 u -> Unix.string_of_inet_addr u
     | `IPv6 u -> Unix.string_of_inet_addr u
-    | `File s -> s
+    | `Unix s -> s
 end
 
 type socket_type = Socket_type.t

src/server/ocsigen_config.mli

@@ -29,7 +29,7 @@ type ssl_info =
 
 module Socket_type : sig
   type t =
-    [`All | `IPv4 of Unix.inet_addr | `IPv6 of Unix.inet_addr | `File of string]
+    [`All | `IPv4 of Unix.inet_addr | `IPv6 of Unix.inet_addr | `Unix of string]
 
   val to_string : t -> string
 end

src/server/ocsigen_request.ml

@@ -55,7 +55,7 @@ type t =
   ; r_filenames : string list ref
   ; r_sockaddr : Lwt_unix.sockaddr
   ; r_remote_ip : string Lazy.t
-  ; r_remote_ip_parsed : [`Ip of Ipaddr.t | `File of string] Lazy.t
+  ; r_remote_ip_parsed : [`Ip of Ipaddr.t | `Unix of string] Lazy.t
   ; r_forward_ip : string list
   ; r_uri : uri
   ; r_meth : Cohttp.Code.meth
@@ -97,7 +97,7 @@ let make
       (match sockaddr with
       | Unix.ADDR_INET (ip, _port) ->
           `Ip (Ipaddr.of_string_exn (Unix.string_of_inet_addr ip))
-      | ADDR_UNIX f -> `File f)
+      | ADDR_UNIX f -> `Unix f)
   in
   { r_address = address
   ; r_port = port

src/server/ocsigen_request.mli

@@ -75,7 +75,7 @@ val post_params :
   -> (string * string) list Lwt.t option
 
 val remote_ip : t -> string
-val remote_ip_parsed : t -> [`Ip of Ipaddr.t | `File of string]
+val remote_ip_parsed : t -> [`Ip of Ipaddr.t | `Unix of string]
 val forward_ip : t -> string list
 val content_type : t -> content_type option
 val request_cache : t -> Polytables.t

test/extensions/deflatemod.t/test.ml

@@ -2,7 +2,7 @@ let () =
   Logs.Src.set_level Deflatemod.section (Some Logs.Debug);
   Logs.set_level ~all:true (Some Logs.Debug);
   Ocsigen_server.start
-    ~ports:[ (`File "./local.sock", 0) ]
+    ~ports:[ (`Unix "./local.sock", 0) ]
     ~veryverbose:() ~debugmode:true ~logdir:"log" ~datadir:"data"
     ~uploaddir:None ~usedefaulthostname:true ~command_pipe:"local.cmd"
     ~default_charset:(Some "utf-8")