Mercurial > hg > nginx
diff src/http/ngx_http_write_filter.c @ 91:637625a2acdb
nginx-0.0.1-2003-05-19-20:39:14 import
| author | Igor Sysoev <igor@sysoev.ru> |
|---|---|
| date | Mon, 19 May 2003 16:39:14 +0000 |
| parents | 37530da31268 |
| children | a23d010f356d |
line wrap: on
line diff
--- a/src/http/ngx_http_write_filter.c +++ b/src/http/ngx_http_write_filter.c @@ -35,11 +35,14 @@ static ngx_command_t ngx_http_write_filt ngx_http_module_t ngx_http_write_filter_module_ctx = { NGX_HTTP_MODULE, - NULL, /* create server config */ - NULL, /* init server config */ + NULL, /* create main configuration */ + NULL, /* init main configuration */ - ngx_http_write_filter_create_conf, /* create location config */ - ngx_http_write_filter_merge_conf /* merge location config */ + NULL, /* create server configuration */ + NULL, /* merge server configuration */ + + ngx_http_write_filter_create_conf, /* create location configuration */ + ngx_http_write_filter_merge_conf /* merge location configuration */ }; @@ -61,9 +64,9 @@ int ngx_http_write_filter(ngx_http_reque ngx_http_write_filter_conf_t *conf; - ctx = (ngx_http_write_filter_ctx_t *) - ngx_http_get_module_ctx(r->main ? r->main : r, - ngx_http_write_filter_module_ctx); + ctx = ngx_http_get_module_ctx(r->main ? r->main : r, + ngx_http_write_filter_module_ctx); + if (ctx == NULL) { ngx_http_create_ctx(r, ctx, ngx_http_write_filter_module_ctx, sizeof(ngx_http_write_filter_ctx_t), NGX_ERROR); @@ -118,9 +121,8 @@ int ngx_http_write_filter(ngx_http_reque } } - conf = (ngx_http_write_filter_conf_t *) - ngx_http_get_module_loc_conf(r->main ? r->main : r, - ngx_http_write_filter_module_ctx); + conf = ngx_http_get_module_loc_conf(r->main ? r->main : r, + ngx_http_write_filter_module_ctx); #if (NGX_DEBUG_WRITE_FILTER) ngx_log_debug(r->connection->log, @@ -139,7 +141,11 @@ int ngx_http_write_filter(ngx_http_reque return NGX_AGAIN; } +#if 1 + chain = ngx_write_chain(r->connection, ctx->out); +#else chain = ngx_write_chain(r->connection, ctx->out, flush); +#endif #if (NGX_DEBUG_WRITE_FILTER) ngx_log_debug(r->connection->log, "write filter %x" _ chain); @@ -177,12 +183,10 @@ static void *ngx_http_write_filter_creat static char *ngx_http_write_filter_merge_conf(ngx_pool_t *pool, void *parent, void *child) { - ngx_http_write_filter_conf_t *prev = - (ngx_http_write_filter_conf_t *) parent; - ngx_http_write_filter_conf_t *conf = - (ngx_http_write_filter_conf_t *) child; + ngx_http_write_filter_conf_t *prev = parent; + ngx_http_write_filter_conf_t *conf = child; - ngx_conf_size_merge(conf->buffer_output, prev->buffer_output, 1460); + ngx_conf_merge_size_value(conf->buffer_output, prev->buffer_output, 1460); return NULL; }