ziver/hal
1
1
Fork 0
Code Pull requests Releases Activity

Some more progress in multipart

Browse source
This commit is contained in:
Ziver Koc 2016-07-11 18:05:21 +02:00
parent a700cf2863
commit e4a5af69db
5 changed files with 153 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/zutil/net/http/multipart/MultipartParser.java
View file

@ -120,7 +120,7 @@ public class MultipartParser implements Iterable<MultipartField>{
public boolean hasNext() {
try {
IOUtil.copyStream(buffIn, new NullWriter());
return boundaryIn.next();
return boundaryIn.isOnBoundary();
} catch (IOException e){
logger.log(Level.SEVERE, null, e);
}
@ -130,14 +130,13 @@ public class MultipartParser implements Iterable<MultipartField>{
@Override
public MultipartField next() {
if (!hasNext())
return null;
try {
HttpHeader header = parser.read();
boundaryIn.next();
String tmp = buffIn.readLine(); // read the new line after the delimiter
if (tmp == null && tmp.equals("--"))
if (tmp == null || tmp.equals("--"))
return null;
HttpHeader header = parser.read();
String disposition = header.getHeader(HEADER_CONTENT_DISPOSITION);
if (disposition != null){
HashMap<String,String> map = new HashMap<>();

2
src/zutil/net/http/multipart/MultipartStringField.java
View file

@ -17,7 +17,7 @@ public class MultipartStringField implements MultipartField {
protected MultipartStringField(Map<String,String> header, BufferedReader in) throws IOException {
this.name = header.get("name");
value = IOUtil.getContentAsString(in);
value = in.readLine();
}
@Override