From 88427bcbbfe7ca89d6477098940ba734cfd81110 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 13 Mar 2018 21:00:36 +0700 Subject: [PATCH 1/2] Bring cohttp up to date with latest re --- cohttp.opam | 2 +- cohttp/src/header.ml | 2 +- cohttp/src/jbuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cohttp.opam b/cohttp.opam index ca26b399bf..f4599bcbee 100644 --- a/cohttp.opam +++ b/cohttp.opam @@ -22,7 +22,7 @@ build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] depends: [ "base-bytes" "jbuilder" {build & >= "1.0+beta10"} - "re" + "re" {>= "1.7.2"} "uri" {>= "1.9.0"} "fieldslib" "sexplib" diff --git a/cohttp/src/header.ml b/cohttp/src/header.ml index 956f4280c5..6db1a32c94 100644 --- a/cohttp/src/header.ml +++ b/cohttp/src/header.ml @@ -167,7 +167,7 @@ let get_connection_close headers = let media_type_re = - let re = Re_emacs.re ~case:true "[ \t]*\\([^ \t;]+\\)" in + let re = Re.Emacs.re ~case:true "[ \t]*\\([^ \t;]+\\)" in Re.(compile (seq ([start; re]))) let get_first_match _re s = diff --git a/cohttp/src/jbuild b/cohttp/src/jbuild index c88c71046e..6ac15a86a8 100644 --- a/cohttp/src/jbuild +++ b/cohttp/src/jbuild @@ -16,7 +16,7 @@ (public_name cohttp) (synopsis "Co-operative Client/Server HTTP library.") (preprocess (pps (ppx_fields_conv ppx_sexp_conv))) - (libraries (re.emacs + (libraries (re stringext uri fieldslib From a82b8d9de34b76f9d511a843bcab30aad60f9b13 Mon Sep 17 00:00:00 2001 From: Rudi Grinberg Date: Tue, 13 Mar 2018 21:00:53 +0700 Subject: [PATCH 2/2] Remove base-bytes dependency We're >= 4.03.0 anyway --- cohttp.opam | 1 - 1 file changed, 1 deletion(-) diff --git a/cohttp.opam b/cohttp.opam index f4599bcbee..3f5cd4beb6 100644 --- a/cohttp.opam +++ b/cohttp.opam @@ -20,7 +20,6 @@ build: [ ] build-test: [["jbuilder" "runtest" "-p" name "-j" jobs]] depends: [ - "base-bytes" "jbuilder" {build & >= "1.0+beta10"} "re" {>= "1.7.2"} "uri" {>= "1.9.0"}