From dcf06dc4e230f12af31ec510f69d0d6ed3f63ace Mon Sep 17 00:00:00 2001
From: Michael Jumper <zhangmaike@users.sourceforge.net>
Date: Sun, 12 Sep 2010 00:39:01 -0700
Subject: [PATCH] Fixed instruction stream

---
 guacamole/client/web/javascript/guacamole.js | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/guacamole/client/web/javascript/guacamole.js b/guacamole/client/web/javascript/guacamole.js
index 17782461d..309de56d4 100644
--- a/guacamole/client/web/javascript/guacamole.js
+++ b/guacamole/client/web/javascript/guacamole.js
@@ -295,18 +295,15 @@ function VNCClient(display) {
 
         var nextRequest = null;
 
-        function startNextRequest() {
-            nextRequest = makeRequest();
-        }
-
-        // Start next request in 2 seconds.
-        setTimeout(startNextRequest, 2000);
-
         var instructionStart = 0;
         var startIndex = 0;
 
         function parseResponse() {
 
+            // Start next request as soon as possible
+            if (xmlhttprequest.readyState >= 2 && nextRequest == null)
+                nextRequest = makeRequest();
+
             // Parse stream when data is received and when complete.
             if (xmlhttprequest.readyState == 3 ||
                 xmlhttprequest.readyState == 4) {
@@ -379,11 +376,13 @@ function VNCClient(display) {
     }
 
 
+    var seq = 0;
+
     function makeRequest() {
 
         // Download self
         var xmlhttprequest = new XMLHttpRequest();
-        xmlhttprequest.open("GET", "instructions");
+        xmlhttprequest.open("GET", "instructions?seq=" + (seq++));
 
         xmlhttprequest.send(null); 
         return xmlhttprequest;