Making subtype non optional in content types

Author: Vincent Balat

src/http/ocsigen_headers.ml

@@ -237,20 +237,17 @@ let parse_content_type = function
       match String.split ';' s with
         | [] -> None
         | a::l ->
-          let (typ, subtype) =
-            try
-              let typ, subtype = String.sep '/' a in (typ, Some subtype)
-            with Not_found -> a, None
-          in
-          let params =
-            try
-              List.map (String.sep '=') l
-            with Not_found -> []
-          in
+          try
+            let typ, subtype = String.sep '/' a in
+            let params =
+              try
+                List.map (String.sep '=') l
+              with Not_found -> []
+            in
 (*VVV If syntax error, we return no parameter at all *)
-          Some ((typ, subtype), params)
+            Some ((typ, subtype), params)
 (*VVV If syntax error in type, we return None *)
-
+          with Not_found -> None
 
 let get_content_length http_frame =
   try

src/http/ocsigen_headers.mli

@@ -35,7 +35,7 @@ val find_all : string -> Ocsigen_http_frame.t -> string list
 val get_keepalive : Ocsigen_http_frame.Http_header.http_header -> bool
 val parse_cookies : string  -> string CookiesTable.t
 val parse_mime_type : string -> string option * string option
-val get_host_from_host_header : Ocsigen_http_frame.t -> 
+val get_host_from_host_header : Ocsigen_http_frame.t ->
   string option * int option
 val get_user_agent : Ocsigen_http_frame.t -> string
 val get_cookie_string : Ocsigen_http_frame.t -> string option
@@ -44,7 +44,8 @@ val get_if_unmodified_since : Ocsigen_http_frame.t -> float option
 val get_if_none_match : Ocsigen_http_frame.t -> string list option
 val get_if_match : Ocsigen_http_frame.t -> string list option
 val get_content_type : Ocsigen_http_frame.t -> string option
-val parse_content_type : string option -> ((string * string) * (string * string) list) option
+val parse_content_type
+  : string option -> ((string * string) * (string * string) list) option
 val get_content_length : Ocsigen_http_frame.t -> int64 option
 val get_referer : Ocsigen_http_frame.t -> string option
 val get_referrer : Ocsigen_http_frame.t -> string option

src/server/ocsigen_extensions.ml

@@ -193,8 +193,7 @@ type file_info = {
     filesize: int64;
     raw_original_filename: string;
     original_basename: string ;
-    file_content_type:
-      ((string * string option) * (string * string) list) option;
+    file_content_type: ((string * string) * (string * string) list) option;
   }
 
 type request_info =

src/server/ocsigen_extensions.mli

@@ -140,8 +140,7 @@ type file_info = {
     filesize: int64;
     raw_original_filename: string;
     original_basename: string ;
-    file_content_type:
-      ((string * string option) * (string * string) list) option;
+    file_content_type: ((string * string) * (string * string) list) option;
   }
 
 (** The request *)

src/server/ocsigen_server.ml

@@ -112,7 +112,7 @@ let find_field field content_disp =
 type to_write =
     No_File of string * Buffer.t
   | A_File of (string * string * string * Unix.file_descr
-               * ((string * string option) * (string * string) list) option)
+               * ((string * string) * (string * string) list) option)
 
 let counter = let c = ref (Random.int 1000000) in fun () -> c := !c + 1 ; !c