/*
* dump out static pages from disk
*/
-void output_static(char *what)
+void output_static(const char *what)
{
int fd;
struct stat statbuf;
* titlebarmsg text to display in the title bar
* messagetext body of the box
*/
-void convenience_page(char *titlebarcolor, char *titlebarmsg, char *messagetext)
+void convenience_page(const char *titlebarcolor, const char *titlebarmsg, const char *messagetext)
{
hprintf("HTTP/1.1 200 OK\n");
output_headers(1, 1, 2, 0, 0, 0);
/*
* Entry point for WebCit transaction
*/
-void session_loop(HashList *HTTPHeaders, StrBuf *ReqLine, StrBuf *request_method, StrBuf *ReadBuf)
+void session_loop(HashList *HTTPHeaders,
+ StrBuf *ReqLine,
+ StrBuf *request_method,
+ StrBuf *ReadBuf,
+ const char **Pos)
{
StrBuf *Buf;
const char *pch, *pchs, *pche;
int len = 0;
void *vHandler;
WebcitHandler *Handler;
+ struct timeval tx_start;
+ struct timeval tx_finish;
/*
* We stuff these with the values coming from the client cookies,
StrBuf *c_httpauth_user;
StrBuf *c_httpauth_pass;
wcsession *WCC;
+
+ gettimeofday(&tx_start, NULL); /* start a stopwatch for performance timing */
Buf = NewStrBuf();
c_username = NewStrBuf();
index[a] = arg[a-1];
sizes[a] = sizeof arg[a-1];
}
-/*/// index[9] = &foo; todo */
nBackDots = 0;
nEmpty = 0;
for ( a = 0; a < 9; ++a)
body_start = StrLength(content);
/** Read the entire input data at once. */
- client_read(&WCC->http_sock, content, ReadBuf, ContentLength + body_start);
+ client_read_to(&WCC->http_sock,
+ content,
+ ReadBuf, Pos,
+ ContentLength,
+ SLEEPING);
if (!strncasecmp(ChrPtr(ContentType), "application/x-www-form-urlencoded", 33)) {
StrBufCutLeft(content, body_start);
* connection now.
*/
if (!WCC->connected) {
+ if (WCC->ReadBuf == NULL)
+ WCC->ReadBuf = NewStrBuf();
if (!strcasecmp(ctdlhost, "uds")) {
/* unix domain socket */
snprintf(buf, SIZ, "%s/citadel.socket", ctdlport);
if (WCC->serv_sock < 0) {
do_logout();
+ FreeStrBuf(&WCC->ReadBuf);
goto SKIP_ALL_THIS_CRAP;
}
else {
}
locate_host(browser_host, WCC->http_sock);
}
-
- WCC->serv_info = get_serv_info(browser_host, user_agent);
+ if (WCC->serv_info == NULL)
+ WCC->serv_info = get_serv_info(browser_host, user_agent);
+ if (WCC->serv_info == NULL){
+ begin_burst();
+ wprintf(_("Received unexpected answer from Citadel "
+ "server; bailing out."));
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
+ end_burst();
+ end_webcit_session();
+ goto SKIP_ALL_THIS_CRAP;
+ }
if (WCC->serv_info->serv_rev_level < MINIMUM_CIT_VERSION) {
begin_burst();
wprintf(_("You are connected to a Citadel "
MINIMUM_CIT_VERSION / 100,
MINIMUM_CIT_VERSION % 100
);
+ hprintf("HTTP/1.1 200 OK\r\n");
+ hprintf("Content-type: text/plain; charset=utf-8\r\n");
end_burst();
end_webcit_session();
goto SKIP_ALL_THIS_CRAP;
}
}
}
-/*///////todo: restore language in this case */
+
/*
* Functions which can be performed without logging in
*/
serv_printf("PASS %s", ChrPtr(c_password));
StrBuf_ServGetln(Buf);
if (GetServerStatus(Buf, NULL) == 2) {
- StrBuf *Lang;
become_logged_in(c_username, c_password, Buf);
- if (get_preference("language", &Lang)) {
- set_selected_language(ChrPtr(Lang));
- go_selected_language(); /* set locale */
- }
get_preference("default_header_charset", &WCC->DefaultCharset);
}
}
WCC->UrlFragment2 = NewStrBuf();
if (WCC->UrlFragment3 == NULL)
WCC->UrlFragment3 = NewStrBuf();
- StrBufPrintf(WCC->UrlFragment1, "%s", index[0]);
- StrBufPrintf(WCC->UrlFragment2, "%s", index[1]);
- StrBufPrintf(WCC->UrlFragment3, "%s", index[2]);
+ if (WCC->UrlFragment4 == NULL)
+ WCC->UrlFragment4 = NewStrBuf();
+ StrBufPlain(WCC->UrlFragment1, index[0], -1);
+ StrBufPlain(WCC->UrlFragment2, index[1], -1);
+ StrBufPlain(WCC->UrlFragment3, index[2], -1);
+ StrBufPlain(WCC->UrlFragment4, index[3], -1);
}
if ((Handler->Flags & AJAX) != 0)
begin_ajax_response();
}
FreeStrBuf(&WCC->trailing_javascript);
WCC->http_host = NULL;
+
+ /* How long did this transaction take? */
+ gettimeofday(&tx_finish, NULL);
+
+ lprintf(9, "Transaction completed in %ld.%06ld seconds.\n",
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) / 1000000,
+ ((tx_finish.tv_sec*1000000 + tx_finish.tv_usec) - (tx_start.tv_sec*1000000 + tx_start.tv_usec)) % 1000000
+ );
}