diff options
author | Fedor Indutny <fedor.indutny@gmail.com> | 2013-12-10 23:06:56 +0400 |
---|---|---|
committer | Fedor Indutny <fedor.indutny@gmail.com> | 2013-12-10 23:06:56 +0400 |
commit | 1e066e4a4a88f97af865d965f104b5fe8136797f (patch) | |
tree | 8dc3bb7aeb4c58abcf356bcdb9985b6f810b425a /src/tls_wrap.h | |
parent | c17449df1675e482fc0350a27bc08b1b22ed261c (diff) | |
parent | 4a2792cd2f86403a71edf65d82600b6aad5713bf (diff) | |
download | android-node-v8-1e066e4a4a88f97af865d965f104b5fe8136797f.tar.gz android-node-v8-1e066e4a4a88f97af865d965f104b5fe8136797f.tar.bz2 android-node-v8-1e066e4a4a88f97af865d965f104b5fe8136797f.zip |
Merge branch 'v0.10'
Conflicts:
lib/tls.js
src/node_crypto.cc
src/node_crypto.h
Diffstat (limited to 'src/tls_wrap.h')
-rw-r--r-- | src/tls_wrap.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/tls_wrap.h b/src/tls_wrap.h index 9e42d4bd37..2b10e09bca 100644 --- a/src/tls_wrap.h +++ b/src/tls_wrap.h @@ -66,7 +66,7 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>, int DoShutdown(ShutdownWrap* req_wrap, uv_shutdown_cb cb); protected: - static const int kClearOutChunkSize = 16384; // 16kb + static const int kClearOutChunkSize = 1024; // Maximum number of buffers passed to uv_write() static const int kSimultaneousBufferCount = 10; @@ -137,6 +137,10 @@ class TLSCallbacks : public crypto::SSLWrap<TLSCallbacks>, bool established_; bool shutdown_; + // If true - delivered EOF to the js-land, either after `close_notify`, or + // after the `UV_EOF` on socket. + bool eof_; + #ifdef SSL_CTRL_SET_TLSEXT_SERVERNAME_CB v8::Persistent<v8::Value> sni_context_; #endif // SSL_CTRL_SET_TLSEXT_SERVERNAME_CB |