[trafficserver] branch master updated: s3_auth: Clear handling TSAction in the config_reloader (#10556)

[masaori]

This is an automated email from the ASF dual-hosted git repository.

masaori pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/master by this push:
 new baeaf9a07f s3_auth: Clear handling TSAction in the config_reloader 
(#10556)
baeaf9a07f is described below

commit baeaf9a07f627a463f6fcfc0df6e0ae19e31fd0e
Author: Masaori Koshiba 
AuthorDate: Mon Oct 16 08:03:54 2023 +0900

s3_auth: Clear handling TSAction in the config_reloader (#10556)
---
 plugins/s3_auth/s3_auth.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/plugins/s3_auth/s3_auth.cc b/plugins/s3_auth/s3_auth.cc
index f43ce16006..a849cabf94 100644
--- a/plugins/s3_auth/s3_auth.cc
+++ b/plugins/s3_auth/s3_auth.cc
@@ -1053,7 +1053,9 @@ int
 config_reloader(TSCont cont, TSEvent event, void *edata)
 {
   Dbg(dbg_ctl, "reloading configs");
-  S3Config *s3  = static_cast(TSContDataGet(cont));
+  S3Config *s3 = static_cast(TSContDataGet(cont));
+  s3->check_current_action(edata);
+
   S3Config *file_config = gConfCache.get(s3->conf_fname());
 
   if (!file_config || !file_config->valid()) {
@@ -1064,7 +1066,6 @@ config_reloader(TSCont cont, TSEvent event, void *edata)
   {
 std::unique_lock lock(s3->reload_mutex);
 s3->copy_changes_from(file_config);
-s3->check_current_action(edata);
   }
 
   if (s3->expiration() == 0) {

[trafficserver] branch 9.2.x updated: Fix typo in block_errors documentation (#10591)

[bcall]

This is an automated email from the ASF dual-hosted git repository.

bcall pushed a commit to branch 9.2.x
in repository https://gitbox.apache.org/repos/asf/trafficserver.git


The following commit(s) were added to refs/heads/9.2.x by this push:
 new 3c01c31d8a Fix typo in block_errors documentation (#10591)
3c01c31d8a is described below

commit 3c01c31d8aa3e7e9725843125eadf3ca0aaa5a47
Author: Masakazu Kitajo 
AuthorDate: Fri Oct 13 04:36:20 2023 +0900

Fix typo in block_errors documentation (#10591)

(cherry picked from commit 641704b5c078edaba5b8082de6262a40bcd2d4fa)
---
 doc/admin-guide/plugins/block_errors.en.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/doc/admin-guide/plugins/block_errors.en.rst 
b/doc/admin-guide/plugins/block_errors.en.rst
index c08d597726..dcffaa835a 100644
--- a/doc/admin-guide/plugins/block_errors.en.rst
+++ b/doc/admin-guide/plugins/block_errors.en.rst
@@ -59,7 +59,7 @@ The plugin can be configured at run time using the 
`traffic_ctl` command.  The f
 - ``block_errors.error_limit``: Set the error limit.  Takes a single argument, 
the number of errors allowed before blocking the client.
 - ``block_errors.timeout``: Set the block timeout.  Takes a single argument, 
the number of minutes to block the client.
 - ``block_errors.shutdown``: Set the shutdown mode.  Takes a single argument, 
0 to downgrade to HTTP/1.1, 1 to close the connection.
-- ``block_errors.enable``: Enable or disable the plugin.  Takes a single 
argument, 0 to disable, 1 to enable.
+- ``block_errors.enabled``: Enable or disable the plugin.  Takes a single 
argument, 0 to disable, 1 to enable.
 
 Example Run Time Configuration
 ==
@@ -70,4 +70,4 @@ Example Run Time Configuration
 
 traffic_ctl plugin msg block_errors.shutdown 1
 
-traffic_ctl plugin msg block_errors.enable 1
+traffic_ctl plugin msg block_errors.enabled 1