From 3540d4f1fc5967a730cb3db22dda954a3c8e6595 Mon Sep 17 00:00:00 2001
From: Hakase <hakase@hakase.app>
Date: Thu, 15 Jun 2023 17:32:12 +0900
Subject: [PATCH] Latest update - 9124 (nginx 1.25.1)

---
 .hgtags                             |  1 +
 docs/xml/nginx/changes.xml          | 43 +++++++++++++++++++++++++++++
 src/event/quic/ngx_event_quic_ack.c |  2 +-
 3 files changed, 45 insertions(+), 1 deletion(-)

diff --git a/.hgtags b/.hgtags
index 4655010..cfa3b32 100644
--- a/.hgtags
+++ b/.hgtags
@@ -473,3 +473,4 @@ aa901551a7ebad1e8b0f8c11cb44e3424ba29707 release-1.23.2
 ff3afd1ce6a6b65057741df442adfaa71a0e2588 release-1.23.3
 ac779115ed6ee4f3039e9aea414a54e560450ee2 release-1.23.4
 12dcf92b0c2c68552398f19644ce3104459807d7 release-1.25.0
+f8134640e8615448205785cf00b0bc810489b495 release-1.25.1
diff --git a/docs/xml/nginx/changes.xml b/docs/xml/nginx/changes.xml
index b30f643..1d19936 100644
--- a/docs/xml/nginx/changes.xml
+++ b/docs/xml/nginx/changes.xml
@@ -5,6 +5,49 @@
 <change_log title="nginx">
 
 
+<changes ver="1.25.1" date="2023-06-13">
+
+<change type="feature">
+<para lang="ru">
+директива http2, позволяющая включать HTTP/2 в отдельных блоках server;
+параметр http2 директивы listen объявлен устаревшим.
+</para>
+<para lang="en">
+the "http2" directive, which enables HTTP/2 on a per-server basis;
+the "http2" parameter of the "listen" directive is now deprecated.
+</para>
+</change>
+
+<change type="change">
+<para lang="ru">
+поддержка HTTP/2 server push упразднена.
+</para>
+<para lang="en">
+HTTP/2 server push support has been removed.
+</para>
+</change>
+
+<change type="change">
+<para lang="ru">
+устаревшая директива ssl больше не поддерживается.
+</para>
+<para lang="en">
+the deprecated "ssl" directive is not supported anymore.
+</para>
+</change>
+
+<change type="bugfix">
+<para lang="ru">
+в HTTP/3 при использовании OpenSSL.
+</para>
+<para lang="en">
+in HTTP/3 when using OpenSSL.
+</para>
+</change>
+
+</changes>
+
+
 <changes ver="1.25.0" date="2023-05-23">
 
 <change type="feature">
diff --git a/src/event/quic/ngx_event_quic_ack.c b/src/event/quic/ngx_event_quic_ack.c
index 21ee888..f194abf 100644
--- a/src/event/quic/ngx_event_quic_ack.c
+++ b/src/event/quic/ngx_event_quic_ack.c
@@ -207,9 +207,9 @@ ngx_quic_rtt_sample(ngx_connection_t *c, ngx_quic_ack_frame_t *ack,
             adjusted_rtt -= ack_delay;
         }
 
-        qc->avg_rtt += (adjusted_rtt >> 3) - (qc->avg_rtt >> 3);
         rttvar_sample = ngx_abs((ngx_msec_int_t) (qc->avg_rtt - adjusted_rtt));
         qc->rttvar += (rttvar_sample >> 2) - (qc->rttvar >> 2);
+        qc->avg_rtt += (adjusted_rtt >> 3) - (qc->avg_rtt >> 3);
     }
 
     ngx_log_debug4(NGX_LOG_DEBUG_EVENT, c->log, 0,