Marown/yacy_search_server
1
0
Fork 0
mirror of https://github.com/yacy/yacy_search_server.git synced 2024-09-21 00:00:13 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fixed 'FileUploadException Stream ended unexpectedly'

Browse Source 
git-svn-id: https://svn.berlios.de/svnroot/repos/yacy/trunk@5044 6c8d7289-2bf4-0310-a012-ef5d649a1542
This commit is contained in:
danielr 2008-08-09 22:44:17 +00:00
parent 8422ee5ec4
commit bb6a6fc233
1 changed files with 48 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
source/de/anomic/http/httpd.java
View File

@ -873,7 +873,8 @@ public final class httpd implements serverHandler, Cloneable {
*
* @author danielr
* @since 07.08.2008
* @param header hier muss ARGC gesetzt werden!
* @param header
* hier muss ARGC gesetzt werden!
* @param args
* @param in
* @param length
@ -881,46 +882,52 @@ public final class httpd implements serverHandler, Cloneable {
* @throws IOException
*/
@SuppressWarnings("unchecked")
public static HashMap<String, byte[]> parseMultipart(final httpHeader header, final serverObjects args, final InputStream in, final int length) throws IOException {
RequestContext request = new yacyContextRequest(header, in);
if(!FileUploadBase.isMultipartContent(request)) {
throw new IOException("the request is not a multipart-message!");
}
FileItemFactory factory = new DiskFileItemFactory();
FileUpload upload = new FileUpload(factory);
List<FileItem> items;
try {
items = upload.parseRequest(request);
} catch (FileUploadException e) {
throw new IOException("FileUploadException "+e.getMessage());
}
final HashMap<String, byte[]> files = new HashMap<String, byte[]>();
int formFieldCount = 0;
for(FileItem item: items) {
if(item.isFormField()) {
// simple text
if(item.getContentType() == null || !item.getContentType().contains("charset")) {
// old yacy clients use their local default charset, on most systems UTF-8 (I hope ;)
args.put(item.getFieldName(), item.getString("UTF-8"));
} else {
// use default encoding (given as header or ISO-8859-1)
args.put(item.getFieldName(), item.getString());
}
formFieldCount++;
} else {
// file
args.put(item.getFieldName(), item.getName());
final byte[] fileContent = serverFileUtils.read(item.getInputStream());
item.getInputStream().close();
files.put(item.getFieldName(), fileContent);
}
}
header.put("ARGC", String.valueOf(items.size())); // store argument count
return files;
public static HashMap<String, byte[]> parseMultipart(final httpHeader header, final serverObjects args, final InputStream in, final int length)
throws IOException {
// read all data from network in memory
byte[] buffer = serverFileUtils.read(in);
// parse data in memory
RequestContext request = new yacyContextRequest(header, new ByteArrayInputStream(buffer));
// check information
if (!FileUploadBase.isMultipartContent(request)) {
throw new IOException("the request is not a multipart-message!");
}
// format information for further usage
FileItemFactory factory = new DiskFileItemFactory();
FileUpload upload = new FileUpload(factory);
List<FileItem> items;
try {
items = upload.parseRequest(request);
} catch (FileUploadException e) {
throw new IOException("FileUploadException " + e.getMessage());
}
final HashMap<String, byte[]> files = new HashMap<String, byte[]>();
int formFieldCount = 0;
for (FileItem item : items) {
if (item.isFormField()) {
// simple text
if (item.getContentType() == null || !item.getContentType().contains("charset")) {
// old yacy clients use their local default charset, on most systems UTF-8 (I hope ;)
args.put(item.getFieldName(), item.getString("UTF-8"));
} else {
// use default encoding (given as header or ISO-8859-1)
args.put(item.getFieldName(), item.getString());
}
formFieldCount++;
} else {
// file
args.put(item.getFieldName(), item.getName());
final byte[] fileContent = serverFileUtils.read(item.getInputStream());
item.getInputStream().close();
files.put(item.getFieldName(), fileContent);
}
}
header.put("ARGC", String.valueOf(items.size())); // store argument count
return files;
}
// // FIXME this is a quick hack using a previously coded parseMultipart based on a buffer
// // should be replaced sometime by a 'right' implementation