nginx: src/http/ngx_http_upstream.c comparison

Merged with the default branch.

comparison

equal deleted inserted replaced

-:0433e69f5425
+:5c86189a1c1b
 static ngx_int_t
 ngx_http_upstream_thread_handler(ngx_thread_task_t *task, ngx_file_t *file)
 {
 ngx_str_t                  name;
 ngx_event_pipe_t          *p;
+ngx_connection_t          *c;
 ngx_thread_pool_t         *tp;
 ngx_http_request_t        *r;
 ngx_http_core_loc_conf_t  *clcf;
 r = file->thread_ctx;
 p = r->upstream->pipe;
+if (r->aio) {
+/*
+* tolerate sendfile() calls if another operation is already
+* running; this can happen due to subrequests, multiple calls
+* of the next body filter from a filter, or in HTTP/2 due to
+* a write event on the main connection
+*/
+c = r->connection;
+#if (NGX_HTTP_V2)
+if (r->stream) {
+c = r->stream->connection->connection;
+}
+#endif
+if (task == c->sendfile_task) {
+return NGX_OK;
+}
+}
 clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 tp = clcf->thread_pool;
 if (tp == NULL) {
 ngx_log_debug2(NGX_LOG_DEBUG_HTTP, c->log, 0,
 "http upstream thread: \"%V?%V\"", &r->uri, &r->args);
 r->main->blocked--;
 r->aio = 0;
+#if (NGX_HTTP_V2)
+if (r->stream) {
+/*
+* for HTTP/2, update write event to make sure processing will
+* reach the main connection to handle sendfile() in threads
+*/
+c->write->ready = 1;
+c->write->active = 0;
+}
+#endif
 if (r->done) {
 /*
 * trigger connection event handler if the subrequest was
 * already finalized; this can happen if the handler is used

Mercurial > hg > nginx