From 187b82fd41e6e924e603de89e9a8a6583c0588c7 Mon Sep 17 00:00:00 2001 From: Fabien Freling Date: Wed, 29 Jul 2015 18:00:58 +0000 Subject: [PATCH] Update to Ocamlnet v4. Also update dependencies to add camlp4 and ounit. --- ocaml/_tags | 2 +- ocaml/opam | 2 ++ ocaml/simpleHttp.ml | 11 +---------- 3 files changed, 4 insertions(+), 11 deletions(-) diff --git a/ocaml/_tags b/ocaml/_tags index 16f9284..24d0324 100644 --- a/ocaml/_tags +++ b/ocaml/_tags @@ -1,3 +1,3 @@ -true: package(ssl), package(netclient), package(netstring), package(equeue-ssl) +true: package(netclient), package(netstring) : package(oUnit) : package(irc-client.lwt) diff --git a/ocaml/opam b/ocaml/opam index 70e9523..d6e400e 100644 --- a/ocaml/opam +++ b/ocaml/opam @@ -13,6 +13,8 @@ install: [make "install"] remove: ["ocamlfind" "remove" "cheesebot"] depends: [ "ocamlfind" {build} + "camlp4" + "ounit" "lwt" "conf-gnutls" "ocamlnet" diff --git a/ocaml/simpleHttp.ml b/ocaml/simpleHttp.ml index 4076312..83971c9 100644 --- a/ocaml/simpleHttp.ml +++ b/ocaml/simpleHttp.ml @@ -1,17 +1,8 @@ open Printf -open Http_client -open Https_client +open Nethttp_client open Nethtml open Netencoding;; -Ssl.init(); -Convenience.configure_pipeline -(fun p -> - let ctx = Ssl.create_context Ssl.TLSv1 Ssl.Client_context in - let tct = https_transport_channel_type ctx in - p # configure_transport https_cb_id tct -) - let extract_string_value document = match document with