safebox/guacamole-client
4
0
Fork 0
mirror of https://github.com/gyurix1968/guacamole-client.git synced 2025-09-07 13:41:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

GUACAMOLE-129: Merge addition of new Content-Disposition header.

Browse Source
This commit is contained in:
James Muehlner
2017-01-28 13:14:31 -08:00
parent 0d6500396a b32ee2e9e7
commit 72a605559a
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
guacamole/src/main/java/org/apache/guacamole/rest/tunnel/StreamResource.java
View File

@@ -28,6 +28,7 @@ import javax.ws.rs.POST;
import javax.ws.rs.Produces; import javax.ws.rs.Produces;
import javax.ws.rs.core.MediaType; import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response; import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.StreamingOutput; import javax.ws.rs.core.StreamingOutput;
import org.apache.guacamole.GuacamoleException; import org.apache.guacamole.GuacamoleException;
import org.apache.guacamole.tunnel.StreamInterceptingTunnel; import org.apache.guacamole.tunnel.StreamInterceptingTunnel;
@@ -103,7 +104,14 @@ public class StreamResource {
}; };
return Response.ok(stream, mediaType).build(); // Begin successful response
ResponseBuilder responseBuilder = Response.ok(stream, mediaType);
// Set Content-Disposition header for "application/octet-stream"
if (mediaType.equals(MediaType.APPLICATION_OCTET_STREAM))
responseBuilder.header("Content-Disposition", "attachment");
return responseBuilder.build();
} }

2
guacamole/src/main/java/org/apache/guacamole/rest/tunnel/TunnelResource.java
View File

@@ -52,7 +52,7 @@ public class TunnelResource {
* The media type to send as the content type of stream contents if no * The media type to send as the content type of stream contents if no
* other media type is specified. * other media type is specified.
*/ */
private static final String DEFAULT_MEDIA_TYPE = "application/octet-stream"; private static final String DEFAULT_MEDIA_TYPE = MediaType.APPLICATION_OCTET_STREAM;
/** /**
* The tunnel that this TunnelResource represents. * The tunnel that this TunnelResource represents.