Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140918-1' into staging

vnc: set TCP_NODELAY, cleanup in tlc code

# gpg: Signature made Thu 18 Sep 2014 07:02:37 BST using RSA key ID D3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* remotes/kraxel/tags/pull-vnc-20140918-1:
  vnc-tls: Clean up dead store in vnc_set_x509_credential()
  ui/vnc: set TCP_NODELAY

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

2 files changed, 1 insertions, 2 deletions

diff --git a/ui/vnc-tls.c b/ui/vnc-tls.c
index 6392326..0f59f9b 100644
--- a/ui/vnc-tls.c
+++ b/ui/vnc-tls.c
@@ -444,8 +444,6 @@ static int vnc_set_x509_credential(VncDisplay *vd,
     struct stat sb;
 
     g_free(*cred);
-    *cred = NULL;
-
     *cred = g_malloc(strlen(certdir) + strlen(filename) + 2);
 
     strcpy(*cred, certdir);
diff --git a/ui/vnc.c b/ui/vnc.c
index f8d9b7d..0fe6eff 100644
--- a/ui/vnc.c
+++ b/ui/vnc.c
@@ -2914,6 +2914,7 @@ static void vnc_listen_read(void *opaque, bool websocket)
     }
 
     if (csock != -1) {
+        socket_set_nodelay(csock);
         vnc_connect(vs, csock, false, websocket);
     }
 }