Mercurial > hg > nginx-vendor-0-8

diff src/http/modules/ngx_http_gzip_filter.c @ 46:9f3205d496a0 NGINX_0_1_23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nginx 0.1.23 *) Feature: the ngx_http_ssi_filter_module and the ssi, ssi_silent_errors, and ssi_min_file_chunk directives. The 'echo var="HTTP_..." default=""' and 'echo var="REMOTE_ADDR"' commands are supported. *) Feature: the %request_time log parameter. *) Feature: if the request has no the "Host" header line, then the "proxy_preserve_host" directive set this header line to the first server name of the "server_name" directive. *) Bugfix: nginx could not be built on platforms different from i386, amd64, sparc É ppc; bug appeared in 0.1.22. *) Bugfix: the ngx_http_autoindex_module now shows the information not about the symlink, but about file or directory it points to. *) Bugfix: the %apache_length parameter logged the negative length of the response header if the no response was transferred to a client.
author Igor Sysoev <http://sysoev.ru>
date Tue, 01 Mar 2005 00:00:00 +0300
parents 2879cd3a40cb
children
line wrap: on
line diff
--- a/src/http/modules/ngx_http_gzip_filter.c
+++ b/src/http/modules/ngx_http_gzip_filter.c
@@ -76,23 +76,23 @@ typedef struct {
 
 
 static ngx_int_t ngx_http_gzip_proxied(ngx_http_request_t *r,
-                                       ngx_http_gzip_conf_t *conf);
+    ngx_http_gzip_conf_t *conf);
 static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items,
-                                        u_int size);
+    u_int size);
 static void ngx_http_gzip_filter_free(void *opaque, void *address);
 static void ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx);
 
 static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf,
-                                       ngx_http_log_op_t *op);
+    ngx_http_log_op_t *op);
 
 static ngx_int_t ngx_http_gzip_add_log_formats(ngx_conf_t *cf);
 
 static ngx_int_t ngx_http_gzip_filter_init(ngx_cycle_t *cycle);
 static void *ngx_http_gzip_create_conf(ngx_conf_t *cf);
 static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf,
-                                      void *parent, void *child);
+    void *parent, void *child);
 static char *ngx_http_gzip_set_types(ngx_conf_t *cf, ngx_command_t *cmd,
-                                     void *conf);
+    void *conf);
 static char *ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data);
 static char *ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data);
 
@@ -261,7 +261,8 @@ static ngx_http_output_header_filter_pt 
 static ngx_http_output_body_filter_pt    ngx_http_next_body_filter;
 
 
-static ngx_int_t ngx_http_gzip_header_filter(ngx_http_request_t *r)
+static ngx_int_t
+ngx_http_gzip_header_filter(ngx_http_request_t *r)
 {
     ngx_uint_t             i, found;
     ngx_http_gzip_ctx_t   *ctx;
@@ -357,8 +358,8 @@ static ngx_int_t ngx_http_gzip_header_fi
 }
 
 
-static ngx_int_t ngx_http_gzip_proxied(ngx_http_request_t *r,
-                                       ngx_http_gzip_conf_t *conf)
+static ngx_int_t
+ngx_http_gzip_proxied(ngx_http_request_t *r, ngx_http_gzip_conf_t *conf)
 {
     time_t  date, expires;
 
@@ -437,8 +438,8 @@ static ngx_int_t ngx_http_gzip_proxied(n
 }
 
 
-static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
-                                           ngx_chain_t *in)
+static ngx_int_t
+ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
 {
     int                    rc, wbits, memlevel;
     ngx_int_t              last;
@@ -825,7 +826,8 @@ static ngx_int_t ngx_http_gzip_body_filt
 }
 
 
-static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
+static void *
+ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
 {
     ngx_http_gzip_ctx_t *ctx = opaque;
 
@@ -866,7 +868,8 @@ static void *ngx_http_gzip_filter_alloc(
 }
 
 
-static void ngx_http_gzip_filter_free(void *opaque, void *address)
+static void
+ngx_http_gzip_filter_free(void *opaque, void *address)
 {
 #if 0
     ngx_http_gzip_ctx_t *ctx = opaque;
@@ -877,8 +880,9 @@ static void ngx_http_gzip_filter_free(vo
 }
 
 
-static u_char *ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf,
-                                       ngx_http_log_op_t *op)
+static u_char *
+ngx_http_gzip_log_ratio(ngx_http_request_t *r, u_char *buf,
+    ngx_http_log_op_t *op)
 {
     ngx_uint_t            zint, zfrac;
     ngx_http_gzip_ctx_t  *ctx;
@@ -909,7 +913,8 @@ static u_char *ngx_http_gzip_log_ratio(n
 }
 
 
-static void ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx)
+static void
+ngx_http_gzip_error(ngx_http_gzip_ctx_t *ctx)
 {
     deflateEnd(&ctx->zstream);
 
@@ -926,7 +931,8 @@ static void ngx_http_gzip_error(ngx_http
 }
 
 
-static ngx_int_t ngx_http_gzip_add_log_formats(ngx_conf_t *cf)
+static ngx_int_t
+ngx_http_gzip_add_log_formats(ngx_conf_t *cf)
 {
     ngx_http_log_op_name_t  *op;
 
@@ -945,7 +951,8 @@ static ngx_int_t ngx_http_gzip_add_log_f
 }
 
 
-static ngx_int_t ngx_http_gzip_filter_init(ngx_cycle_t *cycle)
+static ngx_int_t
+ngx_http_gzip_filter_init(ngx_cycle_t *cycle)
 {
     ngx_http_next_header_filter = ngx_http_top_header_filter;
     ngx_http_top_header_filter = ngx_http_gzip_header_filter;
@@ -957,7 +964,8 @@ static ngx_int_t ngx_http_gzip_filter_in
 }
 
 
-static void *ngx_http_gzip_create_conf(ngx_conf_t *cf)
+static void *
+ngx_http_gzip_create_conf(ngx_conf_t *cf)
 {
     ngx_http_gzip_conf_t  *conf;
 
@@ -987,8 +995,8 @@ static void *ngx_http_gzip_create_conf(n
 }
 
 
-static char *ngx_http_gzip_merge_conf(ngx_conf_t *cf,
-                                      void *parent, void *child)
+static char *
+ngx_http_gzip_merge_conf(ngx_conf_t *cf, void *parent, void *child)
 {
     ngx_http_gzip_conf_t *prev = parent;
     ngx_http_gzip_conf_t *conf = child;
@@ -1000,10 +1008,9 @@ static char *ngx_http_gzip_merge_conf(ng
     ngx_conf_merge_bufs_value(conf->bufs, prev->bufs, 4, ngx_pagesize);
 
     ngx_conf_merge_unsigned_value(conf->http_version, prev->http_version,
-                                  NGX_HTTP_VERSION_11);
+                              NGX_HTTP_VERSION_11);
     ngx_conf_merge_bitmask_value(conf->proxied, prev->proxied,
-                                 (NGX_CONF_BITMASK_SET
-                                  |NGX_HTTP_GZIP_PROXIED_OFF));
+                              (NGX_CONF_BITMASK_SET|NGX_HTTP_GZIP_PROXIED_OFF));
 
     ngx_conf_merge_value(conf->level, prev->level, 1);
     ngx_conf_merge_size_value(conf->wbits, prev->wbits, MAX_WBITS);
@@ -1037,8 +1044,8 @@ static char *ngx_http_gzip_merge_conf(ng
 }
 
 
-static char *ngx_http_gzip_set_types(ngx_conf_t *cf, ngx_command_t *cmd,
-                                     void *conf)
+static char *
+ngx_http_gzip_set_types(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
 {
     ngx_http_gzip_conf_t *gcf = conf;
 
@@ -1047,7 +1054,7 @@ static char *ngx_http_gzip_set_types(ngx
     ngx_http_gzip_type_t  *type;
 
     if (gcf->types == NULL) {
-        gcf->types = ngx_array_create(cf->pool, 5,
+        gcf->types = ngx_array_create(cf->pool, 4,
                                        sizeof(ngx_http_gzip_type_t));
         if (gcf->types == NULL) {
             return NGX_CONF_ERROR;
@@ -1087,7 +1094,8 @@ static char *ngx_http_gzip_set_types(ngx
 }
 
 
-static char *ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data)
+static char *
+ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data)
 {
     int *np = data;
 
@@ -1110,7 +1118,8 @@ static char *ngx_http_gzip_set_window(ng
 }
 
 
-static char *ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data)
+static char *
+ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data)
 {
     int *np = data;