]> code.citadel.org Git - citadel.git/commitdiff
projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: f0bdfb5)
* Repaired HTTP output for image transfers and static content
authorArt Cancro <ajc@citadel.org>
Fri, 3 Dec 1999 16:37:46 +0000 (16:37 +0000)
committerArt Cancro <ajc@citadel.org>
Fri, 3 Dec 1999 16:37:46 +0000 (16:37 +0000)
webcit/ChangeLog patch | blob | history
webcit/webcit.c patch | blob | history

diff --git a/webcit/ChangeLog b/webcit/ChangeLog
index e4df588537220e33008d592d6606746f8b7f60b0..dba326ced33271d5cdc96d3b39016d0fd47128c7 100644 (file)
--- a/webcit/ChangeLog
+++ b/webcit/ChangeLog
@@ -1,4 +1,7 @@
 $Log$
+Revision 1.110  1999/12/03 16:37:46  ajc
+* Repaired HTTP output for image transfers and static content
+
 Revision 1.109  1999/12/03 05:09:54  ajc
 * Rewrote the HTTP engine and application coupling to run in a worker thread
   model and to run as a single multithreaded program (eliminated helper
@@ -324,3 +327,4 @@ 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/webcit.c b/webcit/webcit.c
index 78646ffe03af7045f5c4e2025334e5086700902d..bee66bb1ec7f95dd18161e9a1aefeebb6b10eaff 100644 (file)
--- a/webcit/webcit.c
+++ b/webcit/webcit.c
@@ -296,11 +296,10 @@ void output_headers(int print_standard_html_head)
        static char *unset = "; expires=28-May-1971 18:10:00 GMT";
        char cookie[256];
 
-       wprintf("Content-type: text/html\n");
-       wprintf("Server: %s\n", SERVER);
-       wprintf("Connection: close\n");
-
        if (print_standard_html_head > 0) {
+               wprintf("Content-type: text/html\n");
+               wprintf("Server: %s\n", SERVER);
+               wprintf("Connection: close\n");
                wprintf("Pragma: no-cache\n");
                wprintf("Cache-Control: no-store\n");
        }
@@ -313,9 +312,8 @@ void output_headers(int print_standard_html_head)
                wprintf("Set-cookie: webcit=%s\n", cookie);
        }
 
-       wprintf("\n");
-
        if (print_standard_html_head > 0) {
+               wprintf("\n");
                wprintf("<HTML><HEAD><TITLE>");
                escputs(serv_info.serv_humannode);
                wprintf("</TITLE>\n"
@@ -398,7 +396,8 @@ void check_for_express_messages()
 
 void output_static(char *what)
 {
-       char buf[256];
+       char buf[4096];
+       long thisblock;
        FILE *fp;
        struct stat statbuf;
        off_t bytes;
@@ -427,15 +426,24 @@ void output_static(char *what)
 
                fstat(fileno(fp), &statbuf);
                bytes = statbuf.st_size;
+               fprintf(stderr, "Static: %s, %ld bytes\n", what, bytes);
                wprintf("Content-length: %ld\n", (long) bytes);
-               printf("\n");
-               while (bytes--) {
-                       wprintf("%c", getc(fp) );
+               wprintf("\n");
+               while (bytes > 0) {
+                       thisblock = sizeof(buf);
+                       if (thisblock > bytes) thisblock = bytes;
+                       fread(buf, thisblock, 1, fp);
+                       write(WC->http_sock, buf, thisblock);
+                       bytes = bytes - thisblock;
                }
                fclose(fp);
        }
 }
 
+/*
+ * When the browser requests an image file from the Citadel server,
+ * this function is called to transmit it.
+ */
 void output_image()
 {
        char buf[256];
@@ -468,7 +476,6 @@ void output_image()
                        bytes = bytes - thisblock;
                        accomplished = accomplished + thisblock;
                }
-               fflush(stdout);
                serv_puts("CLOS");
                serv_gets(buf);
        } else {
@@ -628,7 +635,7 @@ void session_loop(struct httprequest *req)
                }
        }
 
-       ++TransactionCount;
+       ++TransactionCount;     /* FIX ... make session-specific OR remove */
 
        if (ContentLength > 0) {
                content = malloc(ContentLength + 1);
Citadel server, clients, utilities