Browse Source

Cowboy 2.6.1

Loïc Hoguin 6 years ago
parent
commit
889b00209d

+ 1 - 1
Makefile

@@ -2,7 +2,7 @@
 
 
 PROJECT = cowboy
 PROJECT = cowboy
 PROJECT_DESCRIPTION = Small, fast, modern HTTP server.
 PROJECT_DESCRIPTION = Small, fast, modern HTTP server.
-PROJECT_VERSION = 2.6.0
+PROJECT_VERSION = 2.6.1
 PROJECT_REGISTERED = cowboy_clock
 PROJECT_REGISTERED = cowboy_clock
 
 
 # Options.
 # Options.

+ 2 - 0
doc/src/guide/book.asciidoc

@@ -73,6 +73,8 @@ include::middlewares.asciidoc[Middlewares]
 
 
 = Additional information
 = 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.5.asciidoc[Migrating from Cowboy 2.5 to 2.6]
 
 
 include::migrating_from_2.4.asciidoc[Migrating from Cowboy 2.4 to 2.5]
 include::migrating_from_2.4.asciidoc[Migrating from Cowboy 2.4 to 2.5]

+ 1 - 1
doc/src/guide/getting_started.asciidoc

@@ -69,7 +69,7 @@ fetch and compile Cowboy:
 PROJECT = hello_erlang
 PROJECT = hello_erlang
 
 
 DEPS = cowboy
 DEPS = cowboy
-dep_cowboy_commit = 2.6.0
+dep_cowboy_commit = 2.6.1
 
 
 DEP_PLUGINS = cowboy
 DEP_PLUGINS = cowboy
 
 

+ 12 - 0
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.

+ 1 - 1
ebin/cowboy.app

@@ -1,6 +1,6 @@
 {application, 'cowboy', [
 {application, 'cowboy', [
 	{description, "Small, fast, modern HTTP server."},
 	{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']},
 	{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]},
 	{registered, [cowboy_sup,cowboy_clock]},
 	{applications, [kernel,stdlib,crypto,cowlib,ranch]},
 	{applications, [kernel,stdlib,crypto,cowlib,ranch]},