walkero
/
nghttp2
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

Revert "nghttpx: Attempt to avoid TCP RST on socket closure on Linux" 

This reverts commit f69b52b1aa.
This commit is contained in:
Tatsuhiro Tsujikawa 2017-03-18 22:43:30 +09:00
parent 9b5ce36368
commit 26900262f3
1 changed files with 1 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/shrpx_connection.cc
View File

@ -126,20 +126,7 @@ void Connection::disconnect() {
}
if (fd != -1) {
// At least for Linux, shutdown both sides, and continue to read
// until it gets EOF or error in order to avoid TCP RST.
shutdown(fd, SHUT_RDWR);
#ifdef __linux__
std::array<uint8_t, 16_k> b;
for (;;) {
ssize_t n;
while ((n = read(fd, b.data(), b.size())) == -1 && errno == EINTR)
;
if (n <= 0) {
break;
}
}
#endif // __linux__
shutdown(fd, SHUT_WR);
close(fd);
fd = -1;
}