wrapper/nginx-sid
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update upstream source from tag 'upstream/1.13.12'

Browse source 
Update to upstream version '1.13.12'
with Debian dir 2e1c135610
This commit is contained in:
Christos Trochalakis 2018-04-11 08:18:08 +03:00
commit 3ae03ddcfe
4 changed files with 26 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
CHANGES
View file

@ -1,4 +1,10 @@
Changes with nginx 1.13.12 10 Apr 2018
*) Bugfix: connections with gRPC backends might be closed unexpectedly
when returning a large response.
Changes with nginx 1.13.11 03 Apr 2018
*) Feature: the "proxy_protocol" parameter of the "listen" directive now

6
CHANGES.ru
View file

@ -1,4 +1,10 @@
Изменения в nginx 1.13.12 10.04.2018
*) Исправление: при возврате большого ответа соединения с gRPC-бэкендами
могли неожиданно закрываться.
Изменения в nginx 1.13.11 03.04.2018
*) Добавление: параметр proxy_protocol директивы listen теперь

4
src/core/nginx.h
View file

@ -9,8 +9,8 @@
#define _NGINX_H_INCLUDED_
#define nginx_version 1013011
#define NGINX_VERSION "1.13.11"
#define nginx_version 1013012
#define NGINX_VERSION "1.13.12"
#define NGINX_VER "nginx/" NGINX_VERSION
#ifdef NGX_BUILD

18
src/http/ngx_http_upstream.c
View file

@ -2013,8 +2013,6 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
/* rc == NGX_OK */
u->request_body_sent = 1;
if (c->write->timer_set) {
ngx_del_timer(c->write);
}
@ -2041,11 +2039,19 @@ ngx_http_upstream_send_request(ngx_http_request_t *r, ngx_http_upstream_t *u,
return;
}
ngx_add_timer(c->read, u->conf->read_timeout);
if (!u->request_body_sent) {
u->request_body_sent = 1;
if (c->read->ready) {
ngx_http_upstream_process_header(r, u);
return;
if (u->header_sent) {
return;
}
ngx_add_timer(c->read, u->conf->read_timeout);
if (c->read->ready) {
ngx_http_upstream_process_header(r, u);
return;
}
}
}