From ea0296d1560557ce45cdfc197a0254fb15bd75f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Hoguin?= <essen@ninenines.eu>
Date: Mon, 17 Sep 2018 15:47:48 +0200
Subject: Gun 1.2.0

---
 Makefile                                  |  2 +-
 README.asciidoc                           |  4 ++--
 doc/src/guide/book.asciidoc               |  2 ++
 doc/src/guide/migrating_from_1.1.asciidoc | 28 ++++++++++++++++++++++++++++
 ebin/gun.app                              |  2 +-
 5 files changed, 34 insertions(+), 4 deletions(-)
 create mode 100644 doc/src/guide/migrating_from_1.1.asciidoc

diff --git a/Makefile b/Makefile
index 2aa1bde..f3adfa8 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 PROJECT = gun
 PROJECT_DESCRIPTION = HTTP/1.1, HTTP/2 and Websocket client for Erlang/OTP.
-PROJECT_VERSION = 1.1.0
+PROJECT_VERSION = 1.2.0
 
 # Options.
 
diff --git a/README.asciidoc b/README.asciidoc
index 7400912..115f8cf 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -24,8 +24,8 @@ http://www.leofs.org[LeoFS Cloud Storage].
 
 == Online documentation
 
-* https://ninenines.eu/docs/en/gun/1.1/guide[User guide]
-* https://ninenines.eu/docs/en/gun/1.1/manual[Function reference]
+* https://ninenines.eu/docs/en/gun/1.2/guide[User guide]
+* https://ninenines.eu/docs/en/gun/1.2/manual[Function reference]
 
 == Offline documentation
 
diff --git a/doc/src/guide/book.asciidoc b/doc/src/guide/book.asciidoc
index 0fd92a4..821401b 100644
--- a/doc/src/guide/book.asciidoc
+++ b/doc/src/guide/book.asciidoc
@@ -20,4 +20,6 @@ include::websocket.asciidoc[Using Websocket]
 
 = Additional information
 
+include::migrating_from_1.1.asciidoc[Migrating from Gun 1.1 to 1.2]
+
 include::migrating_from_1.0.asciidoc[Migrating from Gun 1.0 to 1.1]
diff --git a/doc/src/guide/migrating_from_1.1.asciidoc b/doc/src/guide/migrating_from_1.1.asciidoc
new file mode 100644
index 0000000..bc2097f
--- /dev/null
+++ b/doc/src/guide/migrating_from_1.1.asciidoc
@@ -0,0 +1,28 @@
+[appendix]
+== Migrating from Gun 1.1 to 1.2
+
+Gun 1.2 adds support for the CONNECT request over HTTP/1.1
+connections.
+
+== Features added
+
+* CONNECT requests can now be issued on HTTP/1.1 connections.
+  The tunneled connection can use any of the protocols Gun
+  supports: HTTP/1.1, HTTP/2 and Websocket over both TCP and
+  TLS transports. Note that Gun currently does not support
+  tunneling a TLS connection over a TLS connection due to
+  limitations in Erlang/OTP.
+
+* Gun supports sending multiple CONNECT requests, allowing
+  the tunnel to the origin server to go through multiple
+  proxies.
+
+* Gun supports sending CONNECT requests with authorization
+  credentials using the Basic authentication mechanism.
+
+* Update Cowlib to 2.6.0
+
+== Functions added
+
+* The functions `gun:connect/2,3,4` have been added. They can
+  be used to initiate CONNECT requests on HTTP/1.1 connections.
diff --git a/ebin/gun.app b/ebin/gun.app
index 439653b..80cbc7e 100644
--- a/ebin/gun.app
+++ b/ebin/gun.app
@@ -1,6 +1,6 @@
 {application, 'gun', [
 	{description, "HTTP/1.1, HTTP/2 and Websocket client for Erlang/OTP."},
-	{vsn, "1.1.0"},
+	{vsn, "1.2.0"},
 	{modules, ['gun','gun_app','gun_content_handler','gun_data_h','gun_http','gun_http2','gun_sse_h','gun_sup','gun_tcp','gun_tls','gun_ws','gun_ws_h']},
 	{registered, [gun_sup]},
 	{applications, [kernel,stdlib,ssl,cowlib]},
-- 
cgit v1.2.3