X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=cgi.c;h=de80ead0bd02ef1ce3be45ca89004c874c0777ce;hb=5700aead3098beb0cc5a02bc0034a0d4194774a6;hp=26bcf3a4f7be9f0d82f0c1ff431968584a89b17a;hpb=3c0fc33a9ab79710e2288f5c87da33bcc21c98dc;p=privoxy.git diff --git a/cgi.c b/cgi.c index 26bcf3a4..de80ead0 100644 --- a/cgi.c +++ b/cgi.c @@ -1,4 +1,4 @@ -const char cgi_rcs[] = "$Id: cgi.c,v 1.132 2011/06/25 12:39:41 fabiankeil Exp $"; +const char cgi_rcs[] = "$Id: cgi.c,v 1.142 2011/08/17 10:25:43 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/cgi.c,v $ @@ -271,6 +271,13 @@ const char image_blank_data[] = const size_t image_pattern_length = sizeof(image_pattern_data) - 1; const size_t image_blank_length = sizeof(image_blank_data) - 1; +#ifdef FEATURE_COMPRESSION +/* + * Minimum length which a buffer has to reach before + * we bother to (re-)compress it. Completely arbitrary. + */ +const size_t LOWER_LENGTH_LIMIT_FOR_COMPRESSION = 1024U; +#endif static struct http_response cgi_error_memory_response[1]; @@ -551,7 +558,9 @@ static struct http_response *dispatch_known_cgi(struct client_state * csp, if (err && (err != JB_ERR_MEMORY)) { /* Unexpected error! Shouldn't get here */ - log_error(LOG_LEVEL_ERROR, "Unexpected CGI error %d in top-level handler. Please file a bug report!", err); + log_error(LOG_LEVEL_ERROR, + "Unexpected CGI error %d in top-level handler. " + "Please file a bug report!", err); err = cgi_error_unknown(csp, rsp, err); } if (!err) @@ -1486,22 +1495,23 @@ static void get_locale_time(char *buf, size_t buffer_size) * Allocates a new buffer for the result, free'ing it is * up to the caller. * - * XXX: We should add a config option for the - * compression level. - * - * * Parameters : * 1 : buffer = buffer whose content should be compressed * 2 : buffer_length = length of the buffer + * 3 : compression_level = compression level for compress2() * * Returns : NULL on error, otherwise a pointer to the compressed * content of the input buffer. * *********************************************************************/ -char *compress_buffer(char *buffer, size_t *buffer_length) +char *compress_buffer(char *buffer, size_t *buffer_length, int compression_level) { char *compressed_buffer; - size_t new_length = *buffer_length; + uLongf new_length; + assert(-1 <= compression_level && compression_level <= 9); + + /* Let zlib figure out the maximum length of the compressed data */ + new_length = compressBound((uLongf)*buffer_length); compressed_buffer = malloc(new_length); if (NULL == compressed_buffer) @@ -1511,17 +1521,20 @@ char *compress_buffer(char *buffer, size_t *buffer_length) } if (Z_OK != compress2((Bytef *)compressed_buffer, &new_length, - (Bytef *)buffer, *buffer_length, Z_DEFAULT_COMPRESSION)) + (Bytef *)buffer, *buffer_length, compression_level)) { - log_error(LOG_LEVEL_ERROR, "Error in compress2()"); + log_error(LOG_LEVEL_ERROR, + "compress2() failed. Buffer size: %d, compression level: %d.", + new_length, compression_level); freez(compressed_buffer); return NULL; } log_error(LOG_LEVEL_RE_FILTER, - "Compressed content from %d to %d bytes.", *buffer_length, new_length); + "Compressed content from %d to %d bytes. Compression level: %d", + *buffer_length, new_length, compression_level); - *buffer_length = new_length; + *buffer_length = (size_t)new_length; return compressed_buffer; @@ -1577,17 +1590,18 @@ struct http_response *finish_http_response(const struct client_state *csp, struc #ifdef FEATURE_COMPRESSION if (!err && (csp->flags & CSP_FLAG_CLIENT_SUPPORTS_DEFLATE) - && (rsp->content_length > LOWER_LENGTH_LIMIT_FOR_COMRPESSION)) + && (rsp->content_length > LOWER_LENGTH_LIMIT_FOR_COMPRESSION)) { char *compressed_content; - compressed_content = compress_buffer(rsp->body, &rsp->content_length); + compressed_content = compress_buffer(rsp->body, &rsp->content_length, + csp->config->compression_level); if (NULL != compressed_content) { freez(rsp->body); rsp->body = compressed_content; + err = enlist_unique_header(rsp->headers, "Content-Encoding", "deflate"); } - err = enlist_unique_header(rsp->headers, "Content-Encoding", "deflate"); } #endif @@ -2121,6 +2135,7 @@ struct map *default_exports(const struct client_state *csp, const char *caller) struct map * exports; int local_help_exists = 0; char *ip_address = NULL; + char *port = NULL; char *hostname = NULL; assert(csp); @@ -2133,12 +2148,12 @@ struct map *default_exports(const struct client_state *csp, const char *caller) if (csp->config->hostname) { - get_host_information(csp->cfd, &ip_address, NULL); + get_host_information(csp->cfd, &ip_address, &port, NULL); hostname = strdup(csp->config->hostname); } else { - get_host_information(csp->cfd, &ip_address, &hostname); + get_host_information(csp->cfd, &ip_address, &port, &hostname); } err = map(exports, "version", 1, html_encode(VERSION), 0); @@ -2146,6 +2161,8 @@ struct map *default_exports(const struct client_state *csp, const char *caller) if (!err) err = map(exports, "time", 1, html_encode(buf), 0); if (!err) err = map(exports, "my-ip-address", 1, html_encode(ip_address ? ip_address : "unknown"), 0); freez(ip_address); + if (!err) err = map(exports, "my-port", 1, html_encode(port ? port : "unkown"), 0); + freez(port); if (!err) err = map(exports, "my-hostname", 1, html_encode(hostname ? hostname : "unknown"), 0); freez(hostname); if (!err) err = map(exports, "homepage", 1, html_encode(HOME_PAGE_URL), 0); @@ -2170,9 +2187,6 @@ struct map *default_exports(const struct client_state *csp, const char *caller) if (!err) err = map_block_killer(exports, "can-toggle"); #endif - snprintf(buf, sizeof(buf), "%d", csp->config->hport); - if (!err) err = map(exports, "my-port", 1, buf, 1); - if(!strcmp(CODE_STATUS, "stable")) { if (!err) err = map_block_killer(exports, "unstable");