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

* add totalUploadLimit apps.properties setting to limit combined file upload size

Browse source 
(as opposed to individual upload size)
This commit is contained in:
hns 2007-06-04 12:02:27 +00:00
parent 380ff54187
commit 5abdda6177
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -50,9 +50,12 @@ public abstract class AbstractServletClient extends HttpServlet {
// RMI url of Helma app // RMI url of Helma app
String hopUrl; String hopUrl;
// limit to HTTP uploads in kB // limit to HTTP uploads per file in kB
int uploadLimit = 1024; int uploadLimit = 1024;
// limit to HTTP upload
int totalUploadLimit = 1024;
// cookie domain to use // cookie domain to use
String cookieDomain; String cookieDomain;
@ -83,7 +86,7 @@ public abstract class AbstractServletClient extends HttpServlet {
public void init(ServletConfig init) throws ServletException { public void init(ServletConfig init) throws ServletException {
super.init(init); super.init(init);
// get max size for file uploads // get max size for file uploads per file
String upstr = init.getInitParameter("uploadLimit"); String upstr = init.getInitParameter("uploadLimit");
try { try {
uploadLimit = (upstr == null) ? 1024 : Integer.parseInt(upstr); uploadLimit = (upstr == null) ? 1024 : Integer.parseInt(upstr);
@ -91,7 +94,14 @@ public abstract class AbstractServletClient extends HttpServlet {
log("Bad number format for uploadLimit: " + upstr); log("Bad number format for uploadLimit: " + upstr);
uploadLimit = 1024; uploadLimit = 1024;
} }
// get max total upload size
upstr = init.getInitParameter("totalUploadLimit");
try {
totalUploadLimit = (upstr == null) ? uploadLimit : Integer.parseInt(upstr);
} catch (NumberFormatException x) {
log("Bad number format for totalUploadLimit: " + upstr);
totalUploadLimit = uploadLimit;
}
// soft fail mode for upload errors // soft fail mode for upload errors
uploadSoftfail = ("true".equalsIgnoreCase(init.getInitParameter("uploadSoftfail"))); uploadSoftfail = ("true".equalsIgnoreCase(init.getInitParameter("uploadSoftfail")));
@ -275,7 +285,7 @@ public abstract class AbstractServletClient extends HttpServlet {
FileUpload upload = new FileUpload(factory); FileUpload upload = new FileUpload(factory);
// use upload limit for individual file size, but also set a limit on overall size // use upload limit for individual file size, but also set a limit on overall size
upload.setFileSizeMax(uploadLimit * 1024); upload.setFileSizeMax(uploadLimit * 1024);
upload.setSizeMax(uploadLimit * 1024 * 10); upload.setSizeMax(totalUploadLimit * 1024);
// register upload tracker with user's session // register upload tracker with user's session
if (uploadStatus != null) { if (uploadStatus != null) {