X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcallcgi.c;h=42ac389e027ce417b5742ba7a90cf390b1afdf7c;hb=147c2b51fe166f5734ebded4729ca831fc19123e;hp=70a97ddf2cb7586649e1b8e06cee9e5d01efa647;hpb=bac8c1f95369efe4802bd9b41a7deba9468d1dd4;p=ashd.git diff --git a/src/callcgi.c b/src/callcgi.c index 70a97dd..42ac389 100644 --- a/src/callcgi.c +++ b/src/callcgi.c @@ -93,7 +93,7 @@ static void forkchild(int inpath, char *prog, char *file, char *method, char *ur putenv(sprintf2("SERVER_SOFTWARE=ashd/%s", VERSION)); putenv("GATEWAY_INTERFACE=CGI/1.1"); if(getenv("HTTP_VERSION")) - putenv(sprintf2("SERVER_PROTOCOL=HTTP/%s", getenv("HTTP_VERSION"))); + putenv(sprintf2("SERVER_PROTOCOL=%s", getenv("HTTP_VERSION"))); putenv(sprintf2("REQUEST_METHOD=%s", method)); putenv(sprintf2("PATH_INFO=%s", rest)); putenv(sprintf2("SCRIPT_NAME=%s", url)); @@ -258,13 +258,13 @@ static void sendstatus(char **headers, FILE *out) } if(status) { if(strchr(status, ' ')) - fprintf(out, "HTTP/1.1 %s\r\n", status); + fprintf(out, "HTTP/1.1 %s\n", status); else - fprintf(out, "HTTP/1.1 %i %s\r\n", atoi(status), defstatus(atoi(status))); + fprintf(out, "HTTP/1.1 %i %s\n", atoi(status), defstatus(atoi(status))); } else if(location) { - fprintf(out, "HTTP/1.1 303 See Other\r\n"); + fprintf(out, "HTTP/1.1 303 See Other\n"); } else { - fprintf(out, "HTTP/1.1 200 OK\r\n"); + fprintf(out, "HTTP/1.1 200 OK\n"); } } @@ -272,7 +272,7 @@ static void sendheaders(char **headers, FILE *out) { while(*headers) { if(**headers) - fprintf(out, "%s: %s\r\n", headers[0], headers[1]); + fprintf(out, "%s: %s\n", headers[0], headers[1]); headers += 2; } } @@ -329,7 +329,7 @@ int main(int argc, char **argv, char **envp) } sendstatus(headers, stdout); sendheaders(headers, stdout); - printf("\r\n"); + printf("\n"); passdata(out, stdout); return(0); }