Correctly whitelist ftp directory listings.

webkit/glue/multipart_response_delegate.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/glue/multipart_response_delegate.h"
 
 #include "base/logging.h"
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
 #include "net/base/net_util.h"
 #include "net/http/http_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebHTTPHeaderVisitor.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURLLoaderClient.h"
+#include "webkit/glue/weburlresponse_extradata_impl.h"
 
 using WebKit::WebHTTPHeaderVisitor;
 using WebKit::WebString;
 using WebKit::WebURLLoader;
 using WebKit::WebURLLoaderClient;
 using WebKit::WebURLResponse;
 
 namespace webkit_glue {
 
 namespace {
@@ skipping 234 matching lines @@
     std::string name(kReplaceHeaders[i]);
     std::string value = net::GetSpecificHeader(headers, name);
     if (!value.empty()) {
       response.setHTTPHeaderField(WebString::fromUTF8(name),
                                   WebString::fromUTF8(value));
     }
   }
   // To avoid recording every multipart load as a separate visit in
   // the history database, we want to keep track of whether the response
   // is part of a multipart payload.  We do want to record the first visit,
-  // so we only set isMultipartPayload to true after the first visit.
-  response.setIsMultipartPayload(has_sent_first_response_);

[jam, 2012/05/24 15:11:48]

so can someone still do response.isMultipartPayload()? i.e. is there two getters
now for the same thing, or are you planning on getting rid of that?

+  // so we only set is_multipart_payload to true after the first visit.
+  if (response.extraData()) {
+    // extraData can be NULL during tests.
+    WebURLResponseExtraDataImpl* extra_data =
+        static_cast<WebURLResponseExtraDataImpl*>(response.extraData());
+    extra_data->set_is_multipart_payload(has_sent_first_response_);
+  }
   has_sent_first_response_ = true;
+
   // Send the response!
   if (client_)
     client_->didReceiveResponse(loader_, response);
 
   return true;
 }
 
 // Boundaries are supposed to be preceeded with --, but it looks like gecko
 // doesn't require the dashes to exist.  See nsMultiMixedConv::FindToken.
 size_t MultipartResponseDelegate::FindBoundary() {
@@ skipping 112 matching lines @@
   if (!base::StringToInt64(byte_range_upper_bound, content_range_upper_bound))
     return false;
   if (!base::StringToInt64(byte_range_instance_size,
                            content_range_instance_size)) {
     return false;
   }
   return true;
 }
 
 }  // namespace webkit_glue