Linux: add next-protocol-negotiation to libssl.

net/flip/flip_session.cc

 // Copyright (c) 2009 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/flip/flip_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
@@ skipping 140 matching lines @@
       read_buffer_(new IOBuffer(kReadBufferSize)),
       read_pending_(false),
       stream_hi_water_mark_(1),  // Always start at 1 for the first stream id.
       delayed_write_pending_(false),
       write_pending_(false) {
   // TODO(mbelshe): consider randomization of the stream_hi_water_mark.
 
   flip_framer_.set_visitor(this);
 
   session_->ssl_config_service()->GetSSLConfig(&ssl_config_);
+
+  // In the event that the server supports Next Protocol Negotiation, but
+  // doesn't support either of these protocols, we'll request the first
+  // protocol in the list. Because of that, HTTP is listed first because it's
+  // what we'll actually fallback to in the case that the server doesn't
+  // support SPDY.
+  ssl_config_.next_protos = "\007http1.1\004spdy";

[willchan no longer on Chromium, 2009/11/25 19:48:13]

I don't think this code makes sense here.  We will only be creating a
FlipSession if (1) we are hardcoded to assume the --testing-fixed-server is a
flip capable server (2) we've already done NPN and have selected Flip.

[agl, 2009/11/30 20:24:53]

It doesn't make sense here, it's only a placeholder until the actual protocol
negotiation is working. However, it makes the GFE folk's life easier for the
time being.

I've updated the comment to make this clear.

 }
 
 FlipSession::~FlipSession() {
   // Cleanup all the streams.
   CloseAllStreams(net::ERR_ABORTED);
 
   if (connection_.is_initialized()) {
     // With Flip we can't recycle sockets.
     connection_.socket()->Disconnect();
   }
@@ skipping 682 matching lines @@
     LOG(ERROR) << "Flip stream closed: " << frame->status();
     // TODO(mbelshe): Map from Flip-protocol errors to something sensical.
     //                For now, it doesn't matter much - it is a protocol error.
     stream->OnClose(ERR_FAILED);
   }
 
   DeactivateStream(stream_id);
 }
 
 }  // namespace net