antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 7 Projects Releases 5 Activity Actions

Try to use proper character encoding in multipart/form-data (file upload) requests.

Browse source
This commit is contained in:
hns 2003-09-05 19:32:34 +00:00
parent fb3196cfd5
commit 6eb8cf9442
2 changed files with 21 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/helma/servlet/AbstractServletClient.java
View file

@ -120,13 +120,22 @@ public abstract class AbstractServletClient extends HttpServlet {
protected void execute(HttpServletRequest request, HttpServletResponse response,
byte method) {
RequestTrans reqtrans = new RequestTrans(method);
// get app and path from original request path
// String pathInfo = request.getPathInfo ();
// String appID = getAppID (pathInfo);
// reqtrans.path = getRequestPath (pathInfo);
try {
// get the character encoding
String encoding = request.getCharacterEncoding();
if (encoding == null) {
// no encoding from request, use standard one
encoding = defaultEncoding;
}
if (encoding == null) {
encoding = "ISO-8859-1";
}
// read and set http parameters
Map parameters = parseParameters(request);
Map parameters = parseParameters(request, encoding);
for (Iterator i = parameters.entrySet().iterator(); i.hasNext();) {
Map.Entry entry = (Map.Entry) i.next();
@ -149,7 +158,7 @@ public abstract class AbstractServletClient extends HttpServlet {
(contentType.indexOf("multipart/form-data") == 0)) {
// File Upload
try {
FileUpload upload = getUpload(request);
FileUpload upload = getUpload(request, encoding);
if (upload != null) {
Hashtable parts = upload.getParts();
@ -410,7 +419,7 @@ public abstract class AbstractServletClient extends HttpServlet {
res.setHeader("Location", location);
}
FileUpload getUpload(HttpServletRequest request) throws Exception {
FileUpload getUpload(HttpServletRequest request, String encoding) throws Exception {
int contentLength = request.getContentLength();
BufferedInputStream in = new BufferedInputStream(request.getInputStream());
@ -421,7 +430,7 @@ public abstract class AbstractServletClient extends HttpServlet {
String contentType = request.getContentType();
FileUpload upload = new FileUpload(uploadLimit);
upload.load(in, contentType, contentLength);
upload.load(in, contentType, contentLength, encoding);
return upload;
}
@ -500,18 +509,7 @@ public abstract class AbstractServletClient extends HttpServlet {
map.put(name, newValues);
}
protected Map parseParameters(HttpServletRequest request) {
String encoding = request.getCharacterEncoding();
if (encoding == null) {
// no encoding from request, use standard one
encoding = defaultEncoding;
}
if (encoding == null) {
encoding = "ISO-8859-1";
}
protected Map parseParameters(HttpServletRequest request, String encoding) {
HashMap parameters = new HashMap();
// Parse any query string parameters from the request
@ -542,7 +540,7 @@ public abstract class AbstractServletClient extends HttpServlet {
len += next;
}
// is.close();
parseParameters(parameters, buf, encoding);
} catch (IllegalArgumentException e) {

4
src/helma/util/FileUpload.java
View file

@ -63,7 +63,7 @@ public class FileUpload {
* @throws MimeParserException ...
* @throws IOException ...
*/
public void load(InputStream is, String contentType, int contentLength)
public void load(InputStream is, String contentType, int contentLength, String encoding)
throws Exception {
parts = new Hashtable();
@ -129,7 +129,7 @@ public class FileUpload {
parts.put(name, part);
} else {
parts.put(name, new String(newb));
parts.put(name, new String(newb, encoding));
}
}
}