From 53dec4603ca9ec7c20d43eda12892e3459de13fb Mon Sep 17 00:00:00 2001 From: Ziver Koc Date: Thu, 7 Jul 2016 15:59:25 +0200 Subject: [PATCH] Multipart is parsing field name now --- src/zutil/net/http/HttpHeaderParser.java | 3 ++- src/zutil/net/http/multipart/MultipartParser.java | 2 +- .../net/http/multipart/MultipartStringField.java | 14 ++++++++++---- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/src/zutil/net/http/HttpHeaderParser.java b/src/zutil/net/http/HttpHeaderParser.java index c656ea9..3c5e4ce 100755 --- a/src/zutil/net/http/HttpHeaderParser.java +++ b/src/zutil/net/http/HttpHeaderParser.java @@ -24,6 +24,7 @@ package zutil.net.http; +import zutil.StringUtil; import zutil.parser.URLDecoder; import java.io.BufferedReader; @@ -154,7 +155,7 @@ public class HttpHeaderParser { String[] tmp2 = PATTERN_EQUAL.split(cookie, 2); map.put( tmp2[0].trim(), // Key - (tmp2.length>1 ? tmp2[1] : "").trim()); //Value + StringUtil.trim((tmp2.length>1 ? tmp2[1] : "").trim(), '\"')); //Value } } } diff --git a/src/zutil/net/http/multipart/MultipartParser.java b/src/zutil/net/http/multipart/MultipartParser.java index 3d95273..426c5fc 100755 --- a/src/zutil/net/http/multipart/MultipartParser.java +++ b/src/zutil/net/http/multipart/MultipartParser.java @@ -162,7 +162,7 @@ public class MultipartParser implements Iterable{ return field; } else{ - MultipartStringField field = new MultipartStringField(); + MultipartStringField field = new MultipartStringField(map.get("name")); return field; } } diff --git a/src/zutil/net/http/multipart/MultipartStringField.java b/src/zutil/net/http/multipart/MultipartStringField.java index f86076c..7b1fb7f 100755 --- a/src/zutil/net/http/multipart/MultipartStringField.java +++ b/src/zutil/net/http/multipart/MultipartStringField.java @@ -1,21 +1,27 @@ package zutil.net.http.multipart; -import java.io.InputStream; + +import java.util.HashMap; /** - * Created by ezivkoc on 2016-07-06. + * Created by Ziver on 2016-07-06. */ public class MultipartStringField implements MultipartField { + private String name; private String value; + protected MultipartStringField(String name){ + this.name = name; + } + @Override public long getLength() { - return 0; + return value.length(); } @Override public String getName() { - return null; + return name; } public String getValue() {