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-20-19:17:02 import

Browse Source
This commit is contained in:
Igor Sysoev 2004-09-20 15:17:02 +00:00
parent a2c81197b5
commit e5dabbf077
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/event/ngx_event_accept.c
View File

@ -129,7 +129,6 @@ void ngx_event_accept(ngx_event_t *ev)
#if (NGX_STAT_STUB) #if (NGX_STAT_STUB)
(*ngx_stat_accepted)++; (*ngx_stat_accepted)++;
(*ngx_stat_active)++;
#endif #endif
ngx_accept_disabled = (ngx_uint_t) s + NGX_ACCEPT_THRESHOLD ngx_accept_disabled = (ngx_uint_t) s + NGX_ACCEPT_THRESHOLD
@ -150,6 +149,10 @@ void ngx_event_accept(ngx_event_t *ev)
return; return;
} }
#if (NGX_STAT_STUB)
(*ngx_stat_active)++;
#endif
/* set a blocking mode for aio and non-blocking mode for the others */ /* set a blocking mode for aio and non-blocking mode for the others */
if (ngx_inherited_nonblocking) { if (ngx_inherited_nonblocking) {

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

@ -440,9 +440,8 @@ static ngx_int_t ngx_http_gzip_body_filter(ngx_http_request_t *r,
* Besides we free this memory as soon as the gzipping will complete * Besides we free this memory as soon as the gzipping will complete
* and do not wait while a whole response will be sent to a client. * and do not wait while a whole response will be sent to a client.
* *
* 8K is for zlib deflate_state (~6K). * 8K is for zlib deflate_state. It takes 5816 bytes on x86
* * and 5920 bytes on amd64.
* TODO: 64-bit, autoconf of deflate_state size
*/ */
ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9)); ctx->allocated = 8192 + (1 << (wbits + 2)) + (1 << (memlevel + 9));
@ -804,8 +803,9 @@ static void *ngx_http_gzip_filter_alloc(void *opaque, u_int items, u_int size)
if (alloc % 512 != 0) { if (alloc % 512 != 0) {
/* /*
* allocate the zlib deflate_state, it takes about 6K on x86, * The zlib deflate_state allocation, it takes 5816 bytes on x86
* we allocate 8K * and 5920 bytes on amd64.
* We allocate 8K.
*/ */
alloc = (alloc + ngx_pagesize - 1) & ~(ngx_pagesize - 1); alloc = (alloc + ngx_pagesize - 1) & ~(ngx_pagesize - 1);