merge_response_headers: fix lang iteration

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1935005 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/http/http_filters.c b/modules/http/http_filters.c
index 3b042c34c136c8517a566507f30fc8ecf1e61a97..1c0e1782bde5bb39e52a1612df030cb411fc90b0 100644 (file)
--- a/modules/http/http_filters.c
+++ b/modules/http/http_filters.c
@@ -2135,10 +2135,10 @@ static void merge_response_headers(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;

diff --git a/modules/http2/h2_c2_filter.c b/modules/http2/h2_c2_filter.c
index 7874cae138cfae001842dfd4edf8470dacb4f4cd..17a2c131d8c4a43955ded13d36806d9cea503c4d 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;