diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2012-07-11 23:49:01 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2012-07-12 00:08:37 +0200 |
| commit | 685366006ccff2b4817d2b3b806e62ebdae90a60 (patch) | |
| tree | 4bdf4cd5bbd5c102d569c2f52da0c6d4322282ab | |
| parent | 85ce195f75e16d59840e3de74bc5b2846630cabd (diff) | |
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.
| -rw-r--r-- | tests/FILEFORMAT | 7 | ||||
| -rw-r--r-- | tests/data/test1008 | 1 | ||||
| -rw-r--r-- | tests/data/test206 | 1 | ||||
| -rw-r--r-- | tests/server/sws.c | 3 |
4 files changed, 5 insertions, 7 deletions
diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT index 950465c61..d8c1345a1 100644 --- a/tests/FILEFORMAT +++ b/tests/FILEFORMAT @@ -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> diff --git a/tests/data/test1008 b/tests/data/test1008 index 5c5326668..e576e7197 100644 --- a/tests/data/test1008 +++ b/tests/data/test1008 @@ -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> diff --git a/tests/data/test206 b/tests/data/test206 index 8ca31e34b..b85d7a340 100644 --- a/tests/data/test206 +++ b/tests/data/test206 @@ -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> diff --git a/tests/server/sws.c b/tests/server/sws.c index e1abed613..aaacb3546 100644 --- a/tests/server/sws.c +++ b/tests/server/sws.c @@ -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 ***/ |