From dee491a6840b8cc2b1c79312f98854d3845ac067 Mon Sep 17 00:00:00 2001 From: gnosygnu Date: Sun, 11 Aug 2019 08:02:10 -0400 Subject: [PATCH] HTTP Server: Remove trailing new line else POST log messages will show up with extra blank line [#537] --- 400_xowa/src/gplx/core/net/Http_request_parser.java | 6 +++++- 400_xowa/src/gplx/core/net/Http_request_parser_tst.java | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/400_xowa/src/gplx/core/net/Http_request_parser.java b/400_xowa/src/gplx/core/net/Http_request_parser.java index 8991885aa..c5984caec 100644 --- a/400_xowa/src/gplx/core/net/Http_request_parser.java +++ b/400_xowa/src/gplx/core/net/Http_request_parser.java @@ -126,7 +126,11 @@ public class Http_request_parser { while (true) { line = Bry_.new_u8(rdr.Read_line()); if (Bry_.Has_at_bgn(line, content_type_boundary)) break; - tmp_bfr.Add(line).Add_byte_nl(); + + // add \n between lines, but not after last line + if (tmp_bfr.Len_gt_0()) + tmp_bfr.Add_byte_nl(); + tmp_bfr.Add(line); } byte[] val = tmp_bfr.To_bry_and_clear(); post_data_hash.Add(key, val); diff --git a/400_xowa/src/gplx/core/net/Http_request_parser_tst.java b/400_xowa/src/gplx/core/net/Http_request_parser_tst.java index b37a74e85..b031af312 100644 --- a/400_xowa/src/gplx/core/net/Http_request_parser_tst.java +++ b/400_xowa/src/gplx/core/net/Http_request_parser_tst.java @@ -41,8 +41,8 @@ public class Http_request_parser_tst { , "val1" , "-----------------------------12345678901234--" ) - , fxt.Make_post_data_itm("key0", "val0\n") - , fxt.Make_post_data_itm("key1", "val1\n") + , fxt.Make_post_data_itm("key0", "val0") + , fxt.Make_post_data_itm("key1", "val1") ); } @Test public void Type_accept_charset() {