diff options
| author |  Craig Tiller <ctiller@google.com> | 2015-04-30 09:38:31 -0700 |
|---|---|---|
| committer | Craig Tiller <ctiller@google.com> | 2015-04-30 09:38:31 -0700 |
| commit | 94d7f8542c704bc3ab4cb46e817513aa0ced9f99 (patch) | |
| tree | 005ae345d107c0f5c7e76353354b1616e41e36ac /src | |
| parent | 581737ce2764b5752a0cd5c8df9e880ecf348fe1 (diff) | |
| parent | 6d42a73bb984e19eb1bf84e2a952eec861cea464 (diff) | |
Merge github.com:grpc/grpc into delete-the-old-api
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/iomgr/tcp_windows.c | 2 | ||||
| -rw-r--r-- | src/node/src/client.js | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/core/iomgr/tcp_windows.c b/src/core/iomgr/tcp_windows.c index 71534eaa3d..940cd5bcde 100644 --- a/src/core/iomgr/tcp_windows.c +++ b/src/core/iomgr/tcp_windows.c @@ -289,7 +289,7 @@ static grpc_endpoint_write_status win_write(grpc_endpoint *ep, return ret; } - memset(&socket->write_info, 0, sizeof(OVERLAPPED)); + memset(&socket->write_info.overlapped, 0, sizeof(OVERLAPPED)); status = WSASend(socket->socket, buffers, tcp->write_slices.count, &bytes_sent, 0, &socket->write_info.overlapped, NULL); if (allocated) gpr_free(allocated); diff --git a/src/node/src/client.js b/src/node/src/client.js index fad369c2f8..b2b79e8b70 100644 --- a/src/node/src/client.js +++ b/src/node/src/client.js @@ -488,6 +488,7 @@ function makeClientConstructor(methods) { callback(null, metadata); }; } + this.server_address = address; this.channel = new grpc.Channel(address, options); } |