Ranch 2.0.0-rc.22.0.0-rc.2

3 files changed, 17 insertions, 2 deletions

diff --git a/Makefile b/Makefile
index 02d8c61..a7ec8c6 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 PROJECT = ranch
 PROJECT_DESCRIPTION = Socket acceptor pool for TCP protocols.
-PROJECT_VERSION = 2.0.0-rc.1
+PROJECT_VERSION = 2.0.0-rc.2
 PROJECT_REGISTERED = ranch_server
 
 # Options.
diff --git a/doc/src/guide/migrating_from_1.7.asciidoc b/doc/src/guide/migrating_from_1.7.asciidoc
index f63c346..92470aa 100644
--- a/doc/src/guide/migrating_from_1.7.asciidoc
+++ b/doc/src/guide/migrating_from_1.7.asciidoc
@@ -42,6 +42,11 @@ for Erlang/OTP 19 and 20 has been removed.
   is now to just start Ranch normally when using embedded
   listeners.
 
+* Two steps handshake is now supported. This allows
+  obtaining TLS extensions and updating options before
+  resuming the handshake. The handshake can also be
+  canceled.
+
 === Experimental features added
 
 * The experimental `num_listen_sockets` option has been
@@ -71,6 +76,13 @@ for Erlang/OTP 19 and 20 has been removed.
 * The `Socket` argument was removed from `Protocol:start_link/3`.
   The socket must now be obtained by calling `ranch:handshake/1,2`.
 
+=== Added functions
+
+* The functions `ranch:handshake_continue/1,2` and
+  `ranch:handshake_cancel/1` can be used to perform
+  a two steps handshake. These functions may not be
+  supported by all transports.
+
 === Changed functions
 
 * The `NumAcceptors` argument was removed from `ranch:start_listener/5`
@@ -101,6 +113,9 @@ for Erlang/OTP 19 and 20 has been removed.
 
 === Bugs fixed
 
+* Calling `ranch:remove_connection/1` will now resume a sleeping
+  acceptor process when applicable.
+
 * Repeatedly calling `ranch:remove_connection/1` from a connection
   process would crash the respective connection supervisor. This has
   now been fixed.
diff --git a/ebin/ranch.app b/ebin/ranch.app
index 31682c6..0e5db7f 100644
--- a/ebin/ranch.app
+++ b/ebin/ranch.app
@@ -1,6 +1,6 @@
 {application, 'ranch', [
 	{description, "Socket acceptor pool for TCP protocols."},
-	{vsn, "2.0.0-rc.1"},
+	{vsn, "2.0.0-rc.2"},
 	{modules, ['ranch','ranch_acceptor','ranch_acceptors_sup','ranch_app','ranch_conns_sup','ranch_conns_sup_sup','ranch_crc32c','ranch_embedded_sup','ranch_listener_sup','ranch_protocol','ranch_proxy_header','ranch_server','ranch_server_proxy','ranch_ssl','ranch_sup','ranch_tcp','ranch_transport']},
 	{registered, [ranch_sup,ranch_server]},
 	{applications, [kernel,stdlib,ssl]},