From fdf38dd1a9909817d4a0fe9ff53bbb09b02b692d Mon Sep 17 00:00:00 2001 From: Yann Ylavic Date: Wed, 1 Jun 2022 10:23:31 +0000 Subject: [PATCH] mod_proxy: Follow up to r1901485: Don't shadow upper 'val' variable. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1901486 13f79535-47bb-0310-9956-ffa450edef68 --- modules/proxy/proxy_util.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c index 423fb7c0e4..cf6c0adaf1 100644 --- a/modules/proxy/proxy_util.c +++ b/modules/proxy/proxy_util.c @@ -4044,9 +4044,9 @@ PROXY_DECLARE(int) ap_proxy_create_hdrbrgd(apr_pool_t *p, */ if (do_100_continue) { /* Add the Expect header if not already there. */ - const char *val = apr_table_get(r->headers_in, "Expect"); - if (!val || (ap_cstr_casecmp(val, "100-Continue") != 0 /* fast path */ - && !ap_find_token(r->pool, val, "100-Continue"))) { + if (!(val = apr_table_get(r->headers_in, "Expect")) + || (ap_cstr_casecmp(val, "100-Continue") != 0 /* fast path */ + && !ap_find_token(r->pool, val, "100-Continue"))) { apr_table_mergen(r->headers_in, "Expect", "100-Continue"); } }