mirror/nginx
1
0
Fork 0
mirror of https://github.com/nginx/nginx.git synced 2025-06-07 17:52:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

nginx-0.0.11-2004-09-19-22:27:00 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-09-19 18:27:00 +00:00
parent 307c3add78
commit a2c81197b5
3 changed files with 85 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/ngx_output_chain.c
View File

@ -67,6 +67,7 @@ ngx_int_t ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
"zero size buf"); "zero size buf");
ctx->in = ctx->in->next; ctx->in = ctx->in->next;
continue; continue;
} }
@ -146,6 +147,7 @@ ngx_int_t ngx_output_chain(ngx_output_chain_ctx_t *ctx, ngx_chain_t *in)
if (out) { if (out) {
break; break;
} }
return rc; return rc;
} }

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

@ -51,9 +51,11 @@ typedef struct {
unsigned flush:4; unsigned flush:4;
unsigned redo:1; unsigned redo:1;
unsigned pass:1;
unsigned done:1; unsigned done:1;
#if 0
unsigned pass:1;
unsigned blocked:1; unsigned blocked:1;
#endif
size_t zin; size_t zin;
size_t zout; size_t zout;
@ -445,8 +447,10 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9)); ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
ngx_test_null(ctx->preallocated, ngx_palloc(r->pool, ctx->allocated), if (!(ctx->preallocated = ngx_palloc(r->pool, ctx->allocated))) {
NGX_ERROR); return NGX_ERROR;
}
ctx->free_mem = ctx->preallocated; ctx->free_mem = ctx->preallocated;
ctx->zstream.zalloc = ngx_http_gzip_filter_alloc; ctx->zstream.zalloc = ngx_http_gzip_filter_alloc;
@ -462,7 +466,9 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
return ngx_http_gzip_error(ctx); return ngx_http_gzip_error(ctx);
} }
ngx_test_null(b, ngx_calloc_buf(r->pool), ngx_http_gzip_error(ctx)); if (!(b = ngx_pcalloc(r->pool, sizeof(ngx_buf_t)))) {
return ngx_http_gzip_error(ctx);
}
b->memory = 1; b->memory = 1;
b->pos = gzheader; b->pos = gzheader;
@ -488,7 +494,7 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
for ( ;; ) { for ( ;; ) {
/* is there a data to gzip ? */ /* does zlib need a new data ? */
if (ctx->zstream.avail_in == 0 if (ctx->zstream.avail_in == 0
&& ctx->flush == Z_NO_FLUSH && ctx->flush == Z_NO_FLUSH
@ -519,6 +525,7 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->done = 1; ctx->done = 1;
return NGX_ERROR; return NGX_ERROR;
} }
/**/
if (ctx->in_buf->last_buf) { if (ctx->in_buf->last_buf) {
ctx->flush = Z_FINISH; ctx->flush = Z_FINISH;
@ -538,28 +545,37 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
} }
} }
/* is there a space for the gzipped data ? */ /* is there a space for the gzipped data ? */
if (ctx->zstream.avail_out == 0) { if (ctx->zstream.avail_out == 0) {
if (ctx->free) { if (ctx->free) {
ctx->out_buf = ctx->free->buf; ctx->out_buf = ctx->free->buf;
ctx->free = ctx->free->next; ctx->free = ctx->free->next;
} else if (ctx->bufs < conf->bufs.num) { } else if (ctx->bufs < conf->bufs.num) {
ngx_test_null(ctx->out_buf, ctx->out_buf = ngx_create_temp_buf(r->pool,
ngx_create_temp_buf(r->pool, conf->bufs.size), conf->bufs.size);
ngx_http_gzip_error(ctx)); if (ctx->out_buf == NULL) {
return ngx_http_gzip_error(ctx);
}
ctx->out_buf->tag = (ngx_buf_tag_t) ctx->out_buf->tag = (ngx_buf_tag_t)
&ngx_http_gzip_filter_module; &ngx_http_gzip_filter_module;
ctx->out_buf->recycled = 1; ctx->out_buf->recycled = 1;
ctx->bufs++; ctx->bufs++;
} else { } else {
#if 0
ctx->blocked = 1; ctx->blocked = 1;
#endif
break; break;
} }
#if 0
ctx->blocked = 0; ctx->blocked = 0;
#endif
ctx->zstream.next_out = ctx->out_buf->pos; ctx->zstream.next_out = ctx->out_buf->pos;
ctx->zstream.avail_out = conf->bufs.size; ctx->zstream.avail_out = conf->bufs.size;
} }
@ -571,6 +587,7 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->flush, ctx->redo); ctx->flush, ctx->redo);
rc = deflate(&ctx->zstream, ctx->flush); rc = deflate(&ctx->zstream, ctx->flush);
if (rc != Z_OK && rc != Z_STREAM_END) { if (rc != Z_OK && rc != Z_STREAM_END) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"deflate() failed: %d, %d", ctx->flush, rc); "deflate() failed: %d, %d", ctx->flush, rc);
@ -599,10 +616,14 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->out_buf->last = ctx->zstream.next_out; ctx->out_buf->last = ctx->zstream.next_out;
if (ctx->zstream.avail_out == 0) { if (ctx->zstream.avail_out == 0) {
/* zlib wants to output some more gzipped data */
ngx_alloc_link_and_set_buf(cl, ctx->out_buf, r->pool, ngx_alloc_link_and_set_buf(cl, ctx->out_buf, r->pool,
ngx_http_gzip_error(ctx)); ngx_http_gzip_error(ctx));
*ctx->last_out = cl; *ctx->last_out = cl;
ctx->last_out = &cl->next; ctx->last_out = &cl->next;
ctx->redo = 1; ctx->redo = 1;
continue; continue;
@ -611,6 +632,7 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->redo = 0; ctx->redo = 0;
if (ctx->flush == Z_SYNC_FLUSH) { if (ctx->flush == Z_SYNC_FLUSH) {
ctx->out_buf->flush = 0; ctx->out_buf->flush = 0;
ctx->flush = Z_NO_FLUSH; ctx->flush = Z_NO_FLUSH;
@ -618,7 +640,10 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ngx_http_gzip_error(ctx)); ngx_http_gzip_error(ctx));
*ctx->last_out = cl; *ctx->last_out = cl;
ctx->last_out = &cl->next; ctx->last_out = &cl->next;
#if 0
ctx->pass = 1; ctx->pass = 1;
#endif
break; break;
} }
@ -629,6 +654,7 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->zout = 10 + ctx->zstream.total_out + 8; ctx->zout = 10 + ctx->zstream.total_out + 8;
rc = deflateEnd(&ctx->zstream); rc = deflateEnd(&ctx->zstream);
if (rc != Z_OK) { if (rc != Z_OK) {
ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0, ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
"deflateEnd() failed: %d", rc); "deflateEnd() failed: %d", rc);
@ -648,8 +674,9 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->out_buf->last_buf = 1; ctx->out_buf->last_buf = 1;
} else { } else {
ngx_test_null(b, ngx_create_temp_buf(r->pool, 8), if (!(b = ngx_create_temp_buf(r->pool, 8))) {
ngx_http_gzip_error(ctx)); return ngx_http_gzip_error(ctx);
}
b->last_buf = 1; b->last_buf = 1;
@ -680,7 +707,9 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ctx->zstream.avail_out = 0; ctx->zstream.avail_out = 0;
ctx->done = 1; ctx->done = 1;
#if 0
ctx->pass = 1; ctx->pass = 1;
#endif
break; break;
} }
@ -690,12 +719,19 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
ngx_http_gzip_error(ctx)); ngx_http_gzip_error(ctx));
*ctx->last_out = cl; *ctx->last_out = cl;
ctx->last_out = &cl->next; ctx->last_out = &cl->next;
#if 0
ctx->pass = 1; ctx->pass = 1;
#endif
break; break;
} }
} }
#if 0
/* OLD CODE */
if (ctx->out) { if (ctx->out) {
if (ctx->pass) { if (ctx->pass) {
ctx->pass = 0; ctx->pass = 0;
@ -704,6 +740,11 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
return last; return last;
} }
} else if (ctx->busy->buf && ngx_buf_size(ctx->busy->buf)) {
if (last != NGX_NONE) {
return last;
}
} else if (ctx->blocked) { } else if (ctx->blocked) {
if (last != NGX_NONE) { if (last != NGX_NONE) {
return last; return last;
@ -716,9 +757,27 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
return last; return last;
} }
#endif
/* NEW CODE */
if (last == NGX_AGAIN) {
return NGX_AGAIN;
}
if (ctx->out == NULL && ctx->busy == NULL) {
return NGX_OK;
}
/**/
last = ngx_http_next_body_filter(r, ctx->out); last = ngx_http_next_body_filter(r, ctx->out);
/*
* we do not check NGX_AGAIN here because the downstream filters
* may free some buffers and zlib may compress some data into them
*/
if (last == NGX_ERROR) { if (last == NGX_ERROR) {
return ngx_http_gzip_error(ctx); return ngx_http_gzip_error(ctx);
} }
@ -873,22 +932,22 @@ static void *ngx_http_gzip_create_conf(ngx_conf_t *cf)
{ {
ngx_http_gzip_conf_t *conf; ngx_http_gzip_conf_t *conf;
ngx_test_null(conf, if (!(conf = ngx_pcalloc(cf->pool, sizeof(ngx_http_gzip_conf_t)))) {
ngx_pcalloc(cf->pool, sizeof(ngx_http_gzip_conf_t)), return NGX_CONF_ERROR;
NGX_CONF_ERROR); }
/* set by ngx_pcalloc(): /*
set by ngx_pcalloc():
conf->bufs.num = 0; conf->bufs.num = 0;
conf->proxied = 0; conf->proxied = 0;
*/ */
conf->enable = NGX_CONF_UNSET; conf->enable = NGX_CONF_UNSET;
conf->no_buffer = NGX_CONF_UNSET; conf->no_buffer = NGX_CONF_UNSET;
conf->http_version = NGX_CONF_UNSET_UINT; conf->http_version = NGX_CONF_UNSET_UINT;
conf->level = NGX_CONF_UNSET; conf->level = NGX_CONF_UNSET;
@ -933,16 +992,14 @@ static char *ngx_http_gzip_set_window(ngx_conf_t *cf, void *post, void *data)
int wbits, wsize; int wbits, wsize;
ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "WBITS: %d", *np);
wbits = 15; wbits = 15;
for (wsize = 32 * 1024; wsize > 256; wsize >>= 1) { for (wsize = 32 * 1024; wsize > 256; wsize >>= 1) {
if (wsize == *np) { if (wsize == *np) {
*np = wbits; *np = wbits;
ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "WBITS: %d", *np);
return NULL; return NGX_CONF_OK;
} }
wbits--; wbits--;
@ -958,16 +1015,14 @@ static char *ngx_http_gzip_set_hash(ngx_conf_t *cf, void *post, void *data)
int memlevel, hsize; int memlevel, hsize;
ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "MEMLEVEL: %d", *np);
memlevel = 9; memlevel = 9;
for (hsize = 128 * 1024; hsize > 256; hsize >>= 1) { for (hsize = 128 * 1024; hsize > 256; hsize >>= 1) {
if (hsize == *np) { if (hsize == *np) {
*np = memlevel; *np = memlevel;
ngx_conf_log_error(NGX_LOG_INFO, cf, 0, "MEMLEVEL: %d", *np);
return NULL; return NGX_CONF_OK;
} }
memlevel--; memlevel--;

2
src/http/ngx_http_request.c
View File

@ -1153,7 +1153,7 @@ static ngx_int_t ngx_http_process_request_header(ngx_http_request_t *r)
if (!r->headers_in.msie && !r->headers_in.opera) { if (!r->headers_in.msie && !r->headers_in.opera) {
if (ngx_strstr(user_agent, "Gecko")) { if (ngx_strstr(user_agent, "Gecko/")) {
r->headers_in.gecko = 1; r->headers_in.gecko = 1;
} else if (ngx_strstr(user_agent, "Konqueror")) { } else if (ngx_strstr(user_agent, "Konqueror")) {