unbreak test: s/log_write/logwrite/

[users/heiko/exim.git] / test / src / server.c

diff --git a/test/src/server.c b/test/src/server.c
index 719350c15b47237d64264f0986356891aa9d741a..d433ebe0e0331f1f0cbd4fb04027eb99d9249568 100644 (file)
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -519,6 +519,11 @@ s = script;
 
 for (count = 0; count < connection_count; count++)
   {
+  struct {
+    int left;
+    BOOL in_use;
+  } content_length = { 0, FALSE };
+
   alarm(timeout);
   if (port <= 0)
     {
@@ -729,6 +734,7 @@ for (count = 0; count < connection_count; count++)
 
        alarm(timeout);
        n = read(dup_accept_socket, CS buffer+offset, s->len - offset);
+       if (content_length.in_use) content_length.left -= n;
        if (n == 0)
          {
          printf("%sxpected EOF read from client\n",
@@ -746,8 +752,9 @@ for (count = 0; count < connection_count; count++)
        if (data) do
          {
          n = (read(dup_accept_socket, &c, 1) == 1 && c == '.');
+         if (content_length.in_use) content_length.left--;
          while (c != '\n' && read(dup_accept_socket, &c, 1) == 1)
-           ;
+            if (content_length.in_use) content_length.left--;
          } while (!n);
        else if (memcmp(ss, buffer, n) != 0)
          {
@@ -770,7 +777,8 @@ for (count = 0; count < connection_count; count++)
            goto END_OFF;
            }
          alarm(0);
-         n = (int)strlen(CS buffer);
+         n = strlen(CS buffer);
+         if (content_length.in_use) content_length.left -= (n - offset);
          while (n > 0 && isspace(buffer[n-1])) n--;
          buffer[n] = 0;
          printf("%s\n", buffer);
@@ -784,6 +792,11 @@ for (count = 0; count < connection_count; count++)
          break;
          }
        }
+
+       if (sscanf(CCS buffer, "<Content-length: %d", &content_length.left))
+                 content_length.in_use = TRUE;
+       if (content_length.in_use && content_length.left <= 0)
+         shutdown(dup_accept_socket, SHUT_RD);
       }
     }