mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-01-19 01:42:58 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.3-2004-04-26-17:40:01 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-04-26 13:40:01 +00:00
parent 3f4685f3de
commit a30a028f14
4 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/event/modules/ngx_poll_module.c
View File

@ -404,7 +404,7 @@ int ngx_poll_process_events(ngx_cycle_t *cycle)
}
#endif
if (event_list[i].revents & (POLLERR|POLLNVAL)) {
if (event_list[i].revents & POLLNVAL) {
ngx_log_error(NGX_LOG_ALERT, cycle->log, 0,
"poll() error fd:%d ev:%04X rev:%04X",
event_list[i].fd,

28
src/http/modules/ngx_http_gzip_filter.c
View File

@ -591,15 +591,15 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ctx->in_hunk, ctx->in_hunk->pos);
#if 0
if (!ctx->redo) {
if (ctx->zstream.next_in) {
ctx->in_hunk->pos = ctx->zstream.next_in;
ctx->out_hunk->last = ctx->zstream.next_out;
if (ctx->zstream.avail_in == 0) {
ctx->zstream.next_in = NULL;
}
}
#else
ctx->in_hunk->pos = ctx->zstream.next_in;
ctx->out_hunk->last = ctx->zstream.next_out;
#endif
if (ctx->zstream.avail_out == 0) {
ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
@ -626,9 +626,7 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
break;
}
if (ctx->flush == Z_FINISH) {
/* rc == Z_STREAM_END */
if (rc == Z_STREAM_END) {
ctx->zin = ctx->zstream.total_in;
ctx->zout = 10 + ctx->zstream.total_out + 8;
@ -642,8 +640,6 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ngx_pfree(r->pool, ctx->preallocated);
ctx->flush = Z_NO_FLUSH;
ngx_alloc_link_and_set_hunk(cl, ctx->out_hunk, r->pool,
ngx_http_gzip_error(ctx));
*ctx->last_out = cl;
@ -716,12 +712,6 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
return last;
}
#if 0
if (ctx->out == NULL && last != NGX_NONE) {
return last;
}
#endif
last = ngx_http_next_body_filter(r, ctx->out);
if (last == NGX_ERROR) {
@ -731,6 +721,10 @@ static int ngx_http_gzip_body_filter(ngx_http_request_t *r, ngx_chain_t *in)
ngx_chain_update_chains(&ctx->free, &ctx->busy, &ctx->out,
(ngx_hunk_tag_t) &ngx_http_gzip_filter_module);
ctx->last_out = &ctx->out;
if (ctx->done) {
return last;
}
}
}

4
src/http/ngx_http_output_filter.c
View File

@ -58,6 +58,10 @@ ngx_int_t ngx_http_output_filter(ngx_http_request_t *r, ngx_chain_t *in)
ngx_output_chain_ctx_t *ctx;
ngx_http_output_filter_conf_t *conf;
if (r->connection->write->error) {
return NGX_ERROR;
}
ctx = ngx_http_get_module_ctx(r->main ? r->main : r,
ngx_http_output_filter_module);

2
src/os/unix/ngx_process_cycle.c
View File

@ -273,7 +273,9 @@ void ngx_single_process_cycle(ngx_cycle_t *cycle, ngx_master_ctx_t *ctx)
{
ngx_uint_t i;
#if 0
ngx_setproctitle("single worker process");
#endif
ngx_init_temp_number();