Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: c
script: bash -ex .travis-ci.sh
install: wget https://raw.githubusercontent.com/ocaml/ocaml-travisci-skeleton/master/.travis-opam.sh
script: bash -ex .travis-opam.sh
env:
- OCAML_VERSION=4.02.0 OPAM_VERSION=1.2.0
- OCAML_VERSION=4.01.0 OPAM_VERSION=1.2.0
- PACKAGE="cohttp" OCAML_VERSION=4.01 DEPOPTS="async lwt js_of_ocaml" POST_INSTALL_HOOK="opam install github cowabloga"
- PACKAGE="cohttp" OCAML_VERSION=latest DEPOPTS="async lwt js_of_ocaml" POST_INSTALL_HOOK="opam install github cowabloga"
9 changes: 9 additions & 0 deletions CHANGES
Original file line number Diff line number Diff line change
@@ -1,3 +1,12 @@
0.15.1 (2015-01-10):
* Lwt 2.4.7 renamed `blit_bytes_string` to `blit_to_bytes`, so depend
on the newer API now. (#230)
* Use `cmdliner` in all of the Lwt client and server binaries. This gives
`cohttp-lwt-server` a nice Unix-like command-line interface now that
can be viewed with the `--help` option. (#218 via Runhang Li)
* Improve `oasis` constraints and regenerate `opam` file (#229 via
Christophe Troestler).

0.15.0 (2014-12-24):

Compatibility breaking interface changes:
Expand Down
2 changes: 1 addition & 1 deletion _oasis
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
OASISFormat: 0.3
Name: cohttp
Version: 0.15.0
Version: 0.15.1
Synopsis: HTTP library for Lwt, Async, JavaScript and Mirage
Description: CoHTTP is an OCaml library for creating HTTP clients and
daemons. It has a portable HTTP parser. Optional dependencies
Expand Down
12 changes: 6 additions & 6 deletions lib/META
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# OASIS_START
# DO NOT EDIT (digest: 58f3ba980c68f36d754812ac1d1ae41c)
version = "0.15.0"
# DO NOT EDIT (digest: 9e9feb768a18f46865e56b0bd9281958)
version = "0.15.1"
description = "HTTP library for Lwt, Async, JavaScript and Mirage"
requires =
"re.emacs stringext uri uri.services fieldslib sexplib bytes base64"
Expand All @@ -10,7 +10,7 @@ archive(native) = "cohttp.cmxa"
archive(native, plugin) = "cohttp.cmxs"
exists_if = "cohttp.cma"
package "lwt-core" (
version = "0.15.0"
version = "0.15.1"
description = "HTTP library for Lwt, Async, JavaScript and Mirage"
requires = "lwt uri cohttp"
archive(byte) = "cohttp_lwt.cma"
Expand All @@ -21,7 +21,7 @@ package "lwt-core" (
)

package "lwt" (
version = "0.15.0"
version = "0.15.1"
description = "HTTP library for Lwt, Async, JavaScript and Mirage"
requires = "cohttp.lwt-core unix lwt.unix conduit.lwt-unix"
archive(byte) = "cohttp_lwt_unix.cma"
Expand All @@ -32,7 +32,7 @@ package "lwt" (
)

package "js" (
version = "0.15.0"
version = "0.15.1"
description = "HTTP library for Lwt, Async, JavaScript and Mirage"
requires = "cohttp.lwt-core js_of_ocaml"
archive(byte) = "cohttp_lwt_xhr.cma"
Expand All @@ -43,7 +43,7 @@ package "js" (
)

package "async" (
version = "0.15.0"
version = "0.15.1"
description = "HTTP library for Lwt, Async, JavaScript and Mirage"
requires = "uri cohttp threads async conduit.async"
archive(byte) = "cohttp_async.cma"
Expand Down
5 changes: 3 additions & 2 deletions opam
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ opam-version: "1.2"

name: "cohttp"
maintainer: "anil@recoil.org"
version: "0.15.1"
authors: [ "Anil Madhavapeddy"
"Stefano Zacchiroli"
"David Sheets"
Expand Down Expand Up @@ -37,7 +38,7 @@ depends: [
"sexplib" {>= "109.53.00"}
"conduit" {>= "0.7.0"}
"stringext"
"base64" {>= "2.0.0"}
"base64" {>="2.0.0"}
"ounit" {test}
]
build-doc: ["ocaml" "setup.ml" "-doc"]
Expand All @@ -56,7 +57,7 @@ depopts: [

conflicts: [
"async" {<"109.15.00"}
"lwt" {<"2.4.3"}
"lwt" {<"2.4.7"}
]

available: [ocaml-version >= "4.01.0"]
6 changes: 3 additions & 3 deletions setup.ml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
(* setup.ml generated for the first time by OASIS v0.4.5 *)

(* OASIS_START *)
(* DO NOT EDIT (digest: 0c6b8beb5ec6ae656e105109382e98bb) *)
(* DO NOT EDIT (digest: b71dbfcdc32b92c942e7b5f2bc937595) *)
(*
Regenerated by OASIS v0.4.5
Visit http://oasis.forge.ocamlcore.org for more information and
Expand Down Expand Up @@ -6975,7 +6975,7 @@ let setup_t =
alpha_features = [];
beta_features = [];
name = "cohttp";
version = "0.15.0";
version = "0.15.1";
license =
OASISLicense.DEP5License
(OASISLicense.DEP5Unit
Expand Down Expand Up @@ -8396,7 +8396,7 @@ let setup_t =
};
oasis_fn = Some "_oasis";
oasis_version = "0.4.5";
oasis_digest = Some "2�~\001S�/�\020'\031\152<\012x4";
oasis_digest = Some "�_\020�u�-Y����6`�h";
oasis_exec = None;
oasis_setup_args = [];
setup_update = false
Expand Down