Make proxy fallback logic more captive-portal friendly,

net/http/http_stream_factory_impl_job.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 "net/http/http_stream_factory_impl_job.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 1157 matching lines @@
   // to proxy servers.  The hostname in those URLs might fail to resolve if we
   // are still using a non-proxy config.  We need to check if a proxy config
   // now exists that corresponds to a proxy server that could load the URL.
   //
   switch (error) {
     case ERR_PROXY_CONNECTION_FAILED:
     case ERR_NAME_NOT_RESOLVED:
     case ERR_INTERNET_DISCONNECTED:
     case ERR_ADDRESS_UNREACHABLE:
     case ERR_CONNECTION_CLOSED:
+    case ERR_CONNECTION_TIMED_OUT:
     case ERR_CONNECTION_RESET:
     case ERR_CONNECTION_REFUSED:
     case ERR_CONNECTION_ABORTED:
     case ERR_TIMED_OUT:
     case ERR_TUNNEL_CONNECTION_FAILED:
     case ERR_SOCKS_CONNECTION_FAILED:
+    // This can happen in the case of trying to use an HTTPS proxy while behind

[eroman, 2013/02/14 00:03:47]

Please word this differently. "HTTPS proxy" can mean 1 of two things:

  - An HTTP proxy for https:// URLs
  - A spdy proxy (proxy scheme=https)

[mmenke, 2013/02/14 00:28:11]

Wait..."An HTTP proxy for https:// URLs"?  Not an "HTTP proxy layered on top of
SSL (ie. HTTPS) for either HTTP or HTTPS urls?"

If it's actually the second, it applies to both cases.

[mmenke, 2013/02/14 00:52:39]

I've updated it to be neutral ("Talking to a proxy using SSL").

+    // a captive portal that supports SSL.
+    case ERR_PROXY_CERTIFICATE_INVALID:
+    // This can happen when trying to talk SSL to a non-SSL server (Like a
+    // captive portal).
+    case ERR_SSL_PROTOCOL_ERROR:
       break;
     case ERR_SOCKS_CONNECTION_HOST_UNREACHABLE:
       // Remap the SOCKS-specific "host unreachable" error to a more
       // generic error code (this way consumers like the link doctor
       // know to substitute their error page).
       //
-      // Note that if the host resolving was done by the SOCSK5 proxy, we can't
+      // Note that if the host resolving was done by the SOCKS5 proxy, we can't

[eroman, 2013/02/14 00:03:47]

hah!

       // differentiate between a proxy-side "host not found" versus a proxy-side
       // "address unreachable" error, and will report both of these failures as
       // ERR_ADDRESS_UNREACHABLE.
       return ERR_ADDRESS_UNREACHABLE;
     default:
       return error;
   }
 
   if (request_info_.load_flags & LOAD_BYPASS_PROXY) {
     return error;
@@ skipping 129 matching lines @@
       (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH |
        net::LOAD_IS_DOWNLOAD)) {
     // Avoid pipelining resources that may be streamed for a long time.
     return false;
   }
   return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining(
       *http_pipelining_key_.get());
 }
 
 }  // namespace net