diff options
| author | Henrik Nord <[email protected]> | 2019-03-12 12:42:50 +0100 |
|---|---|---|
| committer | Henrik Nord <[email protected]> | 2019-03-12 12:42:50 +0100 |
| commit | 1518224b7f955dfb8cdef04eac89d8f6df1694a1 (patch) | |
| tree | 5b22a2d5896802c4fdb9be1a744a1d355cfd2686 /lib/inets | |
| parent | 0ffc8346553a5fc9322a75d4d8be5417dad67f29 (diff) | |
| parent | 620ac3e68c5bc8b36143965fcf2892a07dc005c4 (diff) | |
| download | otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.tar.gz otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.tar.bz2 otp-1518224b7f955dfb8cdef04eac89d8f6df1694a1.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 38 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
2 files changed, 38 insertions, 2 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 31dae6317e..91dd9cd6ed 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,7 +33,43 @@ <file>notes.xml</file> </header> - <section><title>Inets 7.0.5</title> + <section><title>Inets 7.0.6</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Fix the internal handling of the option + erl_script_timeout in httpd. When httpd was started with + explicit erl_script_timeout, the value of the option was + converted to milliseconds before storage. Subsequent + calls to httpd:info/1 returned the input value multiplied + by 1000.</p> + <p> + This change fixes the handing of erl_script_timeout by + storing the timeout in seconds and converting to + milliseconds before usage.</p> + <p> + Own Id: OTP-15669 Aux Id: ERIERL-321 </p> + </item> + </list> + </section> + + + <section><title>Improvements and New Features</title> + <list> + <item> + <p> + Enhance documentation</p> + <p> + Own Id: OTP-15508 Aux Id: ERL-816 </p> + </item> + </list> + </section> + +</section> + +<section><title>Inets 7.0.5</title> <section><title>Fixed Bugs and Malfunctions</title> <list> diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index 921161dce1..b7ddf39ebd 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 7.0.5 +INETS_VSN = 7.0.6 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |