Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: HttpResponse GZip content encoding equality change #843

Merged
merged 7 commits into from Oct 29, 2019
Merged

fix: HttpResponse GZip content encoding equality change #843

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5f39135
Issue #842 - HttpResponse GZip content encoding equality change
egsavage Oct 14, 2019
08adb6e
Merge remote-tracking branch 'upstream/master' into http-response-gzi…
egsavage Oct 19, 2019
af5b469
Issue #842 - Added unit test, PR updates
egsavage Oct 19, 2019
2cc4fe7
Issue #842 - Adjusted spacing, dropped ignoreCase on comparison
egsavage Oct 20, 2019
beeac46
Issue #842 - Enforce locale on encoding comparison, add unit tests
egsavage Oct 27, 2019
abda56b
Issue #842 - Removed final, fixed spelling
egsavage Oct 27, 2019
80aa603
Issue #842 - test updates
egsavage Oct 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
9 changes: 8 additions & 1 deletion google-http-client/src/main/java/com/google/api/client/http/HttpResponse.java
View file
Open in desktop
Expand Up @@ -80,6 +80,12 @@ public final class HttpResponse {
/** Whether {@link #getContent()} should return raw input stream. */
private final boolean returnRawInputStream;

/** Content encoding for GZip */
private static final String CONTENT_ENCODING_GZIP = "gzip";

/** Content encoding for GZip HTTP 1.1 */
private static final String CONTENT_ENCODING_XGZIP = "x-gzip";
egsavage marked this conversation as resolved.
Show resolved Hide resolved

/**
* Determines the limit to the content size that will be logged during {@link #getContent()}.
*
Expand Down Expand Up @@ -330,7 +336,8 @@ public InputStream getContent() throws IOException {
String contentEncoding = this.contentEncoding;
egsavage marked this conversation as resolved.
Show resolved Hide resolved
if (!returnRawInputStream
&& contentEncoding != null
&& contentEncoding.contains("gzip")) {
&& (CONTENT_ENCODING_GZIP.equalsIgnoreCase(contentEncoding.trim())
egsavage marked this conversation as resolved.
Show resolved Hide resolved
|| CONTENT_ENCODING_XGZIP.equalsIgnoreCase(contentEncoding.trim()))) {
lowLevelResponseContent = new GZIPInputStream(lowLevelResponseContent);
}
// logging (wrap content with LoggingInputStream)
Expand Down