From 9e600f6c1df3c440bc196b66ebbc005d70107217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Fri, 28 Apr 2023 10:41:18 +0200
Subject: Cowboy 2.10.0

---
 Makefile                                  |  6 ++---
 doc/src/guide/book.asciidoc               |  2 ++
 doc/src/guide/getting_started.asciidoc    |  2 +-
 doc/src/guide/migrating_from_2.9.asciidoc | 42 +++++++++++++++++++++++++++++++
 ebin/cowboy.app                           |  2 +-
 5 files changed, 49 insertions(+), 5 deletions(-)
 create mode 100644 doc/src/guide/migrating_from_2.9.asciidoc

diff --git a/Makefile b/Makefile
index 5f8a0b0..368d30f 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 PROJECT = cowboy
 PROJECT_DESCRIPTION = Small, fast, modern HTTP server.
-PROJECT_VERSION = 2.9.0
+PROJECT_VERSION = 2.10.0
 PROJECT_REGISTERED = cowboy_clock
 
 # Options.
@@ -40,8 +40,8 @@ define HEX_TARBALL_EXTRA_METADATA
 #{
 	licenses => [<<"ISC">>],
 	links => #{
-		<<"User guide">> => <<"https://ninenines.eu/docs/en/cowboy/2.9/guide/">>,
-		<<"Function reference">> => <<"https://ninenines.eu/docs/en/cowboy/2.9/manual/">>,
+		<<"User guide">> => <<"https://ninenines.eu/docs/en/cowboy/2.10/guide/">>,
+		<<"Function reference">> => <<"https://ninenines.eu/docs/en/cowboy/2.10/manual/">>,
 		<<"GitHub">> => <<"https://github.com/ninenines/cowboy">>,
 		<<"Sponsor">> => <<"https://github.com/sponsors/essen">>
 	}
diff --git a/doc/src/guide/book.asciidoc b/doc/src/guide/book.asciidoc
index 0edb99a..582820f 100644
--- a/doc/src/guide/book.asciidoc
+++ b/doc/src/guide/book.asciidoc
@@ -75,6 +75,8 @@ include::performance.asciidoc[Performance]
 
 = Additional information
 
+include::migrating_from_2.9.asciidoc[Migrating from Cowboy 2.9 to 2.10]
+
 include::migrating_from_2.8.asciidoc[Migrating from Cowboy 2.8 to 2.9]
 
 include::migrating_from_2.7.asciidoc[Migrating from Cowboy 2.7 to 2.8]
diff --git a/doc/src/guide/getting_started.asciidoc b/doc/src/guide/getting_started.asciidoc
index 7104d9a..4bdde92 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.9.0
+dep_cowboy_commit = 2.10.0
 
 DEP_PLUGINS = cowboy
 
diff --git a/doc/src/guide/migrating_from_2.9.asciidoc b/doc/src/guide/migrating_from_2.9.asciidoc
new file mode 100644
index 0000000..7395e5f
--- /dev/null
+++ b/doc/src/guide/migrating_from_2.9.asciidoc
@@ -0,0 +1,42 @@
+[appendix]
+== Migrating from Cowboy 2.9 to 2.10
+
+Cowboy 2.10 is a maintenance release adding support
+for Erlang/OTP 26. The main change is a Cowlib update
+to fix a compilation error that only occurs starting
+from OTP 26.
+
+Cowboy 2.10 requires Erlang/OTP 22.0 or greater.
+
+=== Features added
+
+* Add support for `Default` value of SameSite
+  cookie attribute.
+
+* Add support for the `stale-*` cache-control directives
+  from RFC 5861.
+
+* Update Cowlib to 2.12.1.
+
+=== Bugs fixed
+
+* Fix a compilation error in Cowlib when using Erlang/OTP 26.
+
+* Fix data sent after RST_STREAM in HTTP/2 in rare cases.
+
+* Fix parsing of RST_STREAM frames to properly handle
+  frames that have a valid length but were not fully
+  received yet.
+
+* Remove the obsolete `Version` cookie attribute.
+
+* Handle more edge cases for cookie parsing based on updates
+  to the RFC 6265bis draft.
+
+* Make Basic auth parsing ignore unknown authentication
+  parameters and generally update the code to conform
+  to RFC 7617.
+
+* Fix URI template reserved expansion of %-encoded.
+
+* Update structured headers implementation to RFC 8941.
diff --git a/ebin/cowboy.app b/ebin/cowboy.app
index 6c67d14..fcb5358 100644
--- a/ebin/cowboy.app
+++ b/ebin/cowboy.app
@@ -1,6 +1,6 @@
 {application, 'cowboy', [
 	{description, "Small, fast, modern HTTP server."},
-	{vsn, "2.9.0"},
+	{vsn, "2.10.0"},
 	{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]},
-- 
cgit v1.2.3