diff options
| author | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 15:46:14 +0000 |
|---|---|---|
| committer | Igor Sysoev <igor@sysoev.ru> | 2010-02-01 15:46:14 +0000 |
| commit | 95a5ecb1ac78b14b759ada666b2114783fc1c2d2 (patch) | |
| tree | 69fc825a431c976c901abe733501a8662e048845 /src/os/win32/ngx_process_cycle.c | |
| parent | 848cc35a653e893add69b580c864d0cd8b419860 (diff) | |
| download | nginx-95a5ecb1ac78b14b759ada666b2114783fc1c2d2.tar.gz nginx-95a5ecb1ac78b14b759ada666b2114783fc1c2d2.tar.bz2 | |
merge r3137, r3198, r3199, r3353, r3370, r3371, r3398, r3399:
cache related fixes:
*) do not pass buf with empty cached response,
this fixes "zero size buf in output" alert
*) hide cacheable Set-Cookie and P3P FastCGI response headers
*) test comma separator in "Cache-Control"
*) a cache manager thread handle was overwritten by a cache loader thread
handle, this caused an exit delay, the bug had been introduced in r3248
*) fix handling cached HTTP/0.9 response
*) log proxied HTTP/0.9 responses status as "009"
*) fix the "If-None-Match" header name
*) fix a cached zero-length body case
Diffstat (limited to 'src/os/win32/ngx_process_cycle.c')
| -rw-r--r-- | src/os/win32/ngx_process_cycle.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/os/win32/ngx_process_cycle.c b/src/os/win32/ngx_process_cycle.c index 59016b961..e3b513a1c 100644 --- a/src/os/win32/ngx_process_cycle.c +++ b/src/os/win32/ngx_process_cycle.c @@ -599,7 +599,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) HANDLE mev, events[3]; u_long nev, ev; ngx_err_t err; - ngx_tid_t wtid, cmtid; + ngx_tid_t wtid, cmtid, cltid; ngx_log_t *log; log = cycle->log; @@ -671,7 +671,7 @@ ngx_worker_process_cycle(ngx_cycle_t *cycle, char *mevn) goto failed; } - if (ngx_create_thread(&cmtid, ngx_cache_loader_thread, NULL, log) != 0) { + if (ngx_create_thread(&cltid, ngx_cache_loader_thread, NULL, log) != 0) { goto failed; } |