# HG changeset patch
# User Roman Arutyunyan <arut@nginx.com>
# Date 1684518396 -14400
# Node ID 235d482ef6bc8c40a956b2413865d42c94e0fc05
# Parent  b71e69247483631bd8fc79a47cc32b762625b1fb# Parent  e92a03d1d6dad22866e9e5e09fac8545cbdb15e4
Merged with the quic branch.

diff -r e92a03d1d6da -r 235d482ef6bc docs/text/LICENSE
--- a/docs/text/LICENSE	Sun May 14 10:31:24 2023 +0400
+++ b/docs/text/LICENSE	Fri May 19 21:46:36 2023 +0400
@@ -1,6 +1,6 @@
 /* 
  * Copyright (C) 2002-2021 Igor Sysoev
- * Copyright (C) 2011-2022 Nginx, Inc.
+ * Copyright (C) 2011-2023 Nginx, Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
diff -r e92a03d1d6da -r 235d482ef6bc misc/GNUmakefile
--- a/misc/GNUmakefile	Sun May 14 10:31:24 2023 +0400
+++ b/misc/GNUmakefile	Fri May 19 21:46:36 2023 +0400
@@ -75,6 +75,8 @@
 		--with-http_slice_module				\
 		--with-mail						\
 		--with-stream						\
+		--with-stream_realip_module				\
+		--with-stream_ssl_preread_module			\
 		--with-openssl=$(OBJS)/lib/$(OPENSSL)			\
 		--with-openssl-opt="no-asm no-tests -D_WIN32_WINNT=0x0501" \
 		--with-http_ssl_module					\
diff -r e92a03d1d6da -r 235d482ef6bc src/core/nginx.h
--- a/src/core/nginx.h	Sun May 14 10:31:24 2023 +0400
+++ b/src/core/nginx.h	Fri May 19 21:46:36 2023 +0400
@@ -9,8 +9,8 @@
 #define _NGINX_H_INCLUDED_
 
 
-#define nginx_version      1023004
-#define NGINX_VERSION      "1.23.4"
+#define nginx_version      1025000
+#define NGINX_VERSION      "1.25.0"
 #define NGINX_VER          "nginx/" NGINX_VERSION
 
 #ifdef NGX_BUILD
diff -r e92a03d1d6da -r 235d482ef6bc src/core/ngx_regex.c
--- a/src/core/ngx_regex.c	Sun May 14 10:31:24 2023 +0400
+++ b/src/core/ngx_regex.c	Fri May 19 21:46:36 2023 +0400
@@ -732,14 +732,14 @@
         return NULL;
     }
 
-    cln->handler = ngx_regex_cleanup;
-    cln->data = rcf;
-
     rcf->studies = ngx_list_create(cycle->pool, 8, sizeof(ngx_regex_elt_t));
     if (rcf->studies == NULL) {
         return NULL;
     }
 
+    cln->handler = ngx_regex_cleanup;
+    cln->data = rcf;
+
     ngx_regex_studies = rcf->studies;
 
     return rcf;
diff -r e92a03d1d6da -r 235d482ef6bc src/http/ngx_http_variables.c
--- a/src/http/ngx_http_variables.c	Sun May 14 10:31:24 2023 +0400
+++ b/src/http/ngx_http_variables.c	Fri May 19 21:46:36 2023 +0400
@@ -828,7 +828,7 @@
     ngx_http_variable_value_t *v, uintptr_t data, u_char sep)
 {
     size_t            len;
-    u_char           *p;
+    u_char           *p, *end;
     ngx_table_elt_t  *h, *th;
 
     h = *(ngx_table_elt_t **) ((char *) r + data);
@@ -870,6 +870,8 @@
     v->len = len;
     v->data = p;
 
+    end = p + len;
+
     for (th = h; th; th = th->next) {
 
         if (th->hash == 0) {
@@ -878,7 +880,7 @@
 
         p = ngx_copy(p, th->value.data, th->value.len);
 
-        if (th->next == NULL) {
+        if (p == end) {
             break;
         }