* 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.

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index 2731f768186011a39338fcd2e8724fc5a46bc377..5db06e7abc57b942852e1de8d31a4cd19be94748 100644 (file)
--- 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 <ajc@uncnsrd.mt-kisco.ny.us>
 
 1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
        * webserver.c: warning fix
-

diff --git a/webcit/groupdav_main.c b/webcit/groupdav_main.c
index 748bddd9f9381c5f40018bfcb91e0b38d9401fe1..a25bdc72e9c8da7c775b156dffe3864ab5c53bb4 100644 (file)
--- 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 240e8e4c70f9d1fc5ff15c0043f66524e49ccde0..9e38fac27d2c350694530a36710a32665c440c90 100644 (file)
--- 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 <ctype.h>
 #include <stdlib.h>

diff --git a/webcit/webcit.c b/webcit/webcit.c
index 1339e33aec8e53e5af1e8214d88ecbe1c9c33c02..fb5fb8b3cf1712c5fb99f0d04e2fee22c614a3a7 100644 (file)
--- 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 d6f56d77312a440b951aaf3b6160c80fd0c48a93..2cdb0bbdfbce15344ed6350a4db70d88c1f06135 100644 (file)
--- 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;