diff options
| author | Rickard Green <[email protected]> | 2019-04-15 11:32:59 +0200 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2019-04-15 11:32:59 +0200 |
| commit | 7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2 (patch) | |
| tree | 8c7c12ca075bcc90cddc34a81c24354f73fb63b4 /lib/inets | |
| parent | fa20cc53c440a5da854f109fefc3a65270031844 (diff) | |
| parent | 22af152828a9b38aeab44d71300b4eca813964c9 (diff) | |
| download | otp-7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2.tar.gz otp-7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2.tar.bz2 otp-7ed0636c69eafed0f30ac4bd7ae2acddeb5010d2.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
# Conflicts:
# OTP_VERSION
# make/otp_version_tickets_in_merge
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 24 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
2 files changed, 24 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 91dd9cd6ed..2710ea2f2f 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,29 @@ <file>notes.xml</file> </header> - <section><title>Inets 7.0.6</title> + <section><title>Inets 7.0.7</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix the internal handling of the option + erl_script_timeout in httpd. If explicit + erl_script_timeout value was supplied in seconds it was + not correctly converted to millisecond units for internal + usage.</p> + <p> + This change fixes the handling of erl_script_timeout in + all possible configuration scenarios.</p> + <p> + Own Id: OTP-15769 Aux Id: ERIERL-345 </p> + </item> + </list> + </section> + +</section> + +<section><title>Inets 7.0.6</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index b7ddf39ebd..fd248e793a 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 7.0.6 +INETS_VSN = 7.0.7 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |