From 6fb0f918bf1c32d4862b90015c7e18a384fa25f2 Mon Sep 17 00:00:00 2001
From: tarabit190 <tarabit190@gmail.com>
Date: Fri, 17 Aug 2018 22:00:32 +0800
Subject: Fix kernel_app doc logger_level default from info to notice

The doc says the default kernel logger_level is info, it should be notice.
Please refer to commit 0d52b992c30eff8604e5a5363510fea38c712263 for more info.
---
 lib/kernel/doc/src/logger_chapter.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/kernel/doc/src/logger_chapter.xml b/lib/kernel/doc/src/logger_chapter.xml
index 30172f6ca6..d58c4a4d42 100644
--- a/lib/kernel/doc/src/logger_chapter.xml
+++ b/lib/kernel/doc/src/logger_chapter.xml
@@ -507,7 +507,7 @@ logger:debug(#{got => connection_request, id => Id, state => State},
 	      <c>logger_level</c></seealso>. It is changed during
 	    runtime with <seealso marker="logger#set_primary_config-2">
 	      <c>logger:set_primary_config(level,Level)</c></seealso>.</p>
-	  <p>Defaults to <c>info</c>.</p>
+	  <p>Defaults to <c>notice</c>.</p>
 	</item>
 	<tag><c>filters = [{FilterId,Filter}]</c></tag>
 	<item>
-- 
cgit v1.2.3


From 4734964a6290c32fc20095d46140053e193379f5 Mon Sep 17 00:00:00 2001
From: Hans Bolinder <hasse@erlang.org>
Date: Tue, 21 Aug 2018 08:10:50 +0200
Subject: stdlib: Let dets:open_file() crash when given raw file name

See also ERL-55 and OTP-13229.
---
 lib/stdlib/src/dets.erl        | 23 ++++++++++++++---------
 lib/stdlib/test/dets_SUITE.erl | 15 +++++++++++++++
 2 files changed, 29 insertions(+), 9 deletions(-)

(limited to 'lib')

diff --git a/lib/stdlib/src/dets.erl b/lib/stdlib/src/dets.erl
index e016d5a80e..0488c2bef2 100644
--- a/lib/stdlib/src/dets.erl
+++ b/lib/stdlib/src/dets.erl
@@ -616,12 +616,18 @@ next(Tab, Key) ->
 %% Assuming that a file already exists, open it with the
 %% parameters as already specified in the file itself.
 %% Return a ref leading to the file.
-open_file(File) ->
-    case dets_server:open_file(to_list(File)) of
-        badarg -> % Should not happen.
-            erlang:error(dets_process_died, [File]);
-        Reply -> 
-            einval(Reply, [File])
+open_file(File0) ->
+    File = to_list(File0),
+    case is_list(File) of
+        true ->
+            case dets_server:open_file(File) of
+                badarg -> % Should not happen.
+                    erlang:error(dets_process_died, [File]);
+                Reply ->
+                    einval(Reply, [File])
+            end;
+        false ->
+	    erlang:error(badarg, [File0])
     end.
 
 -spec open_file(Name, Args) -> {'ok', Name} | {'error', Reason} when
@@ -1088,6 +1094,7 @@ defaults(Tab, Args) ->
                            debug = false},
     Fun = fun repl/2,
     Defaults = lists:foldl(Fun, Defaults0, Args),
+    true = is_list(Defaults#open_args.file),
     is_comp_min_max(Defaults).
 
 to_list(T) when is_atom(T) -> atom_to_list(T);
@@ -1112,9 +1119,7 @@ repl({delayed_write, {Delay,Size} = C}, Defs)
     Defs#open_args{delayed_write = C};
 repl({estimated_no_objects, I}, Defs)  ->
     repl({min_no_slots, I}, Defs);
-repl({file, File}, Defs) when is_list(File) ->
-    Defs#open_args{file = File};
-repl({file, File}, Defs) when is_atom(File) ->
+repl({file, File}, Defs) ->
     Defs#open_args{file = to_list(File)};
 repl({keypos, P}, Defs) when is_integer(P), P > 0 ->
     Defs#open_args{keypos =P};
diff --git a/lib/stdlib/test/dets_SUITE.erl b/lib/stdlib/test/dets_SUITE.erl
index fe324391af..65977a764a 100644
--- a/lib/stdlib/test/dets_SUITE.erl
+++ b/lib/stdlib/test/dets_SUITE.erl
@@ -3417,6 +3417,7 @@ otp_11709(Config) when is_list(Config) ->
     ok.
 
 %% OTP-13229. open_file() exits with badarg when given binary file name.
+%% Also OTP-15253.
 otp_13229(_Config) ->
     F = <<"binfile.tab">>,
     try dets:open_file(name, [{file, F}]) of
@@ -3425,6 +3426,20 @@ otp_13229(_Config) ->
     catch
         error:badarg ->
             ok
+    end,
+    try dets:open_file(F, []) of % OTP-15253
+        R2 ->
+            exit({open_succeeded, R2})
+    catch
+        error:badarg ->
+            ok
+    end,
+    try dets:open_file(F) of
+        R3 ->
+            exit({open_succeeded, R3})
+    catch
+        error:badarg ->
+            ok
     end.
 
 %% OTP-13260. Race when opening a table.
-- 
cgit v1.2.3


From 737eac0506503d92e16406584ff652f45bde5b0e Mon Sep 17 00:00:00 2001
From: Erlang/OTP <otp@erlang.org>
Date: Tue, 28 Aug 2018 10:21:14 +0200
Subject: Update release notes

---
 lib/inets/doc/src/notes.xml | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

(limited to 'lib')

diff --git a/lib/inets/doc/src/notes.xml b/lib/inets/doc/src/notes.xml
index 051430956f..8374c0abef 100644
--- a/lib/inets/doc/src/notes.xml
+++ b/lib/inets/doc/src/notes.xml
@@ -33,7 +33,35 @@
     <file>notes.xml</file>
   </header>
   
-  <section><title>Inets 6.5.2.3</title>
+  <section><title>Inets 6.5.2.4</title>
+
+    <section><title>Fixed Bugs and Malfunctions</title>
+      <list>
+        <item>
+          <p>
+	    Do not use chunked-encoding with 1xx, 204 and 304
+	    responses when using mod_esi. Old behavior was not
+	    compliant with HTTP/1.1 RFC and could cause clients to
+	    hang when they received 1xx, 204 or 304 responses that
+	    included an empty chunked-encoded body.</p>
+          <p>
+	    Own Id: OTP-15241</p>
+        </item>
+        <item>
+          <p>
+	    Add robust handling of chunked-encoded HTTP responses
+	    with an empty body (1xx, 204, 304). Old behavior could
+	    cause the client to hang when connecting to a faulty
+	    server implementation.</p>
+          <p>
+	    Own Id: OTP-15242</p>
+        </item>
+      </list>
+    </section>
+
+</section>
+
+<section><title>Inets 6.5.2.3</title>
 
     <section><title>Fixed Bugs and Malfunctions</title>
       <list>
-- 
cgit v1.2.3