diff options
| author | lethality <lee@lethality.me.uk> | 2014-02-18 22:24:24 +0000 |
|---|---|---|
| committer | lethality <lee@lethality.me.uk> | 2014-02-18 22:24:24 +0000 |
| commit | 5933a5e9b1ade9f926145b67e557b87ae6dd6e8f (patch) | |
| tree | 41c9c8b4c1818531251c292ce184601a8721aed4 /src | |
| parent | f1c5c27f3fda90265d5da8205db1bdd4d12c9851 (diff) | |
| parent | 109d8f431f3d25d56570a6aaa1af957867bbb80e (diff) | |
Merge remote branch 'upstream/2.0' into 2.0
Diffstat (limited to 'src')
| -rw-r--r-- | src/socket_transport.cpp | 2 | ||||
| -rw-r--r-- | src/sockets.cpp | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/src/socket_transport.cpp b/src/socket_transport.cpp index 6293ea385..1476d0662 100644 --- a/src/socket_transport.cpp +++ b/src/socket_transport.cpp @@ -167,6 +167,8 @@ bool BinarySocket::ProcessWrite() void BinarySocket::Write(const char *buffer, size_t l) { + if (l == 0) + return; this->write_buffer.push_back(new DataBlock(buffer, l)); SocketEngine::Change(this, true, SF_WRITABLE); } diff --git a/src/sockets.cpp b/src/sockets.cpp index 948f3e238..f50092744 100644 --- a/src/sockets.cpp +++ b/src/sockets.cpp @@ -517,7 +517,7 @@ ListenSocket::ListenSocket(const Anope::string &bindip, int port, bool i) { this->SetBlocking(false); - const char op = 1; + int op = 1; setsockopt(this->GetFD(), SOL_SOCKET, SO_REUSEADDR, &op, sizeof(op)); this->bindaddr.pton(i ? AF_INET6 : AF_INET, bindip, port); |