From aaa65137f64217791d8506101783e1c905ef33d5 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Thu, 15 Feb 2024 19:55:58 -0800
Subject: [PATCH 01/15] Modify "header_forward_pattern" to match headers
 case-insensitively. Add unit tests.

---
 qa/L0_parameters/parameters_test.py | 17 +++++++++--------
 qa/L0_parameters/test.sh            |  6 ++++--
 src/command_line_parser.cc          | 11 +++++++++--
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/qa/L0_parameters/parameters_test.py b/qa/L0_parameters/parameters_test.py
index 190326fc2c..8c28675b97 100755
--- a/qa/L0_parameters/parameters_test.py
+++ b/qa/L0_parameters/parameters_test.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
-# Copyright 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -54,13 +54,14 @@ async def asyncSetUp(self):
         self.async_grpc = asyncgrpcclient.InferenceServerClient(url="localhost:8001")
 
         self.parameter_list = []
-        self.parameter_list.append({"key1": "value1", "key2": "value2"})
-        self.parameter_list.append({"key1": 1, "key2": 2})
-        self.parameter_list.append({"key1": 123.123, "key2": 321.321})
-        self.parameter_list.append({"key1": True, "key2": "value2"})
-        self.parameter_list.append({"triton_": True, "key2": "value2"})
-
-        if TEST_HEADER == "1":
+        if TEST_HEADER in ["0","1"]:
+            self.parameter_list.append({"key1": "value1", "key2": "value2"})
+            self.parameter_list.append({"key1": 1, "key2": 2})
+            self.parameter_list.append({"key1": 123.123, "key2": 321.321})
+            self.parameter_list.append({"key1": True, "key2": "value2"})
+            self.parameter_list.append({"triton_": True, "key2": "value2"})
+
+        if TEST_HEADER in ["1","2"]:
             self.headers = {
                 "header_1": "value_1",
                 "header_2": "value_2",
diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index 967ead15c7..9d2396be07 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -54,12 +54,14 @@ mkdir -p "${MODELDIR}/ensemble/1"
 # https://jirasw.nvidia.com/browse/DLIS-4673
 
 RET=0
-for i in {0..1}; do
+for i in {0..2}; do
 
   # TEST_HEADER is a parameter used by `parameters_test.py` that controls
   # whether the script will test for inclusion of headers in parameters or not.
   if [ $i == 1 ]; then
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern my_header.* --http-header-forward-pattern my_header.*"
+  elif [ $i == 2 ]; then
+    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern MY_HEADER.* --http-header-forward-pattern MY_HEADER.*"
   else
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
   fi
@@ -73,7 +75,7 @@ for i in {0..1}; do
   set +e
   TEST_HEADER=$i python3 $TEST_SCRIPT_PY >$CLIENT_LOG 2>&1
   if [ $? -ne 0 ]; then
-      cat $CLIENT_LOG
+        cat $CLIENT_LOG
       echo -e "\n***\n*** Test Failed\n***"
       RET=1
   fi
diff --git a/src/command_line_parser.cc b/src/command_line_parser.cc
index 5b490a45f6..1ba9fe2175 100644
--- a/src/command_line_parser.cc
+++ b/src/command_line_parser.cc
@@ -1235,6 +1235,11 @@ TritonParser::Parse(int argc, char** argv)
   triton::server::grpc::Options& lgrpc_options = lparams.grpc_options_;
 #endif  // TRITON_ENABLE_GRPC
 
+#if defined TRITON_ENABLE_HTTP || defined TRITON_ENABLE_GRPC
+  // According to HTTP specification header names are case-insensitive.
+  const std::string case_insensitive_prefix{"(?i)"};
+#endif  // TRITON_ENABLE_HTTP || TRITON_ENABLE_GRPC
+
 #ifdef TRITON_ENABLE_VERTEX_AI
   // Set different default value if specific flag is set
   {
@@ -1345,7 +1350,8 @@ TritonParser::Parse(int argc, char** argv)
           lparams.http_address_ = optarg;
           break;
         case OPTION_HTTP_HEADER_FORWARD_PATTERN:
-          lparams.http_forward_header_pattern_ = optarg;
+          lparams.http_forward_header_pattern_ =
+              std::move(case_insensitive_prefix + optarg);
           break;
           break;
         case OPTION_HTTP_THREAD_COUNT:
@@ -1484,7 +1490,8 @@ TritonParser::Parse(int argc, char** argv)
           break;
         }
         case OPTION_GRPC_HEADER_FORWARD_PATTERN:
-          lgrpc_options.forward_header_pattern_ = optarg;
+          lgrpc_options.forward_header_pattern_ =
+              std::move(case_insensitive_prefix + optarg);
           break;
 #endif  // TRITON_ENABLE_GRPC
 

From dcf2c94989ea36a983691d0a7c00b50d2e6c23e2 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Thu, 15 Feb 2024 20:13:50 -0800
Subject: [PATCH 02/15] fix indentation

---
 qa/L0_parameters/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index 9d2396be07..fce504ff55 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -75,7 +75,7 @@ for i in {0..2}; do
   set +e
   TEST_HEADER=$i python3 $TEST_SCRIPT_PY >$CLIENT_LOG 2>&1
   if [ $? -ne 0 ]; then
-        cat $CLIENT_LOG
+      cat $CLIENT_LOG
       echo -e "\n***\n*** Test Failed\n***"
       RET=1
   fi

From 95244bf5f27bc81bd20b541ca1af92f4280db96d Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Thu, 15 Feb 2024 23:19:36 -0800
Subject: [PATCH 03/15] fix pre-comiit errors

---
 qa/L0_parameters/parameters_test.py | 4 ++--
 qa/L0_parameters/test.sh            | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/qa/L0_parameters/parameters_test.py b/qa/L0_parameters/parameters_test.py
index 8c28675b97..a18b0ea86e 100755
--- a/qa/L0_parameters/parameters_test.py
+++ b/qa/L0_parameters/parameters_test.py
@@ -54,14 +54,14 @@ async def asyncSetUp(self):
         self.async_grpc = asyncgrpcclient.InferenceServerClient(url="localhost:8001")
 
         self.parameter_list = []
-        if TEST_HEADER in ["0","1"]:
+        if TEST_HEADER in ["0", "1"]:
             self.parameter_list.append({"key1": "value1", "key2": "value2"})
             self.parameter_list.append({"key1": 1, "key2": 2})
             self.parameter_list.append({"key1": 123.123, "key2": 321.321})
             self.parameter_list.append({"key1": True, "key2": "value2"})
             self.parameter_list.append({"triton_": True, "key2": "value2"})
 
-        if TEST_HEADER in ["1","2"]:
+        if TEST_HEADER in ["1", "2"]:
             self.headers = {
                 "header_1": "value_1",
                 "header_2": "value_2",
diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index fce504ff55..01e45f6db2 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

From 08793a46bbcc3f2d29b98e953dcc352c97d9e10c Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Tue, 20 Feb 2024 16:19:27 -0800
Subject: [PATCH 04/15] Update doc

---
 docs/protocol/extension_parameters.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/protocol/extension_parameters.md b/docs/protocol/extension_parameters.md
index 4cdb60cf38..843d3e9472 100644
--- a/docs/protocol/extension_parameters.md
+++ b/docs/protocol/extension_parameters.md
@@ -98,6 +98,11 @@ value. For example to forward all the headers that start with 'PREFIX_' from
 both HTTP and GRPC, you should add `--http-header-forward-pattern PREFIX_.*
 --grpc-header-forward-pattern PREFIX_.*` to your `tritonserver` command.
 
+By default, the regular expression pattern matches headers with case-insensitive
+mode according to the HTTP protocol. If you want to enforce case-sensitive mode,
+simplying adding the `(?-i)` prefix which turns off case-insensitive mode, e.g.
+`--http-header-forward-pattern (?-i)PREFIX_.*`.
+
 The forwarded headers can be accessed using the
 [Python](https://github.com/triton-inference-server/python_backend#inference-request-parameters)
 or C Backend APIs as inference request parameters.

From b6579f99877bf6bca36f18479128562e625ff05e Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Tue, 20 Feb 2024 16:22:05 -0800
Subject: [PATCH 05/15] Update copyright

---
 docs/protocol/extension_parameters.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/protocol/extension_parameters.md b/docs/protocol/extension_parameters.md
index 843d3e9472..c02ec3cfd2 100644
--- a/docs/protocol/extension_parameters.md
+++ b/docs/protocol/extension_parameters.md
@@ -1,5 +1,5 @@
 <!--
-# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions

From 9bcc428d18d582c0e3c03d6e3269597fcd48a7c5 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Wed, 21 Feb 2024 23:24:22 -0800
Subject: [PATCH 06/15] Add test case for "(?-i)", which disables regex
 case-insensitive mode.

---
 qa/L0_parameters/parameters_test.py | 17 +++++++++--------
 qa/L0_parameters/test.sh            |  4 +++-
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/qa/L0_parameters/parameters_test.py b/qa/L0_parameters/parameters_test.py
index a18b0ea86e..debeba6855 100755
--- a/qa/L0_parameters/parameters_test.py
+++ b/qa/L0_parameters/parameters_test.py
@@ -54,14 +54,15 @@ async def asyncSetUp(self):
         self.async_grpc = asyncgrpcclient.InferenceServerClient(url="localhost:8001")
 
         self.parameter_list = []
-        if TEST_HEADER in ["0", "1"]:
-            self.parameter_list.append({"key1": "value1", "key2": "value2"})
-            self.parameter_list.append({"key1": 1, "key2": 2})
-            self.parameter_list.append({"key1": 123.123, "key2": 321.321})
-            self.parameter_list.append({"key1": True, "key2": "value2"})
-            self.parameter_list.append({"triton_": True, "key2": "value2"})
-
-        if TEST_HEADER in ["1", "2"]:
+        self.parameter_list.append({"key1": "value1", "key2": "value2"})
+        self.parameter_list.append({"key1": 1, "key2": 2})
+        self.parameter_list.append({"key1": 123.123, "key2": 321.321})
+        self.parameter_list.append({"key1": True, "key2": "value2"})
+        self.parameter_list.append({"triton_": True, "key2": "value2"})
+
+        # Only test 0 tests parameters without headers.
+        test_header = (TEST_HEADER != "0")
+        if test_header:
             self.headers = {
                 "header_1": "value_1",
                 "header_2": "value_2",
diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index 01e45f6db2..6574e2c9dc 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -54,7 +54,7 @@ mkdir -p "${MODELDIR}/ensemble/1"
 # https://jirasw.nvidia.com/browse/DLIS-4673
 
 RET=0
-for i in {0..2}; do
+for i in {0..3}; do
 
   # TEST_HEADER is a parameter used by `parameters_test.py` that controls
   # whether the script will test for inclusion of headers in parameters or not.
@@ -62,6 +62,8 @@ for i in {0..2}; do
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern my_header.* --http-header-forward-pattern my_header.*"
   elif [ $i == 2 ]; then
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern MY_HEADER.* --http-header-forward-pattern MY_HEADER.*"
+  elif [ $i == 3 ]; then
+    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern (?-i)my_header.* --http-header-forward-pattern (?-i)my_header.*"
   else
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
   fi

From 8a7759360a997b81ecd4195265ee54c91a2679f9 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Wed, 21 Feb 2024 23:31:46 -0800
Subject: [PATCH 07/15] fix pre-commit

---
 qa/L0_parameters/parameters_test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/L0_parameters/parameters_test.py b/qa/L0_parameters/parameters_test.py
index debeba6855..04641fdf29 100755
--- a/qa/L0_parameters/parameters_test.py
+++ b/qa/L0_parameters/parameters_test.py
@@ -61,7 +61,7 @@ async def asyncSetUp(self):
         self.parameter_list.append({"triton_": True, "key2": "value2"})
 
         # Only test 0 tests parameters without headers.
-        test_header = (TEST_HEADER != "0")
+        test_header = TEST_HEADER != "0"
         if test_header:
             self.headers = {
                 "header_1": "value_1",

From 13cf583cef10bf89648a5e4ec40eac3d4d838ea7 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Thu, 22 Feb 2024 19:34:29 -0800
Subject: [PATCH 08/15] Name each test. Remove support of disabling
 --http-header-forward-pattern case-insensitive mode on http python client.

---
 docs/protocol/extension_parameters.md |  3 ++-
 qa/L0_parameters/parameters_test.py   | 24 ++++++++++++++++--------
 qa/L0_parameters/test.sh              | 15 ++++++++++-----
 3 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/docs/protocol/extension_parameters.md b/docs/protocol/extension_parameters.md
index c02ec3cfd2..7873da329e 100644
--- a/docs/protocol/extension_parameters.md
+++ b/docs/protocol/extension_parameters.md
@@ -101,7 +101,8 @@ both HTTP and GRPC, you should add `--http-header-forward-pattern PREFIX_.*
 By default, the regular expression pattern matches headers with case-insensitive
 mode according to the HTTP protocol. If you want to enforce case-sensitive mode,
 simplying adding the `(?-i)` prefix which turns off case-insensitive mode, e.g.
-`--http-header-forward-pattern (?-i)PREFIX_.*`.
+`--http-header-forward-pattern (?-i)PREFIX_.*`. Note `(?-i)` prefix does not work
+with HTTP Python Client.
 
 The forwarded headers can be accessed using the
 [Python](https://github.com/triton-inference-server/python_backend#inference-request-parameters)
diff --git a/qa/L0_parameters/parameters_test.py b/qa/L0_parameters/parameters_test.py
index 04641fdf29..284d2946e9 100755
--- a/qa/L0_parameters/parameters_test.py
+++ b/qa/L0_parameters/parameters_test.py
@@ -60,9 +60,8 @@ async def asyncSetUp(self):
         self.parameter_list.append({"key1": True, "key2": "value2"})
         self.parameter_list.append({"triton_": True, "key2": "value2"})
 
-        # Only test 0 tests parameters without headers.
-        test_header = TEST_HEADER != "0"
-        if test_header:
+        # Only "test_params" tests parameters without headers.
+        if TEST_HEADER != "test_params":
             self.headers = {
                 "header_1": "value_1",
                 "header_2": "value_2",
@@ -72,11 +71,20 @@ async def asyncSetUp(self):
             }
 
             # only these headers should be forwarded to the model.
-            self.expected_headers = {
-                "my_header_1": "my_value_1",
-                "my_header_2": "my_value_2",
-                "my_header_3": 'This is a "quoted" string with a backslash\ ',
-            }
+            if TEST_HEADER == "test_header_forward_pattern_case_insensitive":
+                self.expected_headers = {
+                    "my_header_1": "my_value_1",
+                    "my_header_2": "my_value_2",
+                    "my_header_3": 'This is a "quoted" string with a backslash\ ',
+                }
+            elif TEST_HEADER == "test_header_forward_pattern_case_sensitive":
+                self.expected_headers = {}
+            else:
+                self.expected_headers = {
+                    "my_header_1": "my_value_1",
+                    "my_header_2": "my_value_2",
+                    "my_header_3": 'This is a "quoted" string with a backslash\ ',
+                }
         else:
             self.headers = {}
             self.expected_headers = {}
diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index 6574e2c9dc..ccd5ae173e 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -53,17 +53,22 @@ mkdir -p "${MODELDIR}/ensemble/1"
 # TODO: Add support and testing for C++ client parameters:
 # https://jirasw.nvidia.com/browse/DLIS-4673
 
+all_tests=("test_params"
+           "test_parameters_and_headers"
+           "test_header_forward_pattern_case_insensitive"
+           "test_header_forward_pattern_case_sensitive")
+
 RET=0
-for i in {0..3}; do
+for i in "${all_tests[@]}"; do
 
   # TEST_HEADER is a parameter used by `parameters_test.py` that controls
   # whether the script will test for inclusion of headers in parameters or not.
-  if [ $i == 1 ]; then
+  if [ $i == "test_parameters_and_headers" ]; then
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern my_header.* --http-header-forward-pattern my_header.*"
-  elif [ $i == 2 ]; then
+  elif [ $i == "test_header_forward_pattern_case_insensitive" ]; then
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern MY_HEADER.* --http-header-forward-pattern MY_HEADER.*"
-  elif [ $i == 3 ]; then
-    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern (?-i)my_header.* --http-header-forward-pattern (?-i)my_header.*"
+  elif [ $i == "test_grpc_header_forward_pattern_case_sensitive" ]; then
+    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern (?-i)MY_HEADER.*
   else
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
   fi

From f0f4cd6d3ea137d4623a92e87e979948a37ee4ba Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Fri, 23 Feb 2024 11:17:03 -0800
Subject: [PATCH 09/15] Update .md file.

---
 docs/protocol/extension_parameters.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/protocol/extension_parameters.md b/docs/protocol/extension_parameters.md
index 7873da329e..24fa3f5471 100644
--- a/docs/protocol/extension_parameters.md
+++ b/docs/protocol/extension_parameters.md
@@ -101,8 +101,8 @@ both HTTP and GRPC, you should add `--http-header-forward-pattern PREFIX_.*
 By default, the regular expression pattern matches headers with case-insensitive
 mode according to the HTTP protocol. If you want to enforce case-sensitive mode,
 simplying adding the `(?-i)` prefix which turns off case-insensitive mode, e.g.
-`--http-header-forward-pattern (?-i)PREFIX_.*`. Note `(?-i)` prefix does not work
-with HTTP Python Client.
+`--http-header-forward-pattern (?-i)PREFIX_.*`. Note `(?-i)` prefix is not supported
+on HTTP Python client.
 
 The forwarded headers can be accessed using the
 [Python](https://github.com/triton-inference-server/python_backend#inference-request-parameters)

From 9091887e72c076e3c051f05d0e324398666cbc17 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Fri, 23 Feb 2024 14:12:26 -0800
Subject: [PATCH 10/15] fix typo

---
 qa/L0_parameters/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index ccd5ae173e..5833536cc9 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -68,7 +68,7 @@ for i in "${all_tests[@]}"; do
   elif [ $i == "test_header_forward_pattern_case_insensitive" ]; then
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern MY_HEADER.* --http-header-forward-pattern MY_HEADER.*"
   elif [ $i == "test_grpc_header_forward_pattern_case_sensitive" ]; then
-    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern (?-i)MY_HEADER.*
+    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern (?-i)MY_HEADER.*"
   else
     SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
   fi

From f937fcdb145152c47f32a4dd0402832e85080c3c Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Fri, 23 Feb 2024 14:34:34 -0800
Subject: [PATCH 11/15] Reformat args.

---
 qa/L0_parameters/test.sh | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index 5833536cc9..ac3c383290 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -60,17 +60,17 @@ all_tests=("test_params"
 
 RET=0
 for i in "${all_tests[@]}"; do
-
   # TEST_HEADER is a parameter used by `parameters_test.py` that controls
   # whether the script will test for inclusion of headers in parameters or not.
+  SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
   if [ $i == "test_parameters_and_headers" ]; then
-    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern my_header.* --http-header-forward-pattern my_header.*"
+    SERVER_ARGS+=" --grpc-header-forward-pattern my_header.*"
+    SERVER_ARGS+=" --http-header-forward-pattern my_header.*"
   elif [ $i == "test_header_forward_pattern_case_insensitive" ]; then
-    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern MY_HEADER.* --http-header-forward-pattern MY_HEADER.*"
+    SERVER_ARGS+=" --grpc-header-forward-pattern MY_HEADER.*"
+    SERVER_ARGS+=" --http-header-forward-pattern MY_HEADER.*"
   elif [ $i == "test_grpc_header_forward_pattern_case_sensitive" ]; then
-    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120 --grpc-header-forward-pattern (?-i)MY_HEADER.*"
-  else
-    SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
+    SERVER_ARGS+=" --grpc-header-forward-pattern (?-i)MY_HEADER.*"    
   fi
   run_server
   if [ "$SERVER_PID" == "0" ]; then

From 740f9bbe63cade8ad10aaad8adb90d78c95deb22 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Fri, 23 Feb 2024 14:39:43 -0800
Subject: [PATCH 12/15] Fix pre-commit

---
 qa/L0_parameters/test.sh | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index ac3c383290..46dbdb4614 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -63,14 +63,14 @@ for i in "${all_tests[@]}"; do
   # TEST_HEADER is a parameter used by `parameters_test.py` that controls
   # whether the script will test for inclusion of headers in parameters or not.
   SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
-  if [ $i == "test_parameters_and_headers" ]; then
+  if [ "$i" == "test_parameters_and_headers" ]; then
     SERVER_ARGS+=" --grpc-header-forward-pattern my_header.*"
     SERVER_ARGS+=" --http-header-forward-pattern my_header.*"
-  elif [ $i == "test_header_forward_pattern_case_insensitive" ]; then
+  elif [ "$i" == "test_header_forward_pattern_case_insensitive" ]; then
     SERVER_ARGS+=" --grpc-header-forward-pattern MY_HEADER.*"
     SERVER_ARGS+=" --http-header-forward-pattern MY_HEADER.*"
-  elif [ $i == "test_grpc_header_forward_pattern_case_sensitive" ]; then
-    SERVER_ARGS+=" --grpc-header-forward-pattern (?-i)MY_HEADER.*"    
+  elif [ "$i" == "test_grpc_header_forward_pattern_case_sensitive" ]; then
+    SERVER_ARGS+=" --grpc-header-forward-pattern (?-i)MY_HEADER.*"
   fi
   run_server
   if [ "$SERVER_PID" == "0" ]; then
@@ -80,7 +80,7 @@ for i in "${all_tests[@]}"; do
   fi
 
   set +e
-  TEST_HEADER=$i python3 $TEST_SCRIPT_PY >$CLIENT_LOG 2>&1
+  TEST_HEADER="$i" python3 $TEST_SCRIPT_PY >$CLIENT_LOG 2>&1
   if [ $? -ne 0 ]; then
       cat $CLIENT_LOG
       echo -e "\n***\n*** Test Failed\n***"

From f73ec96ebe734d8fc61144f808e3e87a3f1a738b Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Mon, 26 Feb 2024 12:30:33 -0800
Subject: [PATCH 13/15] Fix test name issue.

---
 qa/L0_parameters/parameters_test.py |  8 +-------
 qa/L0_parameters/test.sh            | 10 +++++++---
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/qa/L0_parameters/parameters_test.py b/qa/L0_parameters/parameters_test.py
index 284d2946e9..a20d13c1eb 100755
--- a/qa/L0_parameters/parameters_test.py
+++ b/qa/L0_parameters/parameters_test.py
@@ -71,13 +71,7 @@ async def asyncSetUp(self):
             }
 
             # only these headers should be forwarded to the model.
-            if TEST_HEADER == "test_header_forward_pattern_case_insensitive":
-                self.expected_headers = {
-                    "my_header_1": "my_value_1",
-                    "my_header_2": "my_value_2",
-                    "my_header_3": 'This is a "quoted" string with a backslash\ ',
-                }
-            elif TEST_HEADER == "test_header_forward_pattern_case_sensitive":
+            if TEST_HEADER == "test_grpc_header_forward_pattern_case_sensitive":
                 self.expected_headers = {}
             else:
                 self.expected_headers = {
diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index 46dbdb4614..d8ae3fb785 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -54,21 +54,25 @@ mkdir -p "${MODELDIR}/ensemble/1"
 # https://jirasw.nvidia.com/browse/DLIS-4673
 
 all_tests=("test_params"
-           "test_parameters_and_headers"
+           "test_headers"
            "test_header_forward_pattern_case_insensitive"
-           "test_header_forward_pattern_case_sensitive")
+           "test_grpc_header_forward_pattern_case_sensitive")
 
 RET=0
 for i in "${all_tests[@]}"; do
   # TEST_HEADER is a parameter used by `parameters_test.py` that controls
   # whether the script will test for inclusion of headers in parameters or not.
   SERVER_ARGS="--model-repository=${MODELDIR} --exit-timeout-secs=120"
-  if [ "$i" == "test_parameters_and_headers" ]; then
+  if [ "$i" == "test_headers" ]; then
     SERVER_ARGS+=" --grpc-header-forward-pattern my_header.*"
     SERVER_ARGS+=" --http-header-forward-pattern my_header.*"
   elif [ "$i" == "test_header_forward_pattern_case_insensitive" ]; then
     SERVER_ARGS+=" --grpc-header-forward-pattern MY_HEADER.*"
     SERVER_ARGS+=" --http-header-forward-pattern MY_HEADER.*"
+  # NOTE: headers sent through the python HTTP client may be automatically
+  # lowercased by internal libraries like geventhttpclient, so we only test 
+  # GRPC client for case-sensitivity here:
+  # https://github.com/geventhttpclient/geventhttpclient/blob/d1e14356c3b02099c879cf9b3bdb684a0cbd8bf5/src/geventhttpclient/header.py#L62-L63
   elif [ "$i" == "test_grpc_header_forward_pattern_case_sensitive" ]; then
     SERVER_ARGS+=" --grpc-header-forward-pattern (?-i)MY_HEADER.*"
   fi

From 91cbded4eba1af01bfa47d3f03d6c76fb4befff1 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Mon, 26 Feb 2024 12:33:10 -0800
Subject: [PATCH 14/15] Fix pre-commit.

---
 qa/L0_parameters/test.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index d8ae3fb785..b366771458 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -70,7 +70,7 @@ for i in "${all_tests[@]}"; do
     SERVER_ARGS+=" --grpc-header-forward-pattern MY_HEADER.*"
     SERVER_ARGS+=" --http-header-forward-pattern MY_HEADER.*"
   # NOTE: headers sent through the python HTTP client may be automatically
-  # lowercased by internal libraries like geventhttpclient, so we only test 
+  # lowercased by internal libraries like geventhttpclient, so we only test
   # GRPC client for case-sensitivity here:
   # https://github.com/geventhttpclient/geventhttpclient/blob/d1e14356c3b02099c879cf9b3bdb684a0cbd8bf5/src/geventhttpclient/header.py#L62-L63
   elif [ "$i" == "test_grpc_header_forward_pattern_case_sensitive" ]; then

From 44218665e704949e23a9a39ef289b95a266a77b1 Mon Sep 17 00:00:00 2001
From: Yingge He <yinggeh@nvidia.com>
Date: Mon, 26 Feb 2024 14:09:52 -0800
Subject: [PATCH 15/15] Update md file and copyright.

---
 docs/protocol/extension_parameters.md | 6 +++---
 qa/L0_parameters/test.sh              | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/protocol/extension_parameters.md b/docs/protocol/extension_parameters.md
index 24fa3f5471..14ed4d1dc5 100644
--- a/docs/protocol/extension_parameters.md
+++ b/docs/protocol/extension_parameters.md
@@ -1,5 +1,5 @@
 <!--
-# Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -101,8 +101,8 @@ both HTTP and GRPC, you should add `--http-header-forward-pattern PREFIX_.*
 By default, the regular expression pattern matches headers with case-insensitive
 mode according to the HTTP protocol. If you want to enforce case-sensitive mode,
 simplying adding the `(?-i)` prefix which turns off case-insensitive mode, e.g.
-`--http-header-forward-pattern (?-i)PREFIX_.*`. Note `(?-i)` prefix is not supported
-on HTTP Python client.
+`--http-header-forward-pattern (?-i)PREFIX_.*`. Note, headers sent through the
+Python HTTP client may be automatically lower-cased by internal client libraries.
 
 The forwarded headers can be accessed using the
 [Python](https://github.com/triton-inference-server/python_backend#inference-request-parameters)
diff --git a/qa/L0_parameters/test.sh b/qa/L0_parameters/test.sh
index b366771458..c53b02d4b7 100755
--- a/qa/L0_parameters/test.sh
+++ b/qa/L0_parameters/test.sh
@@ -1,5 +1,5 @@
 #!/bin/bash
-# Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
+# Copyright 2023-2024, NVIDIA CORPORATION. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions