You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by ma...@apache.org on 2016/07/27 09:02:20 UTC
[1/2] james-project git commit: JAMES-1809 Add Content-Disposition
header when downloading attachments
Repository: james-project
Updated Branches:
refs/heads/master fbc09db2f -> db5a3b8d9
JAMES-1809 Add Content-Disposition header when downloading attachments
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/612ca203
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/612ca203
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/612ca203
Branch: refs/heads/master
Commit: 612ca203fec6660d0756217a416e61c461fd2b92
Parents: 46d377f
Author: Laura Royet <lr...@linagora.com>
Authored: Tue Jul 26 11:23:29 2016 +0200
Committer: Laura Royet <lr...@linagora.com>
Committed: Tue Jul 26 15:23:22 2016 +0200
----------------------------------------------------------------------
.../james/jmap/methods/integration/cucumber/DownloadStepdefs.java | 2 +-
.../jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/james-project/blob/612ca203/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
index 98dd128..6ef8a03 100644
--- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
+++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/cucumber/DownloadStepdefs.java
@@ -330,6 +330,6 @@ public class DownloadStepdefs {
@Then("^the attachment is named \"([^\"]*)\"$")
public void assertContentDisposition(String name) throws IOException {
- assertThat(response.getHeaders("Content-Disposition")).extracting(Header::toString).containsExactly("Content-Disposition: " + name);
+ assertThat(response.getHeaders("Content-Disposition")).extracting(Header::toString).containsExactly("Content-Disposition: attachment; filename=\"" + name + "\"");
}
}
http://git-wip-us.apache.org/repos/asf/james-project/blob/612ca203/server/protocols/jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java
----------------------------------------------------------------------
diff --git a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java
index 49d0c79..d54a7e3 100644
--- a/server/protocols/jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java
+++ b/server/protocols/jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java
@@ -129,9 +129,10 @@ public class DownloadServlet extends HttpServlet {
}
private void addContentDispositionHeader(Optional<String> optionalName, HttpServletResponse resp) {
- optionalName.ifPresent(name -> resp.addHeader("Content-Disposition", name));
+ optionalName.ifPresent(name -> resp.addHeader("Content-Disposition", "attachment; filename=\"" + name + "\""));
}
+
private MailboxSession getMailboxSession(HttpServletRequest req) {
return (MailboxSession) req.getAttribute(AuthenticationFilter.MAILBOX_SESSION);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org
[2/2] james-project git commit: Merge remote-tracking branch
'laura/JAMES-1809'
Posted by ma...@apache.org.
Merge remote-tracking branch 'laura/JAMES-1809'
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo
Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/db5a3b8d
Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/db5a3b8d
Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/db5a3b8d
Branch: refs/heads/master
Commit: db5a3b8d9cc35ee512b0e090e985bcc4e73c7a26
Parents: fbc09db 612ca20
Author: Matthieu Baechler <ma...@linagora.com>
Authored: Wed Jul 27 11:01:29 2016 +0200
Committer: Matthieu Baechler <ma...@linagora.com>
Committed: Wed Jul 27 11:01:29 2016 +0200
----------------------------------------------------------------------
.../james/jmap/methods/integration/cucumber/DownloadStepdefs.java | 2 +-
.../jmap/src/main/java/org/apache/james/jmap/DownloadServlet.java | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org