svn commit: r1935006 - in httpd/httpd/branches/2.4.x: . modules/http modules/http2

Author: covener
Date: Fri Jun  5 10:05:36 2026
New Revision: 1935006

Log:
Merge r1935005 from trunk:

merge_response_headers: fix lang iteration

reviewed by: covener, jfclere, jorton

Modified:
   httpd/httpd/branches/2.4.x/   (props changed)
   httpd/httpd/branches/2.4.x/modules/http/http_filters.c
   httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c

Modified: httpd/httpd/branches/2.4.x/modules/http/http_filters.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http/http_filters.c	Fri Jun  5 10:03:07 2026	(r1935005)
+++ httpd/httpd/branches/2.4.x/modules/http/http_filters.c	Fri Jun  5 10:05:36 2026	(r1935006)
@@ -1386,10 +1386,10 @@ static void merge_response_headers(reque
     if (!apr_is_empty_array(r->content_languages)) {
         int i;
         char *token;
-        char **languages = (char **)(r->content_languages->elts);
         const char *field = apr_table_get(r->headers_out, "Content-Language");
 
         while (field && (token = ap_get_list_item(r->pool, &field)) != NULL) {
+            char **languages = (char **)(r->content_languages->elts);
             for (i = 0; i < r->content_languages->nelts; ++i) {
                 if (!ap_cstr_casecmp(token, languages[i]))
                     break;

Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c	Fri Jun  5 10:03:07 2026	(r1935005)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_c2_filter.c	Fri Jun  5 10:05:36 2026	(r1935006)
@@ -307,10 +307,10 @@ static h2_headers *create_response(reque
     if (!apr_is_empty_array(r->content_languages)) {
         int i;
         char *token;
-        char **languages = (char **)(r->content_languages->elts);
         const char *field = apr_table_get(r->headers_out, "Content-Language");
 
         while (field && (token = ap_get_list_item(r->pool, &field)) != NULL) {
+            char **languages = (char **)(r->content_languages->elts);
             for (i = 0; i < r->content_languages->nelts; ++i) {
                 if (!ap_cstr_casecmp(token, languages[i]))
                     break;