You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@guacamole.apache.org by jm...@apache.org on 2018/02/07 05:41:55 UTC
[1/2] guacamole-server git commit: GUACAMOLE-324: Continuously write
chunks of data until entire buffer has been sent.
Repository: guacamole-server
Updated Branches:
refs/heads/master 9ed3baf00 -> 5b58c7e15
GUACAMOLE-324: Continuously write chunks of data until entire buffer has been sent.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/9705b39c
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/9705b39c
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/9705b39c
Branch: refs/heads/master
Commit: 9705b39c2b43910e04cd76e7008fcec9a9b9b4c8
Parents: 1cf86e1
Author: Michael Jumper <mj...@apache.org>
Authored: Tue Feb 6 21:29:31 2018 -0800
Committer: Michael Jumper <mj...@apache.org>
Committed: Tue Feb 6 21:29:31 2018 -0800
----------------------------------------------------------------------
src/libguac/socket-fd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/guacamole-server/blob/9705b39c/src/libguac/socket-fd.c
----------------------------------------------------------------------
diff --git a/src/libguac/socket-fd.c b/src/libguac/socket-fd.c
index e9cce0f..3489852 100644
--- a/src/libguac/socket-fd.c
+++ b/src/libguac/socket-fd.c
@@ -102,10 +102,10 @@ ssize_t guac_socket_fd_write(guac_socket* socket,
#ifdef ENABLE_WINSOCK
/* WSA only works with send() */
- retval = send(data->fd, buf, count, 0);
+ retval = send(data->fd, buffer, count, 0);
#else
/* Use write() for all other platforms */
- retval = write(data->fd, buf, count);
+ retval = write(data->fd, buffer, count);
#endif
/* Record errors in guac_error */
@@ -115,7 +115,7 @@ ssize_t guac_socket_fd_write(guac_socket* socket,
return retval;
}
- /* Advance buffer as data retval */
+ /* Advance buffer to next chunk */
buffer += retval;
count -= retval;
[2/2] guacamole-server git commit: GUACAMOLE-324: Merge buffer write
bug fix.
Posted by jm...@apache.org.
GUACAMOLE-324: Merge buffer write bug fix.
Project: http://git-wip-us.apache.org/repos/asf/guacamole-server/repo
Commit: http://git-wip-us.apache.org/repos/asf/guacamole-server/commit/5b58c7e1
Tree: http://git-wip-us.apache.org/repos/asf/guacamole-server/tree/5b58c7e1
Diff: http://git-wip-us.apache.org/repos/asf/guacamole-server/diff/5b58c7e1
Branch: refs/heads/master
Commit: 5b58c7e15b6ba74b72c1ac3ebaaad22476259583
Parents: 9ed3baf 9705b39
Author: James Muehlner <ja...@guac-dev.org>
Authored: Tue Feb 6 21:38:27 2018 -0800
Committer: James Muehlner <ja...@guac-dev.org>
Committed: Tue Feb 6 21:38:27 2018 -0800
----------------------------------------------------------------------
src/libguac/socket-fd.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------