Index: net/http/http_stream_factory.h |
=================================================================== |
--- net/http/http_stream_factory.h (revision 124201) |
+++ net/http/http_stream_factory.h (working copy) |
@@ -15,6 +15,7 @@ |
#include "net/base/completion_callback.h" |
#include "net/base/load_states.h" |
#include "net/base/net_export.h" |
+#include "net/http/http_server_properties.h" |
#include "net/socket/ssl_client_socket.h" |
class GURL; |
@@ -229,12 +230,9 @@ |
// Check if a HostPortPair is excluded from using spdy. |
static bool HasSpdyExclusion(const HostPortPair& endpoint); |
- // Sets the next protocol negotiation value used during the SSL handshake. |
- static void set_next_protos(const std::vector<std::string>& value) { |
- if (!next_protos_) |
- next_protos_ = new std::vector<std::string>; |
- *next_protos_ = value; |
- } |
+ // Sets the protocols supported by NPN (next protocol negotiation) during the |
+ // SSL handshake as well as by HTTP Alternate-Protocol. |
+ static void SetNextProtos(const std::vector<std::string>& value); |
static bool has_next_protos() { return next_protos_ != NULL; } |
static const std::vector<std::string>& next_protos() { |
return *next_protos_; |
@@ -274,6 +272,7 @@ |
static const HostMappingRules* host_mapping_rules_; |
static std::vector<std::string>* next_protos_; |
+ static bool enabled_protocols_[NUM_ALTERNATE_PROTOCOLS]; |
static bool spdy_enabled_; |
static bool use_alternate_protocols_; |
static bool force_spdy_over_ssl_; |