This is an automated email from the ASF dual-hosted git repository.
mjumper pushed a change to branch patch
in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
from d59e5d7f Merge 1.6.0 changes back to patch.
add dd1ce3a5 GUACAMOLE-1980: Bump server version to 1.6.0.
add ae790945 GUACAMOLE-1980: Merge server version bump to 1.6.0.
add 54fb919a GUACAMOLE-600: Correct handling of non-blocking socket for
timeout.
add ac6f03d0 GUACAMOLE-600: Merge correction to handling of non-blocking
socket for timeout.
add 8d842450 Merge 1.6.0 changes back to patch.
No new revisions were added by this update.
Summary of changes:
bin/guacctl | 2 +-
configure.ac | 2 +-
src/libguac/tcp.c | 75 ++++++++++++++++++++++++++++++++++++++++++-------------
3 files changed, 59 insertions(+), 20 deletions(-)