From 267a23237c6e20443a145880c6b63e659c91d359 Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Fri, 27 Sep 2002 17:15:44 +0000 Subject: [PATCH] * Removed the gzip compression stuff due to bugs in Internet Explorer. --- webcit/ChangeLog | 4 +++ webcit/configure.in | 14 --------- webcit/context_loop.c | 21 +------------ webcit/floors.c | 2 +- webcit/html2html.c | 2 +- webcit/webcit.c | 70 +++---------------------------------------- webcit/webcit.h | 7 +---- 7 files changed, 12 insertions(+), 108 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 9ceedd827..46475614e 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,4 +1,7 @@ $Log$ +Revision 400.27 2002/09/27 17:15:44 ajc +* Removed the gzip compression stuff due to bugs in Internet Explorer. + Revision 400.26 2002/09/27 04:37:21 ajc * New, buggy versions of event editing screens @@ -1030,3 +1033,4 @@ Sun Dec 6 19:50:55 EST 1998 Art Cancro 1998-12-03 Nathan Bryant * webserver.c: warning fix + diff --git a/webcit/configure.in b/webcit/configure.in index b456af0ef..578a9081c 100644 --- a/webcit/configure.in +++ b/webcit/configure.in @@ -4,7 +4,6 @@ AC_INIT(webserver.c) AC_CANONICAL_HOST -AC_ARG_WITH(with_zlib, [ --with-zlib use zlib compression if present]) AC_ARG_WITH(with_libical, [ --with-libical use libical calendaring library]) dnl Set some system-specific variables which are OK to set before compiler @@ -72,19 +71,6 @@ dnl AC_FUNC_VPRINTF dnl AC_CHECK_FUNCS(strerror) AC_REPLACE_FUNCS(snprintf) -dnl Checks for the zlib compression library. -if test "x$with_zlib" != xno ; then - AC_CHECK_HEADERS(zlib.h, - [AC_CHECK_LIB(z, zlibVersion, - [ok_zlib=yes],, - )]) -fi - -if test "x$ok_zlib" != xno ; then - LIBS="-lz $LIBS" - AC_DEFINE(HAVE_ZLIB) -fi - dnl Checks for the libical calendaring library. if test "x$with_libical" != xno ; then AC_CHECK_HEADERS(ical.h, diff --git a/webcit/context_loop.c b/webcit/context_loop.c index b13ef6fff..8eddaea80 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -232,13 +232,6 @@ void context_loop(int sock) int desired_session = 0; int got_cookie = 0; struct wcsession *TheSession, *sptr; - int gzip = 0; - -#ifdef HAVE_ZLIB_H - int i; - char enc[SIZ]; - char encodings[SIZ]; -#endif /* * Find out what it is that the web browser is asking for @@ -253,18 +246,6 @@ void context_loop(int sock) got_cookie = 1; } -#ifdef HAVE_ZLIB_H - if (!strncasecmp(buf, "Accept-encoding: ", 17)) { - extract_token(encodings, &buf[17], 0, ';'); - for (i=0; ihttp_sock = sock; TheSession->lastreq = time(NULL); /* log */ - session_loop(req, gzip); /* perform the requested transaction */ + session_loop(req); /* perform the requested transaction */ pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */ /* Free the request buffer */ diff --git a/webcit/floors.c b/webcit/floors.c index 511a5907e..48cca50f5 100644 --- a/webcit/floors.c +++ b/webcit/floors.c @@ -43,7 +43,7 @@ void display_floorconfig(char *prepend_html) output_headers(3); if (prepend_html != NULL) { - http_write(WC->http_sock, prepend_html, strlen(prepend_html)); + write(WC->http_sock, prepend_html, strlen(prepend_html)); } serv_printf("LFLR"); /* FIXME put a real test here */ diff --git a/webcit/html2html.c b/webcit/html2html.c index a0a976ffc..023ab7c4a 100644 --- a/webcit/html2html.c +++ b/webcit/html2html.c @@ -166,7 +166,7 @@ void output_html(void) { } /* Output our big pile of markup */ - http_write(WC->http_sock, converted_msg, output_length); + write(WC->http_sock, converted_msg, output_length); /* A little trailing vertical whitespace... */ wprintf("

\n"); diff --git a/webcit/webcit.c b/webcit/webcit.c index dd51681ff..7707a6820 100644 --- a/webcit/webcit.c +++ b/webcit/webcit.c @@ -152,31 +152,6 @@ char *bstr(char *key) } -#ifdef HAVE_ZLIB_H - -ssize_t http_write(int fd, void *buf, size_t count) { - - if (WC->gzfd) { - return gzwrite(WC->gzfd, buf, count); - } - else { - return write(fd, buf, count); - } - - -} - -#else - -ssize_t http_write(int fd, void *buf, size_t count) { - return write(fd, buf, count); -} - -#endif - - - - void wprintf(const char *format,...) { va_list arg_ptr; @@ -186,7 +161,7 @@ void wprintf(const char *format,...) vsprintf(wbuf, format, arg_ptr); va_end(arg_ptr); - http_write(WC->http_sock, wbuf, strlen(wbuf)); + write(WC->http_sock, wbuf, strlen(wbuf)); } @@ -320,10 +295,6 @@ void output_headers(int controlcode) int suppress_check = 0; char httpnow[SIZ]; static int pageseq = 0; -#ifdef HAVE_ZLIB_H - gzFile temp_gzfd = NULL; -#endif - print_standard_html_head = controlcode & 0x03; refresh30 = ((controlcode & 0x04) >> 2); suppress_check = ((controlcode & 0x08) >> 3); @@ -332,12 +303,6 @@ void output_headers(int controlcode) httpdate(httpnow, time(NULL)); -#ifdef HAVE_ZLIB_H - if (WC->gzcompressed) { - temp_gzfd = gzdopen(WC->http_sock, "wb9"); - } -#endif - if (print_standard_html_head > 0) { wprintf("Content-type: text/html\n" "Server: %s\n", SERVER @@ -346,11 +311,6 @@ void output_headers(int controlcode) "Pragma: no-cache\n" "Cache-Control: no-store\n" ); -#ifdef HAVE_ZLIB_H - if (temp_gzfd != NULL) { - wprintf("Content-Encoding: gzip\n"); - } -#endif } stuff_to_cookie(cookie, WC->wc_session, WC->wc_username, WC->wc_password, WC->wc_roomname); @@ -366,12 +326,6 @@ void output_headers(int controlcode) if (print_standard_html_head > 0) { wprintf("\n"); -#ifdef HAVE_ZLIB_H - if (temp_gzfd != NULL) { - WC->gzfd = temp_gzfd; - } -#endif - wprintf(""); escputs(serv_info.serv_humannode); wprintf("\n" @@ -463,7 +417,7 @@ void http_transmit_thing(char *thing, size_t length, char *content_type) { (long) length, SERVER ); - http_write(WC->http_sock, thing, (size_t)length); + write(WC->http_sock, thing, (size_t)length); } @@ -623,7 +577,7 @@ void output_mimepart() else { memset(xferbuf, 0, thisblock); } - http_write(WC->http_sock, xferbuf, thisblock); + write(WC->http_sock, xferbuf, thisblock); bytes = bytes - thisblock; accomplished = accomplished + thisblock; } @@ -843,7 +797,7 @@ void upload_handler(char *name, char *filename, char *partnum, char *disp, /* * Entry point for WebCit transaction */ -void session_loop(struct httprequest *req, int gzip) +void session_loop(struct httprequest *req) { char cmd[SIZ]; char action[SIZ]; @@ -879,15 +833,6 @@ void session_loop(struct httprequest *req, int gzip) WC->is_wap = 0; -#ifdef HAVE_ZLIB_H - if (gzip) { - WC->gzcompressed = 1; - } - else { - WC->gzcompressed = 0; - } -#endif - hptr = req; if (hptr == NULL) return; @@ -1278,11 +1223,4 @@ SKIP_ALL_THIS_CRAP: WC->upload_length = 0; } -#ifdef HAVE_ZLIB_H - if (WC->gzfd) { - gzclose(WC->gzfd); - WC->gzfd = NULL; - WC->gzcompressed = 0; - } -#endif } diff --git a/webcit/webcit.h b/webcit/webcit.h index 872376481..d94a69cc7 100644 --- a/webcit/webcit.h +++ b/webcit/webcit.h @@ -172,10 +172,6 @@ struct wcsession { char this_page[SIZ]; /* address of current page */ char http_host[SIZ]; /* HTTP Host: header */ char *preferences; -#ifdef HAVE_ZLIB_H - int gzcompressed; /* nonzero if compressed output */ - gzFile gzfd; /* stream to send compressed */ -#endif #ifdef HAVE_ICAL_H icalcomponent **disp_cal; /* store calendar items for display */ long *cal_msgnum; /* store calendar msgids for display */ @@ -302,7 +298,7 @@ void display_menubar(int); void embed_room_banner(char *); void smart_goto(char *); void worker_entry(void); -void session_loop(struct httprequest *, int gzip); +void session_loop(struct httprequest *); void fmt_date(char *buf, time_t thetime); void httpdate(char *buf, time_t thetime); void end_webcit_session(void); @@ -354,7 +350,6 @@ void cal_process_attachment(char *part_source); void display_calendar(long msgnum); void display_task(long msgnum); void do_calendar_view(void); -ssize_t http_write(int fd, void *buf, size_t count); #ifdef HAVE_ICAL_H void display_edit_task(void); -- 2.30.2