From e179f15e9ec8978e1ebda8f59ca3842f6c2205bd Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Mon, 21 Feb 2005 23:00:04 +0000 Subject: [PATCH] * begin_burst() / end_burst() semantics now apply to all pages which are output using the "include_html_head" option of output_headers() (which is nearly all of them). This should speed up the network considerably, and also pave the way for another attempt at adding zlib compression back in. --- webcit/ChangeLog | 8 +++++++- webcit/groupdav_main.c | 5 +++++ webcit/tcp_sockets.c | 2 +- webcit/webcit.c | 7 ++++++- webcit/webserver.c | 2 ++ 5 files changed, 21 insertions(+), 3 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 2731f7681..5db06e7ab 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,11 @@ $Log$ +Revision 603.1 2005/02/21 23:00:04 ajc +* begin_burst() / end_burst() semantics now apply to all pages which are + output using the "include_html_head" option of output_headers() (which + is nearly all of them). This should speed up the network considerably, + and also pave the way for another attempt at adding zlib compression + back in. + Revision 603.0 2005/02/21 22:00:13 ajc * THIS IS 6.03 @@ -2426,4 +2433,3 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix - diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c index 748bddd9f..a25bdc72e 100644 --- a/webcit/groupdav_main.c +++ b/webcit/groupdav_main.c @@ -28,6 +28,11 @@ /* * Output HTTP headers which are common to all requests. + * + * Please observe that we don't use the usual output_headers() + * and wDumpContent() functions in the GroupDAV subsystem, so we + * do our own header stuff here. + * */ void groupdav_common_headers(void) { wprintf( diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c index 240e8e4c7..9e38fac27 100644 --- a/webcit/tcp_sockets.c +++ b/webcit/tcp_sockets.c @@ -7,8 +7,8 @@ /* * Uncomment this to log all communications with the Citadel server - */ #define SERV_TRACE 1 + */ #include #include diff --git a/webcit/webcit.c b/webcit/webcit.c index 1339e33ae..fb5fb8b3c 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -180,6 +180,10 @@ void wDumpContent(int print_standard_html_footer) do_template("trailing"); } + /* If we've been saving it all up for one big output burst, + * go ahead and do that now. + */ + end_burst(); } @@ -382,7 +386,8 @@ void output_headers( int do_httpheaders, /* 1 = output HTTP headers } if (do_htmlhead) { - wprintf("\n"); + /* wprintf("\n"); */ + begin_burst(); if (refresh30) { svprintf("REFRESHTAG", WCS_STRING, "%s", diff --git a/webcit/webserver.c b/webcit/webserver.c index d6f56d773..2cdb0bbdf 100644 --- a/webcit/webserver.c +++ b/webcit/webserver.c @@ -202,6 +202,8 @@ void end_burst(void) { size_t the_len; char *the_data; + if (WC->burst == NULL) return; + the_len = WC->burst_len; the_data = WC->burst; -- 2.39.2