Mercurial > hg > nginx-quic
view src/os/unix/ngx_thread_cond.c @ 6428:545b5e4d83b2
Upstream: avoid closing client connection in edge case.
If proxy_cache is enabled, and proxy_no_cache tests true, it was previously
possible for the client connection to be closed after a 304. The fix is to
recheck r->header_only after the final cacheability is determined, and end the
request if no longer cacheable.
Example configuration:
proxy_cache foo;
proxy_cache_bypass 1;
proxy_no_cache 1;
If a client sends If-None-Match, and the upstream server returns 200 with a
matching ETag, no body should be returned to the client. At the start of
ngx_http_upstream_send_response proxy_no_cache is not yet tested, thus cacheable
is still 1 and downstream_error is set.
However, by the time the downstream_error check is done in process_request,
proxy_no_cache has been tested and cacheable is set to 0. The client connection
is then closed, regardless of keepalive.
author | Justin Li <jli.justinli@gmail.com> |
---|---|
date | Tue, 08 Mar 2016 22:31:55 -0500 |
parents | 466bd63b63d1 |
children | 022ea0d17177 |
line wrap: on
line source
/* * Copyright (C) Igor Sysoev * Copyright (C) Nginx, Inc. */ #include <ngx_config.h> #include <ngx_core.h> ngx_int_t ngx_thread_cond_create(ngx_thread_cond_t *cond, ngx_log_t *log) { ngx_err_t err; err = pthread_cond_init(cond, NULL); if (err == 0) { ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "pthread_cond_init(%p)", cond); return NGX_OK; } ngx_log_error(NGX_LOG_EMERG, log, err, "pthread_cond_init() failed"); return NGX_ERROR; } ngx_int_t ngx_thread_cond_destroy(ngx_thread_cond_t *cond, ngx_log_t *log) { ngx_err_t err; err = pthread_cond_destroy(cond); if (err == 0) { ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "pthread_cond_destroy(%p)", cond); return NGX_OK; } ngx_log_error(NGX_LOG_EMERG, log, err, "pthread_cond_destroy() failed"); return NGX_ERROR; } ngx_int_t ngx_thread_cond_signal(ngx_thread_cond_t *cond, ngx_log_t *log) { ngx_err_t err; err = pthread_cond_signal(cond); if (err == 0) { ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "pthread_cond_signal(%p)", cond); return NGX_OK; } ngx_log_error(NGX_LOG_EMERG, log, err, "pthread_cond_signal() failed"); return NGX_ERROR; } ngx_int_t ngx_thread_cond_wait(ngx_thread_cond_t *cond, ngx_thread_mutex_t *mtx, ngx_log_t *log) { ngx_err_t err; ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "pthread_cond_wait(%p) enter", cond); err = pthread_cond_wait(cond, mtx); #if 0 ngx_time_update(); #endif if (err == 0) { ngx_log_debug1(NGX_LOG_DEBUG_CORE, log, 0, "pthread_cond_wait(%p) exit", cond); return NGX_OK; } ngx_log_error(NGX_LOG_ALERT, log, err, "pthread_cond_wait() failed"); return NGX_ERROR; }