0ct0pu5/fess
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix #1329 Content-Disposition

Browse source
This commit is contained in:
Kaoru FUZITA 2017-11-02 18:34:42 +09:00
parent 2c219193f7
commit 36ec0daac5
1 changed files with 3 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/main/java/org/codelibs/fess/helper/ViewHelper.java
View file

@ -42,11 +42,10 @@ import javax.servlet.http.HttpServletRequest;
import org.apache.catalina.connector.ClientAbortException;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringEscapeUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.text.StringEscapeUtils;
import org.codelibs.core.CoreLibConstants;
import org.codelibs.core.lang.StringUtil;
import org.codelibs.core.misc.Base64Util;
import org.codelibs.core.misc.DynamicProperties;
import org.codelibs.fess.Constants;
import org.codelibs.fess.crawler.builder.RequestDataBuilder;
@ -555,8 +554,6 @@ public class ViewHelper {
}
protected void writeFileName(final StreamResponse response, final ResponseData responseData) {
final UserAgentHelper userAgentHelper = ComponentUtil.getUserAgentHelper();
final UserAgentType userAgentType = userAgentHelper.getUserAgentType();
String charset = responseData.getCharSet();
if (charset == null) {
charset = Constants.UTF_8;
@ -571,10 +568,6 @@ public class ViewHelper {
name = URLDecoder.decode(url, charset);
}
if (logger.isDebugEnabled()) {
logger.debug("userAgentType: " + userAgentType + ", charset: " + charset + ", name: " + name);
}
final String contentDispositionType;
if (inlineMimeTypeSet.contains(responseData.getMimeType())) {
contentDispositionType = "inline";
@ -582,26 +575,8 @@ public class ViewHelper {
contentDispositionType = "attachment";
}
switch (userAgentType) {
case IE:
response.header(CONTENT_DISPOSITION, contentDispositionType + "; filename=\"" + URLEncoder.encode(name, Constants.UTF_8)
+ "\"");
break;
case OPERA:
response.header(CONTENT_DISPOSITION,
contentDispositionType + "; filename*=utf-8'ja'" + URLEncoder.encode(name, Constants.UTF_8));
break;
case SAFARI:
response.header(CONTENT_DISPOSITION, contentDispositionType + "; filename=\"" + name + "\"");
break;
case CHROME:
case FIREFOX:
case OTHER:
default:
response.header(CONTENT_DISPOSITION,
contentDispositionType + "; filename=\"=?utf-8?B?" + Base64Util.encode(name.getBytes(Constants.UTF_8)) + "?=\"");
break;
}
response.header(CONTENT_DISPOSITION,
contentDispositionType + "; filename=\"" + name + "\"; filename*=utf-8''" + URLEncoder.encode(name, Constants.UTF_8));
} catch (final Exception e) {
logger.warn("Failed to write a filename: " + responseData, e);
}