diff options
Diffstat (limited to 'src/Content.c')
| -rw-r--r-- | src/Content.c | 366 |
1 files changed, 185 insertions, 181 deletions
diff --git a/src/Content.c b/src/Content.c index be751c5..357c04d 100644 --- a/src/Content.c +++ b/src/Content.c @@ -29,20 +29,21 @@ #include "util_String.h" #include "util_Network.h" -#include "http_Request.h" +#include "httpRequest.h" -#include "http_Auth.h" -#include "http_Steer.h" -#include "http_Cookies.h" +#include "Auth.h" +#include "Steer.h" +#include "Cookies.h" -#include "http_Content.h" +#include "Content.h" #include "cctk_Arguments.h" #include "cctk_Parameters.h" -#include "http_SString.h" #include "SString_Namespace.h" +#define EMPTYSTRING {'\0'} + static const char *rcsid = "$Header$"; CCTK_FILEVERSION(CactusConnect_HTTPD_Content_c) @@ -113,7 +114,44 @@ static const char *notauthorized_page = /******************************************************************** ********************* External Routines ********************** ********************************************************************/ +int +HTTP_SendString( httpRequest *request, const String * message ) +{ + return HTTP_Send(request, GetBuffer( message ) ); +} + +void +HTTP_Send_OK_Header( httpRequest *request ) +{ + /* Status message */ + HTTP_Send(request, "HTTP/1.0 200 OK\r\n"); + + /* Content-Type */ + HTTP_Send(request, "Content-Type: text/html\r\n"); + HTTP_Send(request, "\r\n"); +} +void +SSUtil_SplitFilename(const char **dir,const char **file, const String *message) +{ + Util_SplitFilename((char **)dir,(char **)file,GetBuffer(message)); +} + +void +CCTK_GetRunTitleString( String *s ) +{ + char buf[1024] = EMPTYSTRING; + CCTK_RunTitle(sizeof(buf)-1,buf); + SetToCString( s, buf ); +} + +void +CCTK_GetParameterFilenameString( String *name ) +{ + char buf[1024] = EMPTYSTRING; + CCTK_ParameterFilename(sizeof(buf)-1,buf); + SetToCString( name, buf ); +} /*@@ @routine HTTP_ContentWork @date Sat Sep 16 15:22:59 2000 @@ -270,6 +308,30 @@ static int CompareStrings(const void *string1, const void *string2) return Util_StrCmpi(*(const char * const *)string1, *(const char * const *)string2); } + /*@@ + @routine TimeListItem + @date 10.04.2004 + @author Steve White + @desc + Reduce repetition in MainPage below + @enddesc + @calls + @calledby + @history + + @endhistory + +@@*/ +static void +TimeListItem( String *message, int time, const char *units ) +{ + ConcatCString(message, " <li><span class=\"hilite\">" ); + ConcatDecimal(message, time ); + ConcatCString(message, "</span> " ); + ConcatCString(message, units ); + ConcatCString(message, "</li>\n" ); +} + /****************************************************************************** ***************************** Main Page ************************************** ******************************************************************************/ @@ -293,60 +355,6 @@ static int CompareStrings(const void *string1, const void *string2) @endhistory @@*/ -int -Send_HTTP( httpRequest * request, const char * message ) -{ - return HTTP_Write(request, message, strlen(message)); -} - -int -Send_HTTP_String( httpRequest *request, const String * message ) -{ - return Send_HTTP(request, GetBuffer( message ) ); -} - -void -SendHTTP_OK_Header( httpRequest *request ) -{ - /* Status message */ - Send_HTTP(request, "HTTP/1.0 200 OK\r\n"); - - /* Content-Type */ - Send_HTTP(request, "Content-Type: text/html\r\n"); - Send_HTTP(request, "\r\n"); -} - -void -SSUtil_SplitFilename(const char **dir,const char **file, const String *message) -{ - Util_SplitFilename((char **)dir,(char **)file,GetBuffer(message)); -} - -static void -TimeListItem( String *message, int time, const char *units ) -{ - ConcatCString(message, " <li><span class=\"hilite\">" ); - ConcatDecimal(message, time ); - ConcatCString(message, "</span> " ); - ConcatCString(message, units ); - ConcatCString(message, "</li>\n" ); -} - -void -CCTK_GetRunTitleString( String *s ) -{ - char buf[1024] = EMPTYSTRING; - CCTK_RunTitle(sizeof(buf)-1,buf); - SetToCString( s, buf ); -} - -void -CCTK_GetParameterFilenameString( String *name ) -{ - char buf[1024] = EMPTYSTRING; - CCTK_ParameterFilename(sizeof(buf)-1,buf); - SetToCString( name, buf ); -} static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) { @@ -367,18 +375,18 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) /* avoid compiler warning about unused parameter */ data = data; - SendHTTP_OK_Header( request ); + HTTP_Send_OK_Header( request ); - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); /* Start the page */ - Send_HTTP(request, "<html>\n<head>\n"); - Send_HTTP(request, "<title>Running CACTUS Status Information</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_Send(request, "<html>\n<head>\n"); + HTTP_Send(request, "<title>Running CACTUS Status Information</title>\n"); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request, "</head>\n<body>\n"); + HTTP_Send(request, "</head>\n<body>\n"); /* Write out the main header part */ /* LIST COMPILED THORNS */ @@ -410,10 +418,10 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) } } - SetHTML_ContentHeader(cctkGH, 0, message, menu); - Send_HTTP_String(request, message ); + HTTP_SetContentHeaderString(cctkGH, 0, message, menu); + HTTP_SendString(request, message ); - Send_HTTP(request, + HTTP_Send(request, "<div class=\"banner\">\n" "<img src=\"/Images/wwwcactuscodeorg.jpg\"" " alt=\"Cactus\" /></div>\n"); @@ -444,9 +452,9 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) "</table>\n" "</div>\n"); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); - Send_HTTP(request, + HTTP_Send(request, "<table cellpadding=\"10\">\n" "<tr>\n" "<td>\n"); @@ -471,10 +479,10 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) } ConcatCString(message, "</dl>\n" ); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); } - Send_HTTP(request, + HTTP_Send(request, "</td>\n" "<td>\n"); @@ -497,7 +505,7 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, "</span></li>\n"); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); seconds = CCTK_RunTime(); minutes = seconds/60; @@ -550,13 +558,13 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) } ConcatCString(message, "</ul></li>\n<li> Parameter filename <span class=\"parfile\">" ); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); CCTK_GetParameterFilenameString(message); SSUtil_SplitFilename(&dir,&file,message); - Send_HTTP(request, file); + HTTP_Send(request, file); - Send_HTTP(request, "</span></li>\n"); + HTTP_Send(request, "</span></li>\n"); if (cctkGH && cctkGH->cctk_iteration) { @@ -565,7 +573,7 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatDouble(message, CCTK_RunTime()/(double)cctkGH->cctk_iteration ); ConcatCString(message, "</span> seconds</li></ul></li>\n"); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); SetToCString(message, "<li>Estimated time to completion:\n<ul>"); @@ -631,7 +639,7 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, "</ul></li>\n"); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); } Util_GetHostName(host,HOSTLENGTH); @@ -653,7 +661,7 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, host); ConcatCString(message, "</span></li>\n"); } - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); user = getenv ("USER"); if (user) @@ -661,18 +669,18 @@ static int MainPage(const cGH *cctkGH, httpRequest *request, void *data) SetToCString(message, " <li> Started by <span class=\"hilite\">"); ConcatCString(message, user); ConcatCString(message, "</span></li>\n"); - Send_HTTP_String(request, message ); + HTTP_SendString(request, message ); } - Send_HTTP(request, "</ul>\n"); + HTTP_Send(request, "</ul>\n"); /* Finish table started by blurb */ - Send_HTTP(request, "</td>\n</tr>\n</table>\n\n"); + HTTP_Send(request, "</td>\n</tr>\n</table>\n\n"); /* Write out the footer part. */ - SetHTML_ContentFooter(cctkGH, 0, message); - retval = Send_HTTP_String(request, message ); + HTTP_SetContentFooterString(cctkGH, 0, message); + retval = HTTP_SendString(request, message ); String_Delete( message ); String_Delete( title ); @@ -767,7 +775,7 @@ static int ShowStaticPage(const cGH *cctkGH, httpRequest *request, void *data) struct httpStaticPage *page = (struct httpStaticPage *)data; String *message = String_New(); - Send_HTTP(request, "HTTP/1.0 200 OK\r\n"); + HTTP_Send(request, "HTTP/1.0 200 OK\r\n"); SetToCString(message, "Content-Length: "); ConcatDecimal(message, page->length ); @@ -775,7 +783,7 @@ static int ShowStaticPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, page->mime_type ); ConcatCString(message, "\r\n\r\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); retval = HTTP_Write(request, page->page, page->length); @@ -815,52 +823,52 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data) if(!notauthorised) { /* Ok the person is authorised. */ - if(request->n_arguments == 0) + if(HTTP_Num_Arguments( request ) == 0) { String *message = String_New(); /* No arguments, so just display the page */ - Send_HTTP(request,"HTTP/1.0 200 Ok\r\n"); + HTTP_Send(request,"HTTP/1.0 200 Ok\r\n"); - Send_HTTP(request,"WWW-Authenticate: Basic realm=\"Cactus Control\"\r\n"); + HTTP_Send(request,"WWW-Authenticate: Basic realm=\"Cactus Control\"\r\n"); HTTP_CookieSend(request,"user", thisuser, "/", NULL, NULL, 0); - Send_HTTP(request,"Content-Type: text/html\r\n\r\n"); + HTTP_Send(request,"Content-Type: text/html\r\n\r\n"); - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); /* Start the page */ - Send_HTTP(request, "<html><head>\n"); - Send_HTTP(request, "<title>Cactus Control and Status Page</title>\n"); + HTTP_Send(request, "<html><head>\n"); + HTTP_Send(request, "<title>Cactus Control and Status Page</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request, "</head>\n<body>\n"); + HTTP_Send(request, "</head>\n<body>\n"); - SetHTML_ContentHeader(cctkGH, 0,message,NULL); + HTTP_SetContentHeaderString(cctkGH, 0,message,NULL); ConcatCString(message, "<h1>Control and Status Page</h1>\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); - Send_HTTP(request, + HTTP_Send(request, "<p>This page is the control center for interacting with\n" " the current simulation. It is possible to steer certain\n" " parameters, as well as pause, restart, or terminate the" " simulation.</p>\n"); - Send_HTTP(request, + HTTP_Send(request, "<div class=\"centered\">\n" "<form action=\"/control.html\" method=\"get\">\n"); - Send_HTTP(request, + HTTP_Send(request, "<h4> Run Control </h4>\n" "<p> Select if the run should be paused, running normally, " "or terminated.\n" " You may also single step to the next iteration.</p>\n"); - Send_HTTP(request, + HTTP_Send(request, "<table class=\"controls\" cellspacing=\"5\" cellpadding=\"5\">\n" "<tr>\n"); @@ -869,24 +877,24 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, pause ? "checked=\"checked\"" : ""); ConcatCString(message, " value=\"PAUSE\" /> PAUSE</td>\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); SetToCString(message, "<td><input type=\"radio\" name=\"runstate\" "); ConcatCString(message, pause ? "checked=\"checked\"" : ""); ConcatCString(message, " value=\"RUN\" /> RUN</td>\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); - Send_HTTP(request, + HTTP_Send(request, "<td><input type=\"radio\" name=\"runstate\" " "value=\"TERMINATE\" /> TERMINATE</td>\n"); - Send_HTTP(request, + HTTP_Send(request, "<td><input type=\"submit\" name=\"step\" " "value=\"STEP\" /></td>\n"); - Send_HTTP(request, + HTTP_Send(request, "</tr></table>\n" "<table>\n" "<tr><td><input type=\"submit\" value=\"OK\" /></td>\n" @@ -894,7 +902,7 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data) "</tr>\n" "</table>\n"); - Send_HTTP(request, + HTTP_Send(request, "<h4> Run Until </h4>\n" "<p> The following parameters allow you to select an iteration\n" "number or physical time at which the code will pause.\n" @@ -941,16 +949,16 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message,"</table>\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); - Send_HTTP(request, + HTTP_Send(request, "</form>\n" "</div>\n"); /* Write out the footer part. */ - SetHTML_ContentFooter(cctkGH, 0, message); - Send_HTTP_String(request, message); + HTTP_SetContentFooterString(cctkGH, 0, message); + HTTP_SendString(request, message); String_Delete( message ); } @@ -963,15 +971,15 @@ static int ControlPage(const cGH *cctkGH, httpRequest *request, void *data) else { /* Not authorised */ - Send_HTTP(request,"HTTP/1.0 401 Unauthorized\r\n"); + HTTP_Send(request,"HTTP/1.0 401 Unauthorized\r\n"); - Send_HTTP(request,"WWW-Authenticate: Basic realm=\"Cactus Control\"\r\n"); + HTTP_Send(request,"WWW-Authenticate: Basic realm=\"Cactus Control\"\r\n"); HTTP_CookieCancel(request,"user", "/"); - Send_HTTP(request,"Content-Type: text/html\r\n\r\n"); + HTTP_Send(request,"Content-Type: text/html\r\n\r\n"); - Send_HTTP(request, notauthorized_page); + HTTP_Send(request, notauthorized_page); } return 0; @@ -995,10 +1003,7 @@ static int ControlSet(const cGH *cctkGH, httpRequest *request) { DECLARE_CCTK_PARAMETERS String *message = String_New(); - const char *value = NULL; - - /* What is the runstate ? */ - value = HTTP_ArgumentValue(request,"runstate"); + const char *value = HTTP_ArgumentValue(request,"runstate"); if(value) { @@ -1131,8 +1136,8 @@ static int ControlSet(const cGH *cctkGH, httpRequest *request) * of text rendered at the bottom. */ /* Status message */ - if(request->http_major_version < 1 || - (request->http_major_version == 1 && request->http_minor_version < 1)) + if(HTTP_Major_Version( request ) < 1 || + (HTTP_Major_Version( request ) == 1 && HTTP_Minor_Version( request ) < 1)) { /* Older browsers don't understand 303 */ SetToCString(message,"HTTP/1.0 302 Found\r\n"); @@ -1144,7 +1149,7 @@ static int ControlSet(const cGH *cctkGH, httpRequest *request) ConcatCString(message, "Location: /control.html\r\n\r\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); String_Delete( message ); @@ -1169,27 +1174,27 @@ static int ControlTerminationPage(const cGH *cctkGH, httpRequest *request) { int retval = -1; String *message = String_New(); - SendHTTP_OK_Header( request ); + HTTP_Send_OK_Header( request ); - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); /* Start the page */ - Send_HTTP(request, "<html><head>\n"); - Send_HTTP(request, "<title>Running CACTUS Status Information : Terminated</title>\n"); + HTTP_Send(request, "<html><head>\n"); + HTTP_Send(request, "<title>Running CACTUS Status Information : Terminated</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request, "</head>\n<body>\n"); + HTTP_Send(request, "</head>\n<body>\n"); /* Write out the main header part */ - SetHTML_ContentHeader(cctkGH,1,message,NULL); - Send_HTTP_String(request, message); + HTTP_SetContentHeaderString(cctkGH,1,message,NULL); + HTTP_SendString(request, message); - Send_HTTP(request, "<h1>Simulation Home Page</h1>\n"); + HTTP_Send(request, "<h1>Simulation Home Page</h1>\n"); /* Some blurb */ - Send_HTTP(request, + HTTP_Send(request, "<div class=\"centered\">\n" "<table cellspacing=\"5\" cellpadding=\"5\" border=\"0\"><tr><td>\n" "<h3>Simulation web server:</h3>\n" @@ -1201,7 +1206,6 @@ static int ControlTerminationPage(const cGH *cctkGH, httpRequest *request) "additional features available, such as the viewing and \n" "downloading of output files</p>\n"); - /* CONFIGURATION DETAILS */ SetToCString(message, @@ -1213,7 +1217,7 @@ static int ControlTerminationPage(const cGH *cctkGH, httpRequest *request) "<li>Flesh compiled on <span class=\"hilite\"> __DATE__ </span>\n" "at <span class=\"hilite\"> __TIME__ </span></li>\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); if (cctkGH) { @@ -1227,16 +1231,16 @@ static int ControlTerminationPage(const cGH *cctkGH, httpRequest *request) ConcatDecimal( message, CCTK_nProcs(cctkGH) ); ConcatCString( message, " CPUs</li>\n"); } - Send_HTTP_String(request, message); + HTTP_SendString(request, message); } - Send_HTTP(request,"</ul>\n"); + HTTP_Send(request,"</ul>\n"); /************************************************************************/ /* NEW COLUMN */ - Send_HTTP(request, "</td><td>"); + HTTP_Send(request, "</td><td>"); /************************************************************************/ @@ -1260,10 +1264,10 @@ static int ControlTerminationPage(const cGH *cctkGH, httpRequest *request) SetToCString(message, "<li>Current cactus state is unknown</li>\n"); } - Send_HTTP_String(request, message); - Send_HTTP(request, "<li>This Cactus run is over.</li>\n"); + HTTP_SendString(request, message); + HTTP_Send(request, "<li>This Cactus run is over.</li>\n"); - Send_HTTP(request, "</ul>"); + HTTP_Send(request, "</ul>"); /* LIST COMPILED THORNS */ { @@ -1306,16 +1310,16 @@ static int ControlTerminationPage(const cGH *cctkGH, httpRequest *request) free(thorns); } - Send_HTTP_String(request, message); + HTTP_SendString(request, message); /* Finish table started by blurb */ - Send_HTTP(request, "</td></tr></table>\n"); + HTTP_Send(request, "</td></tr></table>\n"); /* Write out the footer part. */ - SetHTML_ContentFooter(cctkGH,0,message); - retval = Send_HTTP_String(request, message); + HTTP_SetContentFooterString(cctkGH,0,message); + retval = HTTP_SendString(request, message); String_Delete( message ); return retval; @@ -1375,20 +1379,20 @@ static int AboutPage(const cGH *cctkGH, httpRequest *request, void *data) /* avoid compiler warning about unused parameter */ data = data; - SendHTTP_OK_Header( request ); + HTTP_Send_OK_Header( request ); - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); /* Start the page */ SetToCString(message, "<html><head>\n<title>About Cactus Server</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request, "</head>\n<body>\n"); - SetHTML_ContentHeader(cctkGH,0,message,NULL); - Send_HTTP_String(request, message); + HTTP_Send(request, "</head>\n<body>\n"); + HTTP_SetContentHeaderString(cctkGH,0,message,NULL); + HTTP_SendString(request, message); - Send_HTTP(request, "<h1>About this Web Server</h1>\n"); + HTTP_Send(request, "<h1>About this Web Server</h1>\n"); SetToCString(message, "<p>These web pages are served by a simulation \n" "which is using the Cactus Code and Computational ToolKit, \n" @@ -1403,18 +1407,18 @@ static int AboutPage(const cGH *cctkGH, httpRequest *request, void *data) "and implemented by Tom Goodale, based on the original idea and \n" "implementation by Werner Benger.</p>\n"); - retval = Send_HTTP_String(request, message); + retval = HTTP_SendString(request, message); SetToCString(message, "<p>For more information about Cactus, visit our " "permanent home page at \n" "<a href=\"http://www.cactuscode.org\">www.cactuscode.org</a></p>\n"); - retval = Send_HTTP_String(request, message); + retval = HTTP_SendString(request, message); /* Write out the footer part. */ - SetHTML_ContentFooter(cctkGH,0,message); - retval = Send_HTTP_String(request, message); + HTTP_SetContentFooterString(cctkGH,0,message); + retval = HTTP_SendString(request, message); String_Delete( message); return retval; @@ -1447,7 +1451,7 @@ static int CookieTestPage(const cGH *cctkGH, httpRequest *request, void *data) data = data; /* Status message */ - Send_HTTP(request,"HTTP/1.0 200 OK\r\n"); + HTTP_Send(request,"HTTP/1.0 200 OK\r\n"); /* Cookie */ HTTP_CookieSend(request, "user1", "foobar4", NULL,NULL,NULL,0); @@ -1458,23 +1462,23 @@ static int CookieTestPage(const cGH *cctkGH, httpRequest *request, void *data) HTTP_CookieSend(request, "user4", "foobar1", NULL,NULL,NULL,0); - Send_HTTP(request,"Content-Type: text/html\r\n\r\n"); + HTTP_Send(request,"Content-Type: text/html\r\n\r\n"); - SetHTML_Doctype( message ); - Send_HTTP_String(request, message); + HTTP_SetDoctype( message ); + HTTP_SendString(request, message); /* Start the page */ - Send_HTTP(request, "<html><head><title>Cookie Test</title>\n"); - SetHTML_HeadHeader( message); - Send_HTTP_String(request, message ); + HTTP_Send(request, "<html><head><title>Cookie Test</title>\n"); + HTTP_SetHeadInfo( message); + HTTP_SendString(request, message ); - Send_HTTP(request, "</head>\n<body>\n"); + HTTP_Send(request, "</head>\n<body>\n"); - SetHTML_ContentHeader(cctkGH,0,message,NULL); - Send_HTTP_String(request, message); + HTTP_SetContentHeaderString(cctkGH,0,message,NULL); + HTTP_SendString(request, message); - Send_HTTP(request, "<h1>Cookie Test</h1>\n"); + HTTP_Send(request, "<h1>Cookie Test</h1>\n"); - Send_HTTP(request, "<div class=\"centered\">"); + HTTP_Send(request, "<div class=\"centered\">"); value = HTTP_HeaderValue(request, "Cookie"); @@ -1482,7 +1486,7 @@ static int CookieTestPage(const cGH *cctkGH, httpRequest *request, void *data) ConcatCString(message, value); ConcatCString(message, "'</p>\n"); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); value2 = HTTP_CookieGet(request,"user3"); @@ -1492,14 +1496,14 @@ static int CookieTestPage(const cGH *cctkGH, httpRequest *request, void *data) free(value2); - Send_HTTP_String(request, message); + HTTP_SendString(request, message); - Send_HTTP(request,"</div>\n"); + HTTP_Send(request,"</div>\n"); /* Write out the footer part. */ - SetHTML_ContentFooter(cctkGH,0,message); - retval = Send_HTTP_String(request, message); + HTTP_SetContentFooterString(cctkGH,0,message); + retval = HTTP_SendString(request, message); String_Delete( message ); return retval; |