summaryrefslogtreecommitdiff
path: root/src/tls_wrap.cc
diff options
context:
space:
mode:
authorBen Noordhuis <info@bnoordhuis.nl>2013-09-03 00:42:59 +0200
committerBen Noordhuis <info@bnoordhuis.nl>2013-09-03 01:17:58 +0200
commited8d97f572fab15025da0c762e5edfbcbe45f425 (patch)
treeca92b0ac08b5ebc14848883e4cba4e1edc9dd46b /src/tls_wrap.cc
parent185c515c9febf2229ed2ac76bfdd0c767ea7fd43 (diff)
downloadnode-new-ed8d97f572fab15025da0c762e5edfbcbe45f425.tar.gz
uv: upgrade to v0.11.12
* upgrade deps/uv/ to v0.11.12. * update files in src/ after a libuv API change.
Diffstat (limited to 'src/tls_wrap.cc')
-rw-r--r--src/tls_wrap.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/tls_wrap.cc b/src/tls_wrap.cc
index f2e27ee88f..cff2cded8c 100644
--- a/src/tls_wrap.cc
+++ b/src/tls_wrap.cc
@@ -512,16 +512,17 @@ void TLSCallbacks::AfterWrite(WriteWrap* w) {
}
-uv_buf_t TLSCallbacks::DoAlloc(uv_handle_t* handle, size_t suggested_size) {
- size_t size = suggested_size;
- char* data = NodeBIO::FromBIO(enc_in_)->PeekWritable(&size);
- return uv_buf_init(data, size);
+void TLSCallbacks::DoAlloc(uv_handle_t* handle,
+ size_t suggested_size,
+ uv_buf_t* buf) {
+ buf->base = NodeBIO::FromBIO(enc_in_)->PeekWritable(&suggested_size);
+ buf->len = suggested_size;
}
void TLSCallbacks::DoRead(uv_stream_t* handle,
ssize_t nread,
- uv_buf_t buf,
+ const uv_buf_t* buf,
uv_handle_type pending) {
if (nread < 0) {
// Error should be emitted only after all data was read