generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Minor variable type cleanups.

Browse Source 
Disable "swsbounce" mode when the received request
isn't for the same test and part number.
This commit is contained in:
Yang Tse 2008-02-05 14:43:16 +00:00
parent cd63a461d7
commit acd9d72466
1 changed files with 20 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/server/sws.c
View File

@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2008, Daniel Stenberg, <daniel@haxx.se>, et al.
* *
* This software is licensed as described in the file COPYING, which * This software is licensed as described in the file COPYING, which
* you should have received as part of this distribution. The terms * you should have received as part of this distribution. The terms
@ -83,9 +83,9 @@
long prevtestno=-1; /* previous test number we served */ long prevtestno=-1; /* previous test number we served */
long prevpartno=-1; /* previous part number we served */ long prevpartno=-1; /* previous part number we served */
bool prevbounce; /* instructs the server to increase the part number for bool prevbounce=FALSE; /* instructs the server to increase the part number for
a test in case the identical testno+partno request a test in case the identical testno+partno request
shows up again */ shows up again */
#define RCMD_NORMALREQ 0 /* default request, use the tests file normally */ #define RCMD_NORMALREQ 0 /* default request, use the tests file normally */
#define RCMD_IDLE 1 /* told to sit idle */ #define RCMD_IDLE 1 /* told to sit idle */
@ -97,7 +97,7 @@ struct httprequest {
int offset; /* size of the incoming request */ int offset; /* size of the incoming request */
long testno; /* test number found in the request */ long testno; /* test number found in the request */
long partno; /* part number found in the request */ long partno; /* part number found in the request */
int open; /* keep connection open info, as found in the request */ bool open; /* keep connection open info, as found in the request */
bool auth_req; /* authentication required, don't wait for body unless bool auth_req; /* authentication required, don't wait for body unless
there's an Authorization header */ there's an Authorization header */
bool auth; /* Authorization header present in the incoming request */ bool auth; /* Authorization header present in the incoming request */
@ -196,7 +196,7 @@ static void sigpipe_handler(int sig)
int ProcessRequest(struct httprequest *req) int ProcessRequest(struct httprequest *req)
{ {
char *line=&req->reqbuf[req->checkindex]; char *line=&req->reqbuf[req->checkindex];
char chunked=FALSE; bool chunked = FALSE;
static char request[REQUEST_KEYWORD_SIZE]; static char request[REQUEST_KEYWORD_SIZE];
static char doc[MAXDOCNAMELEN]; static char doc[MAXDOCNAMELEN];
char logbuf[256]; char logbuf[256];
@ -526,7 +526,7 @@ void storerequest(char *reqbuf, ssize_t totalsize)
/* return 0 on success, non-zero on failure */ /* return 0 on success, non-zero on failure */
static int get_request(curl_socket_t sock, struct httprequest *req) static int get_request(curl_socket_t sock, struct httprequest *req)
{ {
int fail= FALSE; int fail = 0;
char *reqbuf = req->reqbuf; char *reqbuf = req->reqbuf;
char *pipereq; char *pipereq;
@ -571,7 +571,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
return DOCNUMBER_INTERNAL; return DOCNUMBER_INTERNAL;
} }
logmsg("Connection closed by client"); logmsg("Connection closed by client");
reqbuf[req->offset]=0; reqbuf[req->offset] = '\0';
/* dump the request receivied so far to the external file */ /* dump the request receivied so far to the external file */
storerequest(reqbuf, req->offset); storerequest(reqbuf, req->offset);
@ -581,8 +581,7 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
logmsg("Read %d bytes", got); logmsg("Read %d bytes", got);
req->offset += got; req->offset += got;
reqbuf[req->offset] = '\0';
reqbuf[req->offset] = 0;
if(ProcessRequest(req)) { if(ProcessRequest(req)) {
if(req->pipe--) { if(req->pipe--) {
@ -595,17 +594,17 @@ static int get_request(curl_socket_t sock, struct httprequest *req)
if (req->offset >= REQBUFSIZ) { if (req->offset >= REQBUFSIZ) {
logmsg("Request buffer overflow, closing connection"); logmsg("Request buffer overflow, closing connection");
reqbuf[REQBUFSIZ-1]=0; reqbuf[REQBUFSIZ-1] = '\0';
fail = TRUE; fail = 1;
/* dump the request to an external file anyway */ /* dump the request to an external file anyway */
} }
else else
reqbuf[req->offset]=0; reqbuf[req->offset] = '\0';
/* dump the request to an external file */ /* dump the request to an external file */
storerequest(reqbuf, req->pipelining ? req->checkindex : req->offset); storerequest(reqbuf, req->pipelining ? req->checkindex : req->offset);
return fail; /* success */ return fail; /* return 0 on success */
} }
/* returns -1 on failure */ /* returns -1 on failure */
@ -619,7 +618,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
char *cmd=NULL; char *cmd=NULL;
size_t cmdsize=0; size_t cmdsize=0;
FILE *dump; FILE *dump;
int persistant = TRUE; bool persistant = TRUE;
size_t responsesize; size_t responsesize;
int error; int error;
@ -814,7 +813,7 @@ static int send_doc(curl_socket_t sock, struct httprequest *req)
return 0; return 0;
} }
char use_ipv6=FALSE; bool use_ipv6=FALSE;
int main(int argc, char *argv[]) int main(int argc, char *argv[])
{ {
@ -1026,6 +1025,11 @@ int main(int argc, char *argv[])
req.partno++; req.partno++;
logmsg("BOUNCE part number to %ld", req.partno); logmsg("BOUNCE part number to %ld", req.partno);
} }
else {
prevbounce = FALSE;
prevtestno = -1;
prevpartno = -1;
}
} }
send_doc(msgsock, &req); send_doc(msgsock, &req);