simono41/shellinabox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #290 from Grimthorr/master

Browse source 
Swap to gzip compression (drops support for IE6)
This commit is contained in:
Luka Krajger 2015-03-10 12:22:41 +01:00
commit 4ced3d2738
1 changed files with 6 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
libhttp/httpconnection.c
View file

@ -564,15 +564,6 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
check(msg); check(msg);
check(len >= 0); check(len >= 0);
// Internet Explorer seems to have difficulties with compressed data. It
// also has difficulties with SSL connections that are being proxied.
int ieBug = 0;
const char *userAgent = getFromHashMap(&http->header, "user-agent");
const char *msie = userAgent ? strstr(userAgent, "Trident") : NULL;
if (msie) {
ieBug++;
}
char *header = NULL; char *header = NULL;
int headerLength = 0; int headerLength = 0;
int bodyOffset = 0; int bodyOffset = 0;
@ -612,10 +603,10 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
// Compress replies that might exceed the size of a single IP packet // Compress replies that might exceed the size of a single IP packet
compress = !ieBug && !isHead && compress = !isHead &&
!http->isPartialReply && !http->isPartialReply &&
len > 1400 && len > 1400 &&
httpAcceptsEncoding(http, "deflate"); httpAcceptsEncoding(http, "gzip");
#endif #endif
break; break;
} else { } else {
@ -630,7 +621,7 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
line = eol + 1; line = eol + 1;
} }
if (ieBug || compress) { if (compress) {
if (l >= 2 && !memcmp(line, "\r\n", 2)) { if (l >= 2 && !memcmp(line, "\r\n", 2)) {
line += 2; line += 2;
l -= 2; l -= 2;
@ -640,10 +631,6 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
check(header = malloc(headerLength)); check(header = malloc(headerLength));
memcpy(header, msg, headerLength); memcpy(header, msg, headerLength);
} }
if (ieBug) {
removeHeader(header, &headerLength, "connection:");
addHeader(&header, &headerLength, "Connection: close\r\n");
}
if (compress) { if (compress) {
#ifdef HAVE_ZLIB #ifdef HAVE_ZLIB
@ -659,7 +646,8 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
.avail_out = len, .avail_out = len,
.next_out = (unsigned char *)compressed .next_out = (unsigned char *)compressed
}; };
if (deflateInit(&strm, Z_DEFAULT_COMPRESSION) == Z_OK) { if (deflateInit2(&strm, Z_DEFAULT_COMPRESSION, Z_DEFLATED,
31, 8, Z_DEFAULT_STRATEGY) == Z_OK) {
if (deflate(&strm, Z_FINISH) == Z_STREAM_END) { if (deflate(&strm, Z_FINISH) == Z_STREAM_END) {
// Compression was successful and resulted in reduction in size // Compression was successful and resulted in reduction in size
debug("Compressed response from %d to %d", len, len-strm.avail_out); debug("Compressed response from %d to %d", len, len-strm.avail_out);
@ -670,7 +658,7 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
removeHeader(header, &headerLength, "content-length:"); removeHeader(header, &headerLength, "content-length:");
removeHeader(header, &headerLength, "content-encoding:"); removeHeader(header, &headerLength, "content-encoding:");
addHeader(&header, &headerLength, "Content-Length: %d\r\n", len); addHeader(&header, &headerLength, "Content-Length: %d\r\n", len);
addHeader(&header, &headerLength, "Content-Encoding: deflate\r\n"); addHeader(&header, &headerLength, "Content-Encoding: gzip\r\n");
} else { } else {
free(compressed); free(compressed);
} }
@ -773,10 +761,6 @@ void httpTransfer(struct HttpConnection *http, char *msg, int len) {
} }
} }
} }
if (ieBug) {
httpCloseRead(http);
}
} }
void httpTransferPartialReply(struct HttpConnection *http, char *msg, int len){ void httpTransferPartialReply(struct HttpConnection *http, char *msg, int len){