Revproxy: removing deprecated (and ambiguous) regexp option

Author: balat

src/extensions/revproxy.ml

@@ -29,16 +29,15 @@ let section = Lwt_log.Section.make "ocsigen:ext:revproxy"
 
 type redirection =
   { regexp : Pcre.regexp
-  ; full_url : [`Maybe | `No | `Yes]
+  ; full_url : bool
   ; dest : string
   ; pipeline : bool
   ; keephost : bool }
 (** The table of redirections for each virtual server *)
 
-let create_redirection ?(full_url = `Yes) ?(pipeline = true) ?(keephost = false)
+let create_redirection ?(full_url = true) ?(pipeline = true) ?(keephost = false)
     ~regexp dest
   =
-  let full_url = (full_url :> [`Maybe | `No | `Yes]) in
   let regexp = Pcre.regexp ("^" ^ regexp ^ "$") in
   {regexp; dest; full_url; pipeline; keephost}
 
@@ -53,15 +52,8 @@ let gen dir = function
            (fun () ->
            Lwt_log.ign_info ~section "Is it a redirection?";
            let dest =
-             let fi full =
-               Ocsigen_extensions.find_redirection dir.regexp full dir.dest
-                 request_info
-             in
-             match dir.full_url with
-             | `Yes -> fi true
-             | `No -> fi false
-             | `Maybe -> (
-               try fi false with Ocsigen_extensions.Not_concerned -> fi true)
+             Ocsigen_extensions.find_redirection dir.regexp dir.full_url
+               dir.dest request_info
            in
            let https, host, port, path =
              try
@@ -148,7 +140,7 @@ let gen dir = function
 
 let parse_config config_elem =
   let regexp = ref None in
-  let full_url = ref `Yes in
+  let full_url = ref true in
   let dest = ref None in
   let pipeline = ref true in
   let keephost = ref false in
@@ -158,15 +150,12 @@ let parse_config config_elem =
       ~elements:
         [ Configuration.element ~name:"revproxy"
             ~attributes:
-              [ Configuration.attribute ~name:"regexp" (fun s ->
+              [ Configuration.attribute ~name:"fullurl" (fun s ->
                   regexp := Some s;
-                  full_url := `Yes)
-              ; Configuration.attribute ~name:"fullurl" (fun s ->
-                  regexp := Some s;
-                  full_url := `Yes)
+                  full_url := true)
               ; Configuration.attribute ~name:"suburl" (fun s ->
                   regexp := Some s;
-                  full_url := `No)
+                  full_url := false)
               ; Configuration.attribute ~name:"dest" (fun s -> dest := Some s)
               ; Configuration.attribute ~name:"keephost" (function
                   | "keephost" -> keephost := true

src/extensions/revproxy.mli

@@ -1,24 +1,35 @@
 (** Revproxy: Forward a request to another Web server *)
 
-(** If you want to use this extension with Ocsigen Server's configuration file, 
-+   have a look at the {% <<a_manual chapter="revproxy"|manual page>>%}.
-+   If you are using Ocsigen Server as a library, use the interface described
-+   here. Each of these functions behaves exactly as its configuration file
-    counterpart. 
-+*)
+(** If you want to use this extension with Ocsigen Server's configuration file,
+    have a look at the {% <<a_manual chapter="revproxy"|manual page>>%}.
+    If you are using Ocsigen Server as a library, use the interface described
+    here. Each of these functions behaves exactly as its configuration file
+    counterpart.
+*)
 
 (**
 This module belongs to ocamlfind package
    [ocsigenserver.ext.revproxy].
 *)
 
+(** Example of use:
+{[
+let _ =
+   Ocsigen_server.start
+     [ Ocsigen_server.host ~regexp:".*"
+       [ Ocsigen_server.site ["blah"]
+        [ Revproxy.run
+            ~redirection:(Revproxy.create_redirection ) ]]]
+]}
+ *)
+
 val section : Lwt_log_core.section
 (** use Lwt_log.Section.set_level in order to set the log level *)
 
 type redirection
 
 val create_redirection :
-   ?full_url:[< `Maybe | `No | `Yes > `Yes]
+   ?full_url:bool
   -> ?pipeline:bool
   -> ?keephost:bool
   -> regexp:string