src/lib/htmlPage.c 1.39
1.39 2009/10/20 22:37:34 galt
keep http request together
Index: src/lib/htmlPage.c
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/lib/htmlPage.c,v
retrieving revision 1.38
retrieving revision 1.39
diff -b -B -U 4 -r1.38 -r1.39
--- src/lib/htmlPage.c 23 Sep 2009 18:42:28 -0000 1.38
+++ src/lib/htmlPage.c 20 Oct 2009 22:37:34 -0000 1.39
@@ -898,11 +898,9 @@
struct dyString *dyText;
int sd;
cookieOutput(dyHeader, cookies);
-dyStringAppend(dyHeader, "\r\n");
-sd = netOpenHttpExt(url, "GET", FALSE);
-mustWriteFd(sd, dyHeader->string, dyHeader->stringSize);
+sd = netOpenHttpExt(url, "GET", dyHeader->string);
dyText = netSlurpFile(sd);
close(sd);
dyStringFree(&dyHeader);
return dyStringCannibalize(&dyText);
@@ -1375,21 +1373,17 @@
cgiVars = htmlFormCgiVars(origPage, form, buttonName, buttonVal, dyHeader);
dyStringAppend(dyUrl, "?");
dyStringAppend(dyUrl, cgiVars);
verbose(3, "GET %s\n", dyUrl->string);
- sd = netOpenHttpExt(dyUrl->string, form->method, FALSE);
- dyStringAppend(dyHeader, "\r\n");
- mustWriteFd(sd, dyHeader->string, dyHeader->stringSize);
+ sd = netOpenHttpExt(dyUrl->string, form->method, dyHeader->string);
}
else if (sameWord(form->method, "POST"))
{
cgiVars = htmlFormCgiVars(origPage, form, buttonName, buttonVal, dyHeader);
contentLength = strlen(cgiVars);
verbose(3, "POST %s\n", dyUrl->string);
- sd = netOpenHttpExt(dyUrl->string, form->method, FALSE);
dyStringPrintf(dyHeader, "Content-length: %d\r\n", contentLength);
- dyStringAppend(dyHeader, "\r\n");
- mustWriteFd(sd, dyHeader->string, dyHeader->stringSize);
+ sd = netOpenHttpExt(dyUrl->string, form->method, dyHeader->string);
mustWriteFd(sd, cgiVars, contentLength);
}
dyText = netSlurpFile(sd);
close(sd);