summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErlang/OTP <otp@erlang.org>2021-02-24 14:58:47 +0100
committerErlang/OTP <otp@erlang.org>2021-02-24 14:58:47 +0100
commit0ed47cfe5e4e421454922c3ed0ef1451e51b70d7 (patch)
tree597b4eb50d2b44b0d66c62b3965517f97809fc41
parent878dc308da076bd8a26583147de6e13cd738cdf1 (diff)
downloaderlang-0ed47cfe5e4e421454922c3ed0ef1451e51b70d7.tar.gz
Prepare release
-rw-r--r--lib/inets/doc/src/notes.xml25
-rw-r--r--lib/inets/vsn.mk2
-rw-r--r--lib/ssh/doc/src/notes.xml16
-rw-r--r--lib/ssh/vsn.mk2
-rw-r--r--make/otp_version_tickets6
5 files changed, 45 insertions, 6 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index e1bcd5de97..a8499b8d43 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,30 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 7.3.1</title>
+ <section><title>Inets 7.3.2</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Solves CVE-2021-27563, that is make sure no form of
+ relative path can be used to go outside webservers
+ directory.</p>
+ <p>
+ Own Id: OTP-17205 Aux Id: ERIERL-608 </p>
+ </item>
+ <item>
+ <p>
+ Make sure HEAD requests rejects directory links</p>
+ <p>
+ Own Id: OTP-17220</p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 7.3.1</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 195b20f63c..211c662218 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 7.3.1
+INETS_VSN = 7.3.2
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"
diff --git a/lib/ssh/doc/src/notes.xml b/lib/ssh/doc/src/notes.xml
index 57a1d5f9c7..60c3a9b9a5 100644
--- a/lib/ssh/doc/src/notes.xml
+++ b/lib/ssh/doc/src/notes.xml
@@ -30,6 +30,22 @@
<file>notes.xml</file>
</header>
+<section><title>Ssh 4.10.8</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Don't timeout slow connection setups and tear-downs. A
+ rare crash risk for the controller is also removed.</p>
+ <p>
+ Own Id: OTP-17173 Aux Id: ERIERL-581 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
<section><title>Ssh 4.10.7</title>
<section><title>Fixed Bugs and Malfunctions</title>
diff --git a/lib/ssh/vsn.mk b/lib/ssh/vsn.mk
index 8dadccc559..4e74eeddde 100644
--- a/lib/ssh/vsn.mk
+++ b/lib/ssh/vsn.mk
@@ -1,4 +1,4 @@
#-*-makefile-*- ; force emacs to enter makefile-mode
-SSH_VSN = 4.10.7
+SSH_VSN = 4.10.8
APP_VSN = "ssh-$(SSH_VSN)"
diff --git a/make/otp_version_tickets b/make/otp_version_tickets
index 70665d296d..51f2c607f7 100644
--- a/make/otp_version_tickets
+++ b/make/otp_version_tickets
@@ -1,4 +1,4 @@
OTP-16607
-OTP-17185
-OTP-17190
-OTP-17191
+OTP-17173
+OTP-17205
+OTP-17220