diff options
| author | Lars Thorsen <[email protected]> | 2018-08-24 10:08:27 +0200 |
|---|---|---|
| committer | Lars Thorsen <[email protected]> | 2018-08-24 10:08:27 +0200 |
| commit | 35979da59dd3c88601ed73a5eeb9054bbd28b5a1 (patch) | |
| tree | ce609632d3e5cae8714f47a7cb2d30aa705aeee1 /lib/inets | |
| parent | 2ce155ca0de6890cd5750d97a6593d67d4d940f7 (diff) | |
| parent | d35d59cea514582817f1fc450885d6a060e542c0 (diff) | |
| download | otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.tar.gz otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.tar.bz2 otp-35979da59dd3c88601ed73a5eeb9054bbd28b5a1.zip | |
Merge branch 'maint'
* maint:
Updated OTP version
Prepare release
Updated the engine load functionality
inets: Prepare for release
inets: Use status code 501 when no mod_* handles the request
ssl: Prepare for release
ssl: Make sure that a correct cipher suite is selected
ssl: Make sure that a correct cipher suite is selected
Diffstat (limited to 'lib/inets')
| -rw-r--r-- | lib/inets/doc/src/notes.xml | 20 | ||||
| -rw-r--r-- | lib/inets/src/inets_app/inets.appup.src | 2 | ||||
| -rw-r--r-- | lib/inets/test/httpd_SUITE.erl | 1 | ||||
| -rw-r--r-- | lib/inets/vsn.mk | 2 |
4 files changed, 22 insertions, 3 deletions
diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml index 88a4335f60..a47893c5a2 100644 --- a/lib/inets/doc/src/notes.xml +++ b/lib/inets/doc/src/notes.xml @@ -33,9 +33,25 @@ <file>notes.xml</file> </header> - <section><title>Inets 7.0</title> + <section><title>Inets 7.0.1</title> + + <section><title>Fixed Bugs and Malfunctions</title> + <list> + <item> + <p> + Change status code for no mod found to handle request to + 501</p> + <p> + Own Id: OTP-15215</p> + </item> + </list> + </section> - <section><title>Fixed Bugs and Malfunctions</title> + </section> + + <section><title>Inets 7.0</title> + + <section><title>Fixed Bugs and Malfunctions</title> <list> <item> <p> diff --git a/lib/inets/src/inets_app/inets.appup.src b/lib/inets/src/inets_app/inets.appup.src index 0dcf66265e..b197590bfd 100644 --- a/lib/inets/src/inets_app/inets.appup.src +++ b/lib/inets/src/inets_app/inets.appup.src @@ -18,10 +18,12 @@ %% %CopyrightEnd% {"%VSN%", [ + {<<"7\\..*">>,[{restart_application, inets}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ], [ + {<<"7\\..*">>,[{restart_application, inets}]}, {<<"6\\..*">>,[{restart_application, inets}]}, {<<"5\\..*">>,[{restart_application, inets}]} ] diff --git a/lib/inets/test/httpd_SUITE.erl b/lib/inets/test/httpd_SUITE.erl index c5751e79a6..9777c9b68e 100644 --- a/lib/inets/test/httpd_SUITE.erl +++ b/lib/inets/test/httpd_SUITE.erl @@ -2047,6 +2047,7 @@ head_status(_) -> basic_conf() -> [{modules, [mod_alias, mod_range, mod_responsecontrol, mod_trace, mod_esi, mod_cgi, mod_get, mod_head]}]. + not_sup_conf() -> [{modules, [mod_get]}]. diff --git a/lib/inets/vsn.mk b/lib/inets/vsn.mk index b76390ad66..7cd5ea61ab 100644 --- a/lib/inets/vsn.mk +++ b/lib/inets/vsn.mk @@ -19,6 +19,6 @@ # %CopyrightEnd% APPLICATION = inets -INETS_VSN = 7.0 +INETS_VSN = 7.0.1 PRE_VSN = APP_VSN = "$(APPLICATION)-$(INETS_VSN)$(PRE_VSN)" |