Changes in benchmark/io/http/protocol.cfa [644162a:a7026b4]

File:

• benchmark/io/http/protocol.cfa (modified) (5 diffs)

benchmark/io/http/protocol.cfa

@@ -332 +332 @@
         wait(this.f);
 
+        // Did something crazy happen?
+        if(this.f.result > this.len) {
+                mutex(serr) serr | "SPLICE IN spliced too much!";
+                return error(this.res, -ERANGE);
+        }
+
         // Something failed?
         if(this.f.result < 0) {
@@ -345 +351 @@
                         return error(this.res, -ECONNRESET);
                 }
-        }
-
-        // Did something crazy happen?
-        if(this.f.result > this.len) {
-                mutex(serr) serr | "SPLICE IN spliced too much!";
-                return error(this.res, -ERANGE);
         }
 
@@ -401 +401 @@
         wait(this.f);
 
+        // Did something crazy happen?
+        if(this.f.result > this.len) {
+                mutex(serr) serr | "SPLICE OUT spliced too much!";
+                return error(this.res, -ERANGE);
+        }
+
         // Something failed?
         if(this.f.result < 0) {
@@ -414 +420 @@
                         return error(this, -ECONNRESET);
                 }
-        }
-
-        // Did something crazy happen?
-        if(this.f.result > this.len) {
-                mutex(serr) serr | "SPLICE OUT spliced too much!" | this.f.result | ">" | this.len;
-                return error(this.res, -ERANGE);
         }
 
@@ -544 +544 @@
 const char * original_http_msgs[] = {
         "HTTP/1.1 200 OK\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: ",
-        "HTTP/1.1 200 OK\r\nServer: HttpForall\r\nConnection: keep-alive\r\nContent-Length: 15\r\nContent-Type: text/html\r\nDate: %s \r\n\r\nHello, World!\r\n",
+        "HTTP/1.1 200 OK\r\nServer: HttpForall\r\nDate\r\nConnection: keep-alive\r\nContent-Length: 15\r\nContent-Type: text/html: %s \r\n\r\nHello, World!\r\n",
         "HTTP/1.1 400 Bad Request\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",
         "HTTP/1.1 404 Not Found\nServer: HttpForall\nDate: %s \nContent-Type: text/plain\nContent-Length: 0 \n\n",