Mercurial > hg > nginx-quic
view src/os/unix/ngx_thread_cond.c @ 6887:17000e3ba589 stable-1.10
Addition filter: set last_in_chain flag when clearing last_buf.
When the last_buf flag is cleared for add_after_body to append more data from a
subrequest, other filters may still have buffered data, which should be flushed
at this point. For example, the sub_filter may have a partial match buffered,
which will only be flushed after the subrequest is done, ending up with
interleaved data in output.
Setting last_in_chain instead of last_buf flushes the data and fixes the order
of output buffers.
author | Roman Arutyunyan <arut@nginx.com> |
---|---|
date | Mon, 03 Oct 2016 21:03:27 +0300 |
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; }