From 0956e4aee32c33f874d6f9b3c3a60067d4114b33 Mon Sep 17 00:00:00 2001
From: Ziver Koc <Ziver@users.noreply.github.com>
Date: Thu, 29 Oct 2015 12:52:10 +0100
Subject: [PATCH] Improved logging

---
 src/zutil/net/http/HttpHeaderParser.java | 17 +++++++----------
 src/zutil/net/http/HttpPrintStream.java  |  6 +++---
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/zutil/net/http/HttpHeaderParser.java b/src/zutil/net/http/HttpHeaderParser.java
index bfca686..88977a8 100755
--- a/src/zutil/net/http/HttpHeaderParser.java
+++ b/src/zutil/net/http/HttpHeaderParser.java
@@ -262,29 +262,26 @@ public class HttpHeaderParser {
 		StringBuilder tmp = new StringBuilder();
 		tmp.append("{Type: ").append(type);
 		tmp.append(", HTTP_version: HTTP/").append(version);
-		tmp.append(", URL: ").append(url);
+		tmp.append(", URL: \"").append(url).append('\"');
 
 		tmp.append(", URL_attr: { ");
 		for( String key : url_attr.keySet() ){
-			tmp.append(key);
-			tmp.append(": ");
-			tmp.append( url_attr.get(key) );
+			tmp.append(key).append(": \"");
+			tmp.append(url_attr.get(key)).append("\", ");
 		}
 		tmp.append('}');
 
 		tmp.append(", Headers: {");
 		for( String key : headers.keySet() ){
-			tmp.append(key);
-			tmp.append(": ");
-			tmp.append( headers.get(key) );
+			tmp.append(key).append(": \"");
+			tmp.append( headers.get(key) ).append("\", ");
 		}
 		tmp.append('}');
 
 		tmp.append(", Cookies: {");
 		for( String key : cookies.keySet() ){
-			tmp.append(key);
-			tmp.append(": ");
-			tmp.append( cookies.get(key) );
+			tmp.append(key).append(": \"");
+			tmp.append( cookies.get(key) ).append("\", ");
 		}
 		tmp.append('}');
 
diff --git a/src/zutil/net/http/HttpPrintStream.java b/src/zutil/net/http/HttpPrintStream.java
index aa0dd19..afe210d 100755
--- a/src/zutil/net/http/HttpPrintStream.java
+++ b/src/zutil/net/http/HttpPrintStream.java
@@ -321,7 +321,7 @@ public class HttpPrintStream extends OutputStream{
         if (res_status_code != null) {
                 if (message_type == HttpMessageType.REQUEST) {
                     str.append(", req_type: ").append(req_type);
-                    str.append(", req_url: ").append(req_url);
+                    str.append(", req_url: \"").append(req_url).append('\"');
                 } else {
                     str.append(", status_code: ").append(res_status_code);
                     str.append(", status_str: ").append(getStatusString(res_status_code));
@@ -330,14 +330,14 @@ public class HttpPrintStream extends OutputStream{
             if (headers != null) {
                 str.append(", Headers: {");
                 for (String key : headers.keySet()) {
-                    str.append(key).append(": ").append(headers.get(key)).append(", ");
+                    str.append(key).append(": \"").append(headers.get(key)).append("\", ");
                 }
                 str.append('}');
             }
             if (cookies != null) {
                 str.append(", Cookies: {");
                 for (String key : cookies.keySet()) {
-                    str.append(key).append(": ").append(cookies.get(key)).append(", ");
+                    str.append(key).append(": \"").append(cookies.get(key)).append("\", ");
                 }
                 str.append('}');
             }