diff --git a/doc/admin-guide/monitoring/statistics/core/ssl.en.rst b/doc/admin-guide/monitoring/statistics/core/ssl.en.rst index 9e37e9f8f4b..2c2b60c172b 100644 --- a/doc/admin-guide/monitoring/statistics/core/ssl.en.rst +++ b/doc/admin-guide/monitoring/statistics/core/ssl.en.rst @@ -74,9 +74,6 @@ SSL/TLS The number of SSL connections to origin servers which were terminated due to unsupported SSL/TLS protocol versions, since statistics collection began. -.. ts:stat:: global proxy.process.ssl.ssl_error_read_eos integer - :type: counter - .. ts:stat:: global proxy.process.ssl.ssl_error_ssl integer :type: counter @@ -229,4 +226,3 @@ SSL/TLS Incoming client SSL connections terminated due to an unsupported or disabled version of SSL/TLS, since statistics collection began. - diff --git a/iocore/net/SSLNetVConnection.cc b/iocore/net/SSLNetVConnection.cc index a8d35a3bfda..7a700b699fc 100644 --- a/iocore/net/SSLNetVConnection.cc +++ b/iocore/net/SSLNetVConnection.cc @@ -306,15 +306,14 @@ ssl_read_from_net(SSLNetVConnection *sslvc, EThread *lthread, int64_t &ret) Debug("ssl.error", "SSL_ERROR_WOULD_BLOCK(read/x509 lookup)"); break; case SSL_ERROR_SYSCALL: - SSL_INCREMENT_DYN_STAT(ssl_error_syscall); if (nread != 0) { // not EOF + SSL_INCREMENT_DYN_STAT(ssl_error_syscall); event = SSL_READ_ERROR; ret = errno; Debug("ssl.error", "SSL_ERROR_SYSCALL, underlying IO error: %s", strerror(errno)); } else { // then EOF observed, treat it as EOS - // Error("[SSL_NetVConnection::ssl_read_from_net] SSL_ERROR_SYSCALL, EOF observed violating SSL protocol"); event = SSL_READ_EOS; } break; diff --git a/iocore/net/SSLStats.cc b/iocore/net/SSLStats.cc index b97a92244d0..e3ef2b69b3f 100644 --- a/iocore/net/SSLStats.cc +++ b/iocore/net/SSLStats.cc @@ -184,8 +184,6 @@ SSLInitializeStatistics() // error stats RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_syscall", RECD_COUNTER, RECP_PERSISTENT, (int)ssl_error_syscall, RecRawStatSyncCount); - RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_read_eos", RECD_COUNTER, RECP_PERSISTENT, - (int)ssl_error_read_eos, RecRawStatSyncCount); RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_ssl", RECD_COUNTER, RECP_PERSISTENT, (int)ssl_error_ssl, RecRawStatSyncCount); RecRegisterRawStat(ssl_rsb, RECT_PROCESS, "proxy.process.ssl.ssl_error_async", RECD_COUNTER, RECP_PERSISTENT, diff --git a/iocore/net/SSLStats.h b/iocore/net/SSLStats.h index dafca9d6e40..9a3bd2f820e 100644 --- a/iocore/net/SSLStats.h +++ b/iocore/net/SSLStats.h @@ -88,7 +88,6 @@ enum SSL_Stats { /* error stats */ ssl_error_syscall, - ssl_error_read_eos, ssl_error_ssl, ssl_error_async, ssl_sni_name_set_failure,