Ignore EPIPE/ECONNRESET after SSL_shutdown (thx patdk-wk for reporting)

git-svn-id: svn://svn.lighttpd.net/lighttpd/branches/lighttpd-1.4.x@2849 152afb58-edef-0310-8abb-c4023f1b3aa9
This commit is contained in:
Stefan Bühler 2012-11-06 17:14:37 +00:00
parent 6c9d257742
commit db1d977dea
2 changed files with 11 additions and 3 deletions

1
NEWS
View File

@ -5,6 +5,7 @@ NEWS
- 1.4.32 -
* Code cleanup with clang/sparse (fixes #2437, thx kibi)
* Ignore EPIPE/ECONNRESET after SSL_shutdown
- 1.4.31 - 2012-05-31
* [ssl] fix segfault in counting renegotiations for openssl versions without TLSEXT/SNI (thx carpii for reporting)

View File

@ -1712,11 +1712,18 @@ int connection_state_machine(server *srv, connection *con) {
ERR_error_string(err, NULL));
} while((err = ERR_get_error()));
} else if (errno != 0) { /* ssl bug (see lighttpd ticket #2213): sometimes errno == 0 */
log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):",
switch(errno) {
case EPIPE:
case ECONNRESET:
break;
default:
log_error_write(srv, __FILE__, __LINE__, "sddds", "SSL (error):",
ssl_r, ret, errno,
strerror(errno));
break;
}
}
break;
default:
while((err = ERR_get_error())) {
@ -1724,7 +1731,7 @@ int connection_state_machine(server *srv, connection *con) {
ssl_r, ret,
ERR_error_string(err, NULL));
}
break;
}
}