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.

diff --git a/tests/FILEFORMAT b/tests/FILEFORMAT
index 950465c61b6e03b61ab0d3ef9482c7010edda3da..d8c1345a1527e5daed404a4b950b596e96d5a673 100644 (file)
--- 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 5c53266684e0f3c2cdfcd911a4b17c58a0d604b5..e576e719738cef377516dc77b9a00acd959b3372 100644 (file)
--- 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\r
 Accept: */*\r
 \r
+[DISCONNECT]
 </protocol>
 </verify>
 </testcase>

diff --git a/tests/data/test206 b/tests/data/test206
index 8ca31e34bbf53bbf9ee2930480db15c09ff1e2e6..b85d7a34079169eadfd9b16155cb89e67239c6f5 100644 (file)
--- 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\r
 Accept: */*\r
 \r
+[DISCONNECT]
 </protocol>
 </verify>
 </testcase>

diff --git a/tests/server/sws.c b/tests/server/sws.c
index e1abed613903425aa1600c392cb2d61e88207d6f..aaacb354694184543b51ad9eec28a580a8424bd8 100644 (file)
--- 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 ***/