add content-type to allowed headers in options

Author: maxtori

src/common/service.ml

@@ -41,6 +41,9 @@ module IO = struct
         | Error e -> Error e
         | Ok a -> Ok (f a)
 
+  let is_empty : type a. a io -> bool = function
+    | Empty -> true
+    | _ -> false
 end
 
 type ('args, 'input, 'output, 'error, 'security) t = {

src/server/directory.ml

@@ -199,7 +199,11 @@ let options_headers dir = match MethMap.bindings dir.services with
         | Http {service; _} -> aux_sec acc service
         | Websocket {service; _} -> aux_sec acc service
       ) StringSet.empty l in
-    let headers = Cors.insert headers (Cors.allow_headers_name, sec_set) in
+    let allowed_headers_set = if List.exists (fun (_, rs) -> match rs with
+        | Http {service; _} -> IO.is_empty service.Service.input
+        | Websocket _ -> false) l then
+        StringSet.add "content-type" sec_set else sec_set in
+    let headers = Cors.insert headers (Cors.allow_headers_name, allowed_headers_set) in
     let headers = Cors.union headers (Cors.allow_credentials_header (not (StringSet.is_empty sec_set))) in
     let aux_ac acc s = Cors.union acc (Service.headers s) in
     let headers = List.fold_left (fun acc (_,rs) -> match rs with

src/server/server_common.ml

@@ -222,9 +222,7 @@ let create_server ?(name="HTTPUN") ~max_connections server_port server_kind hand
   EzDebug.printf "Starting %s server (port=%d, connection=%d)" name server_port max_connections;
   establish_server_with_client_socket
     ~nb_max_connections:max_connections
-    listen_address (handler s)(* fun sockaddr fd -> *)
-        (* handler ?catch ?allow_origin ?allow_headers ?allow_methods *)
-  (*   ?allow_credentials s sockaddr fd) *) >>= fun s ->
+    listen_address (handler s) >>= fun s ->
   server := Some s;
   Lwt.return_unit