diff options
author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 00:20:36 +0000 |
---|---|---|
committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-17 00:20:36 +0000 |
commit | f7c255ea1def87601d233ca1cdd64da6d2543232 (patch) | |
tree | 07e269e5871f01193542263415deecf47f309d98 /net/tools/flip_server | |
parent | 948ef5ad51b031190496722b5ccd93d50320829a (diff) | |
download | chromium_src-f7c255ea1def87601d233ca1cdd64da6d2543232.zip chromium_src-f7c255ea1def87601d233ca1cdd64da6d2543232.tar.gz chromium_src-f7c255ea1def87601d233ca1cdd64da6d2543232.tar.bz2 |
Revert "Switch to BoringSSL."
This reverts commit 283542.
This broke the WebView Android build.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@283591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/tools/flip_server')
-rw-r--r-- | net/tools/flip_server/acceptor_thread.cc | 1 | ||||
-rw-r--r-- | net/tools/flip_server/spdy_ssl.cc | 2 |
2 files changed, 0 insertions, 3 deletions
diff --git a/net/tools/flip_server/acceptor_thread.cc b/net/tools/flip_server/acceptor_thread.cc index 2b65e5d..5dfece1 100644 --- a/net/tools/flip_server/acceptor_thread.cc +++ b/net/tools/flip_server/acceptor_thread.cc @@ -4,7 +4,6 @@ #include "net/tools/flip_server/acceptor_thread.h" -#include <errno.h> #include <netinet/in.h> #include <netinet/tcp.h> // For TCP_NODELAY #include <sys/socket.h> diff --git a/net/tools/flip_server/spdy_ssl.cc b/net/tools/flip_server/spdy_ssl.cc index 19ea52e..2a5cb0e 100644 --- a/net/tools/flip_server/spdy_ssl.cc +++ b/net/tools/flip_server/spdy_ssl.cc @@ -80,7 +80,6 @@ void InitSSL(SSLState* state, SSL_CTX_set_mode(state->ssl_ctx, SSL_MODE_RELEASE_BUFFERS); #endif -#if !defined(OPENSSL_IS_BORINGSSL) // Proper methods to disable compression don't exist until 0.9.9+. For now // we must manipulate the stack of compression methods directly. if (disable_ssl_compression) { @@ -91,7 +90,6 @@ void InitSSL(SSLState* state, static_cast<void>(sk_SSL_COMP_delete(ssl_comp_methods, i)); } } -#endif } SSL* CreateSSLContext(SSL_CTX* ssl_ctx) { |