Merge 1.3.0 changes back to master.
This commit is contained in:
commit
d20b385834
@ -133,7 +133,7 @@ void guacd_log_guac_error(guac_client_log_level level, const char* message) {
|
|||||||
void guacd_log_handshake_failure() {
|
void guacd_log_handshake_failure() {
|
||||||
|
|
||||||
if (guac_error == GUAC_STATUS_CLOSED)
|
if (guac_error == GUAC_STATUS_CLOSED)
|
||||||
guacd_log(GUAC_LOG_INFO,
|
guacd_log(GUAC_LOG_DEBUG,
|
||||||
"Guacamole connection closed during handshake");
|
"Guacamole connection closed during handshake");
|
||||||
else if (guac_error == GUAC_STATUS_PROTOCOL_ERROR)
|
else if (guac_error == GUAC_STATUS_PROTOCOL_ERROR)
|
||||||
guacd_log(GUAC_LOG_ERROR,
|
guacd_log(GUAC_LOG_ERROR,
|
||||||
|
@ -100,7 +100,7 @@ static void guac_user_log_guac_error(guac_user* user,
|
|||||||
static void guac_user_log_handshake_failure(guac_user* user) {
|
static void guac_user_log_handshake_failure(guac_user* user) {
|
||||||
|
|
||||||
if (guac_error == GUAC_STATUS_CLOSED)
|
if (guac_error == GUAC_STATUS_CLOSED)
|
||||||
guac_user_log(user, GUAC_LOG_INFO,
|
guac_user_log(user, GUAC_LOG_DEBUG,
|
||||||
"Guacamole connection closed during handshake");
|
"Guacamole connection closed during handshake");
|
||||||
else if (guac_error == GUAC_STATUS_PROTOCOL_ERROR)
|
else if (guac_error == GUAC_STATUS_PROTOCOL_ERROR)
|
||||||
guac_user_log(user, GUAC_LOG_ERROR,
|
guac_user_log(user, GUAC_LOG_ERROR,
|
||||||
|
Loading…
Reference in New Issue
Block a user