Merge branch 'rraptorr-unix-tcp-nodelay'

This commit is contained in:
Tatsuhiro Tsujikawa 2015-09-23 19:55:57 +09:00
commit fec7ef61d3
1 changed files with 5 additions and 5 deletions

View File

@ -721,12 +721,12 @@ ClientHandler *accept_connection(Worker *worker, int fd, sockaddr *addr,
return nullptr; return nullptr;
} }
int val = 1; if (addr->sa_family != AF_UNIX) {
rv = setsockopt(fd, IPPROTO_TCP, TCP_NODELAY, reinterpret_cast<char *>(&val), rv = util::make_socket_nodelay(fd);
sizeof(val));
if (rv == -1) { if (rv == -1) {
LOG(WARN) << "Setting option TCP_NODELAY failed: errno=" << errno; LOG(WARN) << "Setting option TCP_NODELAY failed: errno=" << errno;
} }
}
SSL *ssl = nullptr; SSL *ssl = nullptr;
auto ssl_ctx = worker->get_sv_ssl_ctx(); auto ssl_ctx = worker->get_sv_ssl_ctx();
if (ssl_ctx) { if (ssl_ctx) {