This is an automated email from the ASF dual-hosted git repository. mjumper pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/guacamole-server.git
commit d44815d789ad9216dbd3d3fbe3b3df3819dd7800 Merge: eae24284 171219c9 Author: Mike Jumper <[email protected]> AuthorDate: Wed Aug 30 14:53:43 2023 -0700 Merge 1.5.4 changes back to master. src/guacd/daemon.c | 3 +- src/guacd/proc.c | 3 +- src/libguac/Makefile.am | 4 +- src/libguac/client.c | 71 +++++++++++----------- src/libguac/guacamole/client.h | 6 +- .../{reentrant-rwlock.h => guacamole/rwlock.h} | 53 ++++++++-------- src/libguac/{reentrant-rwlock.c => rwlock.c} | 50 ++++++++++----- 7 files changed, 103 insertions(+), 87 deletions(-)
