CLEANUP: connection: properly name the CO_ER_SSL_FATAL enum entry
It was the only one prefixed with "CO_ERR_", making it harder to batch
process and to look up. It was added in 2.5 by commit 61944f7a73
("MINOR:
ssl: Set connection error code in case of SSL read or write fatal failure")
so it can be backported as far as 2.6 if needed to help integrate other
patches.
(cherry picked from commit 393957908bf492ff6660fba239106f0da7988fe8)
Signed-off-by: Christopher Faulet <cfaulet@haproxy.com>
This commit is contained in:
parent
79abc12539
commit
c91c678b12
@ -238,7 +238,7 @@ enum {
|
||||
CO_ER_SOCKS4_DENY, /* SOCKS4 Proxy deny the request */
|
||||
CO_ER_SOCKS4_ABORT, /* SOCKS4 Proxy handshake aborted by server */
|
||||
|
||||
CO_ERR_SSL_FATAL, /* SSL fatal error during a SSL_read or SSL_write */
|
||||
CO_ER_SSL_FATAL, /* SSL fatal error during a SSL_read or SSL_write */
|
||||
|
||||
CO_ER_REVERSE, /* Error during reverse connect */
|
||||
};
|
||||
|
@ -755,7 +755,7 @@ const char *conn_err_code_str(struct connection *c)
|
||||
case CO_ER_SOCKS4_DENY: return "SOCKS4 Proxy deny the request";
|
||||
case CO_ER_SOCKS4_ABORT: return "SOCKS4 Proxy handshake aborted by server";
|
||||
|
||||
case CO_ERR_SSL_FATAL: return "SSL fatal error";
|
||||
case CO_ER_SSL_FATAL: return "SSL fatal error";
|
||||
|
||||
case CO_ER_REVERSE: return "Reverse connect failure";
|
||||
}
|
||||
|
@ -6442,7 +6442,7 @@ static size_t ssl_sock_to_buf(struct connection *conn, void *xprt_ctx, struct bu
|
||||
struct ssl_sock_ctx *ctx = conn_get_ssl_sock_ctx(conn);
|
||||
if (ctx && !ctx->error_code)
|
||||
ctx->error_code = ERR_peek_error();
|
||||
conn->err_code = CO_ERR_SSL_FATAL;
|
||||
conn->err_code = CO_ER_SSL_FATAL;
|
||||
}
|
||||
/* For SSL_ERROR_SYSCALL, make sure to clear the error
|
||||
* stack before shutting down the connection for
|
||||
@ -6618,7 +6618,7 @@ static size_t ssl_sock_from_buf(struct connection *conn, void *xprt_ctx, const s
|
||||
|
||||
if (ctx && !ctx->error_code)
|
||||
ctx->error_code = ERR_peek_error();
|
||||
conn->err_code = CO_ERR_SSL_FATAL;
|
||||
conn->err_code = CO_ER_SSL_FATAL;
|
||||
}
|
||||
goto out_error;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user