connection-monitor: always log disconnect when enabled

This makes verifying easier and makes us more sure curl closes the
connection only at the correct point in time. Adjusted test 206 and 1008
accordingly and updated the docs for it.
This commit is contained in:
Daniel Stenberg 2012-07-11 23:49:01 +02:00
parent 85ce195f75
commit 685366006c
4 changed files with 5 additions and 7 deletions

View File

@ -135,12 +135,7 @@ rtp: part [num] channel [num] size [num]
with the given payload size
connection-monitor When used, this will log [DISCONNECT] to the server.input
log if the connection is disconnected while the given request
is handled. Note that if the connection isn't disconnected and
the server loops and waits for the next request on the
persistent connection then the internal boolean for connection
monitoring will be reset to default and if then the connection
gets discconected nothing will be output.
log when the connection is disconnected.
</servercmd>
</reply>

View File

@ -124,6 +124,7 @@ User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6
Host: test.remote.example.com:1008
Accept: */*
[DISCONNECT]
</protocol>
</verify>
</testcase>

View File

@ -98,6 +98,7 @@ User-Agent: curl/7.12.3-CVS (i686-pc-linux-gnu) libcurl/7.12.3-CVS OpenSSL/0.9.6
Host: test.remote.haxx.se:206
Accept: */*
[DISCONNECT]
</protocol>
</verify>
</testcase>

View File

@ -347,6 +347,8 @@ static int parse_servercmd(struct httprequest *req)
return 1; /* done */
}
req->connmon = FALSE;
cmd = orgcmd;
while(cmd && cmdsize) {
char *check;
@ -837,7 +839,6 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
req->pipelining = FALSE;
req->callcount = 0;
req->connect_port = 0;
req->connmon = FALSE;
/*** end of httprequest init ***/