From e5ed7cb9347f9cc817b2d3576aed78d55a935bcf Mon Sep 17 00:00:00 2001
From: Hakase <hakase@hakase.app>
Date: Wed, 27 May 2020 20:31:46 +0900
Subject: [PATCH] Release - v1.19.0

---
 .hgtags                    |  2 +-
 docs/xml/nginx/changes.xml | 39 ++++++++++++++++++++++++++++++++++----
 misc/GNUmakefile           |  2 +-
 src/http/v2/ngx_http_v2.c  | 10 ++++------
 4 files changed, 41 insertions(+), 12 deletions(-)

diff --git a/.hgtags b/.hgtags
index 9c97bf4..cf161ee 100644
--- a/.hgtags
+++ b/.hgtags
@@ -449,4 +449,4 @@ e56295fe0ea76bf53b06bffa77a2d3a9a335cb8c release-1.17.7
 fdacd273711ddf20f778c1fb91529ab53979a454 release-1.17.8
 5e8d52bca714d4b85284ddb649d1ba4a3ca978a8 release-1.17.9
 c44970de01474f6f3e01b0adea85ec1d03e3a5f2 release-1.17.10
-f8052414dbe9453578a9f6e753eb507be709c35a release-1.18.0
+cbe6ba650211541310618849168631ce0b788f35 release-1.19.0
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index 9ed7769..423ccac 100644
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -5,14 +5,45 @@
 <change_log title="nginx">
 
 
-<changes ver="1.18.0" date="2020-04-21">
+<changes ver="1.19.0" date="2020-05-26">
 
-<change>
+<change type="feature">
 <para lang="ru">
-Стабильная ветка 1.18.x.
+проверка клиентских сертификатов с помощью OCSP.
 </para>
 <para lang="en">
-1.18.x stable branch.
+client certificate validation with OCSP.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+при работе с gRPC-бэкендами
+могли возникать ошибки "upstream sent frame for closed stream".
+</para>
+<para lang="en">
+"upstream sent frame for closed stream" errors might occur
+when working with gRPC backends.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+OCSP stapling мог не работать,
+если не была указана директива resolver.
+</para>
+<para lang="en">
+OCSP stapling might not work
+if the "resolver" directive was not specified.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+соединения с некорректным HTTP/2 preface не логгировались.
+</para>
+<para lang="en">
+connections with incorrect HTTP/2 preface were not logged.
 </para>
 </change>
 
diff --git a/misc/GNUmakefile b/misc/GNUmakefile
index 7f39e9d..4582e44 100644
--- a/misc/GNUmakefile
+++ b/misc/GNUmakefile
@@ -6,7 +6,7 @@ TEMP =		tmp
 
 CC =		cl
 OBJS =		objs.msvc8
-OPENSSL =	openssl-1.1.1f
+OPENSSL =	openssl-1.1.1g
 ZLIB =		zlib-1.2.11
 PCRE =		pcre-8.44
 
diff --git a/src/http/v2/ngx_http_v2.c b/src/http/v2/ngx_http_v2.c
index ded983a..0eb4103 100644
--- a/src/http/v2/ngx_http_v2.c
+++ b/src/http/v2/ngx_http_v2.c
@@ -733,9 +733,8 @@ ngx_http_v2_state_preface(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (ngx_memcmp(pos, preface, sizeof(preface) - 1) != 0) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                       "invalid http2 connection preface \"%*s\"",
-                       sizeof(preface) - 1, pos);
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "invalid connection preface");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }
@@ -756,9 +755,8 @@ ngx_http_v2_state_preface_end(ngx_http_v2_connection_t *h2c, u_char *pos,
     }
 
     if (ngx_memcmp(pos, preface, sizeof(preface) - 1) != 0) {
-        ngx_log_debug2(NGX_LOG_DEBUG_HTTP, h2c->connection->log, 0,
-                       "invalid http2 connection preface \"%*s\"",
-                       sizeof(preface) - 1, pos);
+        ngx_log_error(NGX_LOG_INFO, h2c->connection->log, 0,
+                      "invalid connection preface");
 
         return ngx_http_v2_connection_error(h2c, NGX_HTTP_V2_PROTOCOL_ERROR);
     }