git://git.exim.org
/
exim.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
54f3613
)
Revert "Testsuite: limited support for Content-length:"
author
Jeremy Harris
<jgh146exb@wizmail.org>
Sat, 16 Jun 2018 13:45:32 +0000
(14:45 +0100)
committer
Jeremy Harris
<jgh146exb@wizmail.org>
Tue, 26 Jun 2018 11:02:27 +0000
(12:02 +0100)
This reverts commit
f6f239461fd62b3a4f3142b6b2a85f8f65eee486
.
test/src/server.c
patch
|
blob
|
history
diff --git
a/test/src/server.c
b/test/src/server.c
index d433ebe0e0331f1f0cbd4fb04027eb99d9249568..719350c15b47237d64264f0986356891aa9d741a 100644
(file)
--- a/
test/src/server.c
+++ b/
test/src/server.c
@@
-519,11
+519,6
@@
s = script;
for (count = 0; count < connection_count; count++)
{
for (count = 0; count < connection_count; count++)
{
- struct {
- int left;
- BOOL in_use;
- } content_length = { 0, FALSE };
-
alarm(timeout);
if (port <= 0)
{
alarm(timeout);
if (port <= 0)
{
@@
-734,7
+729,6
@@
for (count = 0; count < connection_count; count++)
alarm(timeout);
n = read(dup_accept_socket, CS buffer+offset, s->len - offset);
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",
if (n == 0)
{
printf("%sxpected EOF read from client\n",
@@
-752,9
+746,8
@@
for (count = 0; count < connection_count; count++)
if (data) do
{
n = (read(dup_accept_socket, &c, 1) == 1 && c == '.');
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)
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)
{
} while (!n);
else if (memcmp(ss, buffer, n) != 0)
{
@@
-777,8
+770,7
@@
for (count = 0; count < connection_count; count++)
goto END_OFF;
}
alarm(0);
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);
while (n > 0 && isspace(buffer[n-1])) n--;
buffer[n] = 0;
printf("%s\n", buffer);
@@
-792,11
+784,6
@@
for (count = 0; count < connection_count; count++)
break;
}
}
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);
}
}
}
}