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

sws: allow multiple commands in <servercmd>

Browse Source
This commit is contained in:
Daniel Stenberg
2011-07-03 19:15:06 +02:00
parent bcf50283fc
commit c7a4df16e0
1 changed files with 26 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
tests/server/sws.c
View File

@@ -5,7 +5,7 @@
* | (__| |_| | _ <| |___ * | (__| |_| | _ <| |___
* \___|\___/|_| \_\_____| * \___|\___/|_| \_\_____|
* *
* Copyright (C) 1998 - 2010, Daniel Stenberg, <daniel@haxx.se>, et al. * Copyright (C) 1998 - 2011, 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
@@ -107,7 +107,7 @@ struct httprequest {
bool digest; /* Authorization digest header found */ bool digest; /* Authorization digest header found */
bool ntlm; /* Authorization ntlm header found */ bool ntlm; /* Authorization ntlm header found */
int writedelay; /* if non-zero, delay this number of seconds between int writedelay; /* if non-zero, delay this number of seconds between
writes in the response */ writes in the response */
int pipe; /* if non-zero, expect this many requests to do a "piped" int pipe; /* if non-zero, expect this many requests to do a "piped"
request/response */ request/response */
int skip; /* if non-zero, the server is instructed to not read this int skip; /* if non-zero, the server is instructed to not read this
@@ -397,12 +397,13 @@ static int ProcessRequest(struct httprequest *req)
return 1; /* done */ return 1; /* done */
} }
else { else {
char *orgcmd = NULL;
char *cmd = NULL; char *cmd = NULL;
size_t cmdsize = 0; size_t cmdsize = 0;
int num=0; int num=0;
/* get the custom server control "commands" */ /* get the custom server control "commands" */
error = getpart(&cmd, &cmdsize, "reply", "servercmd", stream); error = getpart(&orgcmd, &cmdsize, "reply", "servercmd", stream);
fclose(stream); fclose(stream);
if(error) { if(error) {
logmsg("getpart() failed with error: %d", error); logmsg("getpart() failed with error: %d", error);
@@ -410,8 +411,9 @@ static int ProcessRequest(struct httprequest *req)
return 1; /* done */ return 1; /* done */
} }
if(cmdsize) { cmd = orgcmd;
logmsg("Found a reply-servercmd section!"); while(cmd && cmdsize) {
char *check;
if(!strncmp(CMD_AUTH_REQUIRED, cmd, strlen(CMD_AUTH_REQUIRED))) { if(!strncmp(CMD_AUTH_REQUIRED, cmd, strlen(CMD_AUTH_REQUIRED))) {
logmsg("instructed to require authorization header"); logmsg("instructed to require authorization header");
@@ -445,9 +447,26 @@ static int ProcessRequest(struct httprequest *req)
else { else {
logmsg("funny instruction found: %s", cmd); logmsg("funny instruction found: %s", cmd);
} }
/* try to deal with CRLF or just LF */
check = strchr(cmd, '\r');
if(!check)
check = strchr(cmd, '\n');
if(check) {
/* get to the letter following the newline */
while((*check == '\r') || (*check == '\n'))
check++;
if(!*check)
/* if we reached a zero, get out */
break;
cmd = check;
}
else
break;
} }
if(cmd) if(orgcmd)
free(cmd); free(orgcmd);
} }
} }
else { else {