projects
/
citadel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
9cfecc9
)
* Removed the gzip compression stuff due to bugs in Internet Explorer.
author
Art Cancro
<ajc@citadel.org>
Fri, 27 Sep 2002 17:15:44 +0000
(17:15 +0000)
committer
Art Cancro
<ajc@citadel.org>
Fri, 27 Sep 2002 17:15:44 +0000
(17:15 +0000)
webcit/ChangeLog
patch
|
blob
|
history
webcit/configure.in
patch
|
blob
|
history
webcit/context_loop.c
patch
|
blob
|
history
webcit/floors.c
patch
|
blob
|
history
webcit/html2html.c
patch
|
blob
|
history
webcit/webcit.c
patch
|
blob
|
history
webcit/webcit.h
patch
|
blob
|
history
diff --git
a/webcit/ChangeLog
b/webcit/ChangeLog
index 9ceedd827436ee021b7d6719646b860fba34e14b..46475614ebb99e6c7358d4a1d7338fc80a1d669d 100644
(file)
--- a/
webcit/ChangeLog
+++ b/
webcit/ChangeLog
@@
-1,4
+1,7
@@
$Log$
$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
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 <ajc@uncnsrd.mt-kisco.ny.us>
1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
* webserver.c: warning fix
1998-12-03 Nathan Bryant <bryant@cs.usm.maine.edu>
* webserver.c: warning fix
+
diff --git
a/webcit/configure.in
b/webcit/configure.in
index b456af0ef8fa5514b00114afe935aedd53ea8606..578a9081cca8601b20c7f820ecff0301aa3ca30e 100644
(file)
--- a/
webcit/configure.in
+++ b/
webcit/configure.in
@@
-4,7
+4,6
@@
AC_INIT(webserver.c)
AC_CANONICAL_HOST
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
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 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,
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 b13ef6fff7b46a7d9cca17835a784d299ebff9a1..8eddaea805023bdfabee0ce4d95c4761a58cee54 100644
(file)
--- 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 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
/*
* Find out what it is that the web browser is asking for
@@
-253,18
+246,6
@@
void context_loop(int sock)
got_cookie = 1;
}
got_cookie = 1;
}
-#ifdef HAVE_ZLIB_H
- if (!strncasecmp(buf, "Accept-encoding: ", 17)) {
- extract_token(encodings, &buf[17], 0, ';');
- for (i=0; i<num_tokens(encodings, ','); ++i) {
- extract_token(enc, encodings, i, ',');
- if (!strcasecmp(enc, "gzip")) {
- gzip = 1;
- }
- }
- }
-#endif
-
hptr = (struct httprequest *)
malloc(sizeof(struct httprequest));
if (req == NULL)
hptr = (struct httprequest *)
malloc(sizeof(struct httprequest));
if (req == NULL)
@@
-355,7
+336,7
@@
void context_loop(int sock)
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->http_sock = sock;
TheSession->lastreq = time(NULL); /* log */
pthread_setspecific(MyConKey, (void *)TheSession);
TheSession->http_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 */
pthread_mutex_unlock(&TheSession->SessionMutex); /* unbind */
/* Free the request buffer */
diff --git
a/webcit/floors.c
b/webcit/floors.c
index 511a5907ea7c6281153a6acc9687c8572a7db4e2..48cca50f51fd88a7cf00154a4594b52871eccfc5 100644
(file)
--- 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) {
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 */
}
serv_printf("LFLR"); /* FIXME put a real test here */
diff --git
a/webcit/html2html.c
b/webcit/html2html.c
index a0a976ffc3d58cf776af23fbd93f2bcd787afe32..023ab7c4af8184dfc9193003d28079a8d3964f38 100644
(file)
--- a/
webcit/html2html.c
+++ b/
webcit/html2html.c
@@
-166,7
+166,7
@@
void output_html(void) {
}
/* Output our big pile of markup */
}
/* 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("<BR><BR>\n");
/* A little trailing vertical whitespace... */
wprintf("<BR><BR>\n");
diff --git
a/webcit/webcit.c
b/webcit/webcit.c
index dd51681ffb6a9b58f656c2513bec29f8b5ae68c6..7707a6820dbb12c25eda5c668b158d13d98557ad 100644
(file)
--- 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;
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);
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;
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);
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));
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
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"
);
"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);
}
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");
if (print_standard_html_head > 0) {
wprintf("\n");
-#ifdef HAVE_ZLIB_H
- if (temp_gzfd != NULL) {
- WC->gzfd = temp_gzfd;
- }
-#endif
-
wprintf("<HTML><HEAD><TITLE>");
escputs(serv_info.serv_humannode);
wprintf("</TITLE>\n"
wprintf("<HTML><HEAD><TITLE>");
escputs(serv_info.serv_humannode);
wprintf("</TITLE>\n"
@@
-463,7
+417,7
@@
void http_transmit_thing(char *thing, size_t length, char *content_type) {
(long) length,
SERVER
);
(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);
}
else {
memset(xferbuf, 0, thisblock);
}
-
http_
write(WC->http_sock, xferbuf, thisblock);
+ write(WC->http_sock, xferbuf, thisblock);
bytes = bytes - thisblock;
accomplished = accomplished + 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
*/
/*
* 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];
{
char cmd[SIZ];
char action[SIZ];
@@
-879,15
+833,6
@@
void session_loop(struct httprequest *req, int gzip)
WC->is_wap = 0;
WC->is_wap = 0;
-#ifdef HAVE_ZLIB_H
- if (gzip) {
- WC->gzcompressed = 1;
- }
- else {
- WC->gzcompressed = 0;
- }
-#endif
-
hptr = req;
if (hptr == NULL) return;
hptr = req;
if (hptr == NULL) return;
@@
-1278,11
+1223,4
@@
SKIP_ALL_THIS_CRAP:
WC->upload_length = 0;
}
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 87237648105c1c0b5c1cf572b47dffdbdbd9dfc2..d94a69cc74d000c84fa63f4552fc62d92b27c161 100644
(file)
--- 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;
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 */
#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 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);
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);
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);
#ifdef HAVE_ICAL_H
void display_edit_task(void);