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

Minor fixes from Juerg Lehni: Add trailing "/" in path info, plus code improvements

Browse source
This commit is contained in:
hns 2004-09-01 15:27:13 +00:00
parent 0dd94cd340
commit 6bd558bcb0
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -125,11 +125,7 @@ public abstract class AbstractServletClient extends HttpServlet {
if (encoding == null) { if (encoding == null) {
// no encoding from request, use standard one // no encoding from request, use standard one
encoding = defaultEncoding; encoding = defaultEncoding != null ? defaultEncoding : "ISO-8859-1";
}
if (encoding == null) {
encoding = "ISO-8859-1";
} }
// read and set http parameters // read and set http parameters
@ -722,7 +718,8 @@ public abstract class AbstractServletClient extends HttpServlet {
t = new StringTokenizer(req.getServletPath(), "/"); t = new StringTokenizer(req.getServletPath(), "/");
prefixTokens += t.countTokens(); prefixTokens += t.countTokens();
t = new StringTokenizer(req.getRequestURI(), "/"); String uri = req.getRequestURI();
t = new StringTokenizer(uri, "/");
int uriTokens = t.countTokens(); int uriTokens = t.countTokens();
StringBuffer pathbuffer = new StringBuffer(); StringBuffer pathbuffer = new StringBuffer();
@ -735,15 +732,19 @@ public abstract class AbstractServletClient extends HttpServlet {
} }
if (i > prefixTokens) { if (i > prefixTokens) {
pathbuffer.append("/"); pathbuffer.append('/');
} }
if ((token.indexOf("+") == -1) && (token.indexOf("%") == -1)) { if ((token.indexOf('+') == -1) && (token.indexOf('%') == -1)) {
pathbuffer.append(token); pathbuffer.append(token);
} else { } else {
pathbuffer.append(URLDecoder.decode(token)); pathbuffer.append(URLDecoder.decode(token));
} }
} }
// append trailing "/" if it is contained in original URI
if (uri.endsWith("/"))
pathbuffer.append('/');
return pathbuffer.toString(); return pathbuffer.toString();
} }