Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(115)

Unified Diff: net/socket/ssl_client_socket_openssl.cc

Issue 5625012: Switch linux OpenSSL build to use custom openssl version (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove the system openssl build rule altogether, depend on third party directly Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/socket/ssl_client_socket_openssl.cc
diff --git a/net/socket/ssl_client_socket_openssl.cc b/net/socket/ssl_client_socket_openssl.cc
index 62e0e724b5be9fbc929fb363f4c3956aa8893d8d..b3690a9bfc1b0d02747ee74f6d05132cecfb6cce 100644
--- a/net/socket/ssl_client_socket_openssl.cc
+++ b/net/socket/ssl_client_socket_openssl.cc
@@ -764,7 +764,7 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out,
unsigned int inlen) {
#if defined(OPENSSL_NPN_NEGOTIATED)
if (ssl_config_.next_protos.empty()) {
- *out = "http/1.1";
+ *out = reinterpret_cast<uint8*>(const_cast<char*>("http/1.1"));
*outlen = 8;
npn_status_ = SSLClientSocket::kNextProtoUnsupported;
return SSL_TLSEXT_ERR_OK;
@@ -790,6 +790,7 @@ int SSLClientSocketOpenSSL::SelectNextProtoCallback(unsigned char** out,
NOTREACHED() << status;
break;
}
+ DVLOG(2) << "next protocol: '" << npn_proto_ << "' status: " << npn_status_;
#endif
return SSL_TLSEXT_ERR_OK;
}
« no previous file with comments | « net/net.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698