X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/0ab63f3dea522591218c0d65c78a686b7fa64db6..590795f4282e84ce9c2730bb17c7e6bb23615966:/test/src/server.c

diff --git a/test/src/server.c b/test/src/server.c
index 4656b02af..719350c15 100644
--- a/test/src/server.c
+++ b/test/src/server.c
@@ -298,7 +298,7 @@ else
       printf("IPv6 socket creation failed: %s\n", strerror(errno));
       exit(1);
       }
-
+#ifdef TCP_FASTOPEN
     if (tfo)
       {
       int backlog = 5;
@@ -306,7 +306,7 @@ else
                     &backlog, sizeof(backlog)))
 	if (debug) printf("setsockopt TCP_FASTOPEN: %s\n", strerror(errno));
       }
-
+#endif
     /* If this is an IPv6 wildcard socket, set IPV6_V6ONLY if that option is
     available. */
 
@@ -330,6 +330,7 @@ else
       printf("IPv4 socket creation failed: %s\n", strerror(errno));
       exit(1);
       }
+#ifdef TCP_FASTOPEN
     if (tfo)
       {
       int backlog = 5;
@@ -337,7 +338,7 @@ else
                     &backlog, sizeof(backlog)))
 	if (debug) printf("setsockopt TCP_FASTOPEN: %s\n", strerror(errno));
       }
-
+#endif
     }
   }
 
@@ -400,7 +401,7 @@ else
       sin6.sin6_addr = anyaddr6;
       if (bind(listen_socket[i], (struct sockaddr *)&sin6, sizeof(sin6)) < 0)
         {
-        printf("IPv6 socket bind() failed: %s\n", strerror(errno));
+        printf("IPv6 socket bind(port %d) failed: %s\n", port, strerror(errno));
         exit(1);
         }
       }
@@ -419,7 +420,7 @@ else
       if (bind(listen_socket[i], (struct sockaddr *)&sin4, sizeof(sin4)) < 0)
         if (listen_socket[v6n] < 0 || errno != EADDRINUSE)
           {
-          printf("IPv4 socket bind() failed: %s\n", strerror(errno));
+          printf("IPv4 socket bind(port %d) failed: %s\n", port, strerror(errno));
           exit(1);
           }
         else
@@ -518,11 +519,6 @@ s = script;
 
 for (count = 0; count < connection_count; count++)
   {
-  struct {
-    int left;
-    BOOL in_use;
-  } content_length = { 0, FALSE };
-
   alarm(timeout);
   if (port <= 0)
     {
@@ -733,7 +729,6 @@ 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",
@@ -751,9 +746,8 @@ 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)
 	  {
@@ -776,8 +770,7 @@ for (count = 0; count < connection_count; count++)
 	    goto END_OFF;
 	    }
 	  alarm(0);
-	  n = strlen(CS buffer);
-	  if (content_length.in_use) content_length.left -= (n - offset);
+	  n = (int)strlen(CS buffer);
 	  while (n > 0 && isspace(buffer[n-1])) n--;
 	  buffer[n] = 0;
 	  printf("%s\n", buffer);
@@ -791,11 +784,6 @@ 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);
       }
     }