Merge r1935005 from trunk:

merge_response_headers: fix lang iteration

reviewed by: covener, jfclere, jorton

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1935006 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 9f7f3fca6b6ac2ecad22983517f814755ff00944..51b1126aec444df5230ba1f169b5327598c7ef9d 100644 (file)
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -1386,10 +1386,10 @@ static void merge_response_headers(request_rec *r, const char **protocol)
     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;

diff --git a/modules/http2/h2_c2_filter.c b/modules/http2/h2_c2_filter.c
index 523a941450b88f6286f806a3ac551daf0b035eb5..d770fe91d8397c8b5167adf83b3deb476c49ca0d 100644 (file)
--- a/modules/http2/h2_c2_filter.c
+++ b/modules/http2/h2_c2_filter.c
@@ -307,10 +307,10 @@ static h2_headers *create_response(request_rec *r)
     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;