Skip to content
This repository has been archived by the owner on Jan 27, 2021. It is now read-only.

Don't add "Vary: Accept-Encoding" header to the response if it's already exists #17

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,10 @@ public void finish() throws IOException {
}

public ContainerResponse filter(ContainerRequest request, ContainerResponse response) {
response.getHttpHeaders().add(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING); // add vary header

if (!response.getHttpHeaders().containsKey(HttpHeaders.VARY) || response.getHttpHeaders().containsKey(HttpHeaders.VARY) && !response.getHttpHeaders().get(HttpHeaders.VARY).contains(HttpHeaders.ACCEPT_ENCODING)) {
response.getHttpHeaders().add(HttpHeaders.VARY, HttpHeaders.ACCEPT_ENCODING); // add vary header
}

String acceptEncoding = request.getRequestHeaders().getFirst(HttpHeaders.ACCEPT_ENCODING);
String contentEncoding = (String) response.getHttpHeaders().getFirst(HttpHeaders.CONTENT_ENCODING);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
package com.sun.jersey.api.container.filter;

import com.sun.jersey.core.header.InBoundHeaders;
import com.sun.jersey.server.impl.application.WebApplicationImpl;
import com.sun.jersey.spi.container.ContainerRequest;
import com.sun.jersey.spi.container.ContainerResponse;
import com.sun.jersey.spi.container.ContainerResponseWriter;
import org.junit.Assert;
import org.junit.Test;

import javax.ws.rs.core.HttpHeaders;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.OutputStream;
import java.net.URI;
import java.net.URISyntaxException;

/**
* Created by vadyalex (at gmail).
*/
public class GZIPContentEncodingFilterTest {

@Test
public void preventAddingMultipleVaryAcceptEncodingHeaders() throws URISyntaxException {
final WebApplicationImpl webApplication = new WebApplicationImpl();

final ContainerRequest request = new ContainerRequest(
new WebApplicationImpl(),
"GET",
new URI("base/uri"),
new URI("request/uri"),
new InBoundHeaders(),
null
);

final ContainerResponse response = new ContainerResponse(
webApplication,
request,
createContainerResponseWriter()
);

Assert.assertTrue(response.getHttpHeaders().isEmpty());

final GZIPContentEncodingFilter filter = new GZIPContentEncodingFilter();

filter.filter(request, response);
filter.filter(request, response);
filter.filter(request, response);

Assert.assertNotNull(response.getHttpHeaders());
Assert.assertTrue(response.getHttpHeaders().containsKey(HttpHeaders.VARY));
Assert.assertEquals(1, response.getHttpHeaders().get(HttpHeaders.VARY).size());
}

private ContainerResponseWriter createContainerResponseWriter() {
return new ContainerResponseWriter() {
@Override
public OutputStream writeStatusAndHeaders(long contentLength, ContainerResponse response) throws IOException {
return new ByteArrayOutputStream();
}

@Override
public void finish() throws IOException {

}
};
}


}