aboutsummaryrefslogtreecommitdiffstats
path: root/lib/inets
diff options
context:
space:
mode:
authorLukas Larsson <[email protected]>2019-01-25 13:25:09 +0100
committerLukas Larsson <[email protected]>2019-01-25 13:25:09 +0100
commitd6d493ab1d9131e5a5ccb6a73cd65da39447ebf0 (patch)
treeb2283b4bc597ea93ecf41dc8b8ecdca905783f2c /lib/inets
parent5ed2f3d9757c9f2b8e49a4796e2a384c938d80dd (diff)
parentecbfc52f06a71ed553a5986c6a13bc893586615b (diff)
downloadotp-d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0.tar.gz
otp-d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0.tar.bz2
otp-d6d493ab1d9131e5a5ccb6a73cd65da39447ebf0.zip
Merge branch 'maint'
* maint: Updated OTP version Prepare release Include erlang-logo128.png in release Enable setting custom application icon for Mac OS X through environment variable Update to icon with better resolution
Diffstat (limited to 'lib/inets')
-rw-r--r--lib/inets/doc/src/notes.xml20
-rw-r--r--lib/inets/vsn.mk2
2 files changed, 20 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index dd8c4115a5..2faa49e541 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,25 @@
<file>notes.xml</file>
</header>
- <section><title>Inets 7.0.3</title>
+ <section><title>Inets 7.0.4</title>
+
+ <section><title>Fixed Bugs and Malfunctions</title>
+ <list>
+ <item>
+ <p>
+ Make sure ipv6 addresses with brackets in URIs are
+ converted correctly before passing to lower level
+ functions like gen_tcp and ssl functions. Could cause
+ connection to fail.</p>
+ <p>
+ Own Id: OTP-15544 Aux Id: ERIERL-289 </p>
+ </item>
+ </list>
+ </section>
+
+</section>
+
+<section><title>Inets 7.0.3</title>
<section><title>Fixed Bugs and Malfunctions</title>
<list>
diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk
index 52c05a7974..1d1560213e 100644
--- a/lib/inets/vsn.mk
+++ b/lib/inets/vsn.mk
@@ -19,6 +19,6 @@
# %CopyrightEnd%
APPLICATION = inets
-INETS_VSN = 7.0.3
+INETS_VSN = 7.0.4
PRE_VSN =
APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)"