[GitHub] oschaaf commented on a change in pull request #1785: Fix mismatch between decompression and headers

[GitBox <gi...@apache.org>]

oschaaf commented on a change in pull request #1785: Fix mismatch between decompression and headers
URL: https://github.com/apache/incubator-pagespeed-mod/pull/1785#discussion_r208506873
 
 

 ##########
 File path: net/instaweb/rewriter/resource.cc
 ##########
 @@ -269,17 +270,38 @@ void Resource::LinkFallbackValue(HTTPValue* value) {
 }
 
 StringPiece Resource::ExtractUncompressedContents() const {
-  ResponseHeaders headers;
-  if (!extracted_ && value_.ExtractHeaders(&headers, NULL)) {
-    if (headers.IsGzipped()) {
-      StringWriter inflate_writer(&extracted_contents_);
-      if (GzipInflater::Inflate(raw_contents(), GzipInflater::kGzip,
-                                &inflate_writer)) {
-        extracted_ = true;
-      }
+  bool use_extracted = EnsureExtractedIfNeeded();
+  return use_extracted ? extracted_contents_ : raw_contents();
+}
+
+const ResponseHeaders* Resource::UncompressedHeaders() const {
+  bool use_extracted = EnsureExtractedIfNeeded();
+  return use_extracted ? extracted_headers_.get() : response_headers();
+}
+
+bool Resource::EnsureExtractedIfNeeded() const {
+  if (extracted_state_ == kExtractNotComputed) {
 
 Review comment:
   So giflib was fixed, CI is passing again on master, let me see if I can fix the copying of third_party/libpng/src/scripts/pnglibconf.h as well

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services