aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2018-11-28 12:15:17 +0100
committerLoïc Hoguin <[email protected]>2018-11-28 12:15:17 +0100
commite0254cdcb002d26a601d087b536d2b7e9be1f1f7 (patch)
tree9b408df6132bb6878dd383ba9241421761376b95
parent291d493c217de064bd7c2f6bd7921374c27ed8ae (diff)
downloadcowboy-e0254cdcb002d26a601d087b536d2b7e9be1f1f7.tar.gz
cowboy-e0254cdcb002d26a601d087b536d2b7e9be1f1f7.tar.bz2
cowboy-e0254cdcb002d26a601d087b536d2b7e9be1f1f7.zip
Cowboy 2.6.12.6.1
-rw-r--r--Makefile2
-rw-r--r--doc/src/guide/book.asciidoc2
-rw-r--r--doc/src/guide/getting_started.asciidoc2
-rw-r--r--doc/src/guide/migrating_from_2.6.asciidoc12
-rw-r--r--ebin/cowboy.app2
5 files changed, 17 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 908fd79..763a6c6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
PROJECT = cowboy
PROJECT_DESCRIPTION = Small, fast, modern HTTP server.
-PROJECT_VERSION = 2.6.0
+PROJECT_VERSION = 2.6.1
PROJECT_REGISTERED = cowboy_clock
# Options.
diff --git a/doc/src/guide/book.asciidoc b/doc/src/guide/book.asciidoc
index f4702dc..2101407 100644
--- a/doc/src/guide/book.asciidoc
+++ b/doc/src/guide/book.asciidoc
@@ -73,6 +73,8 @@ include::middlewares.asciidoc[Middlewares]
= Additional information
+include::migrating_from_2.6.asciidoc[Changes since Cowboy 2.6]
+
include::migrating_from_2.5.asciidoc[Migrating from Cowboy 2.5 to 2.6]
include::migrating_from_2.4.asciidoc[Migrating from Cowboy 2.4 to 2.5]
diff --git a/doc/src/guide/getting_started.asciidoc b/doc/src/guide/getting_started.asciidoc
index 75022df..3215fb9 100644
--- a/doc/src/guide/getting_started.asciidoc
+++ b/doc/src/guide/getting_started.asciidoc
@@ -69,7 +69,7 @@ fetch and compile Cowboy:
PROJECT = hello_erlang
DEPS = cowboy
-dep_cowboy_commit = 2.6.0
+dep_cowboy_commit = 2.6.1
DEP_PLUGINS = cowboy
diff --git a/doc/src/guide/migrating_from_2.6.asciidoc b/doc/src/guide/migrating_from_2.6.asciidoc
new file mode 100644
index 0000000..0adab3e
--- /dev/null
+++ b/doc/src/guide/migrating_from_2.6.asciidoc
@@ -0,0 +1,12 @@
+[appendix]
+== Changes since Cowboy 2.6
+
+The following patch versions were released since Cowboy 2.6:
+
+=== Cowboy 2.6.1
+
+This release updates Ranch to 1.7.1.
+
+It fixes an issue with the PROXY protocol where the wrong
+CRC32 algorithm was used and would cause checksum
+verification to fail.
diff --git a/ebin/cowboy.app b/ebin/cowboy.app
index e49ef87..acd0485 100644
--- a/ebin/cowboy.app
+++ b/ebin/cowboy.app
@@ -1,6 +1,6 @@
{application, 'cowboy', [
{description, "Small, fast, modern HTTP server."},
- {vsn, "2.6.0"},
+ {vsn, "2.6.1"},
{modules, ['cowboy','cowboy_app','cowboy_bstr','cowboy_children','cowboy_clear','cowboy_clock','cowboy_compress_h','cowboy_constraints','cowboy_handler','cowboy_http','cowboy_http2','cowboy_loop','cowboy_metrics_h','cowboy_middleware','cowboy_req','cowboy_rest','cowboy_router','cowboy_static','cowboy_stream','cowboy_stream_h','cowboy_sub_protocol','cowboy_sup','cowboy_tls','cowboy_tracer_h','cowboy_websocket']},
{registered, [cowboy_sup,cowboy_clock]},
{applications, [kernel,stdlib,crypto,cowlib,ranch]},