[java-shib-metadata] branch main updated: JSMD-13: Add support for HttpClient requestTimeout param

Brent Putman putmanb at georgetown.edu
Fri Dec 6 15:25:22 UTC 2024


This is an automated email from the git hooks/post-receive script.

putmanb pushed a commit to branch main
in repository java-shib-metadata.

View the commit online:
http://git.shibboleth.net/view/?p=java-shib-metadata.git;a=commit;h=9f10a79ba40ee3abcd218fe2a0fd44c84e9bb01e

The following commit(s) were added to refs/heads/main by this push:
     new 9f10a79b JSMD-13: Add support for HttpClient requestTimeout param
9f10a79b is described below

commit 9f10a79ba40ee3abcd218fe2a0fd44c84e9bb01e
Author: Brent Putman <putmanb at georgetown.edu>
AuthorDate: Fri Dec 6 10:24:55 2024 -0500

    JSMD-13: Add support for HttpClient requestTimeout param
    
    Per call discussion, revert the dynamic HTTP metadata resolver parser to
    null/not enabled like the builder default.
---
 .../spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
index 9480d5f7..e94062fe 100644
--- a/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
+++ b/shib-metadata-spring/src/main/java/net/shibboleth/spring/metadata/AbstractDynamicHTTPMetadataProviderParser.java
@@ -59,7 +59,8 @@ public abstract class AbstractDynamicHTTPMetadataProviderParser extends Abstract
     @Nonnull @NotEmpty private static final String DEFAULT_RESPONSE_TIMEOUT = "PT5S";
 
     /** Default request timeout. */
-    @Nonnull @NotEmpty private static final String DEFAULT_REQUEST_TIMEOUT = "PT30S";
+    //TODO enable and change this to something reasonable in 6.0. Also enable in code below.
+    //@Nonnull @NotEmpty private static final String DEFAULT_REQUEST_TIMEOUT = "CHANGEME";
 
     /** Logger. */
     private final Logger log = LoggerFactory.getLogger(AbstractDynamicHTTPMetadataProviderParser.class);
@@ -144,9 +145,11 @@ public abstract class AbstractDynamicHTTPMetadataProviderParser extends Abstract
         if (!element.hasAttributeNS(null, "responseTimeout")) {
             clientBuilder.addPropertyValue("responseTimeout", DEFAULT_RESPONSE_TIMEOUT);
         }
+        /* TODO enable in 6.0.
         if (!element.hasAttributeNS(null, "requestTimeout")) {
             clientBuilder.addPropertyValue("requestTimeout", DEFAULT_REQUEST_TIMEOUT);
         }
+        */
 
         if (element.hasAttributeNS(null, "maxConnectionsTotal")) {
             clientBuilder.addPropertyValue("maxConnectionsTotal",

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.


More information about the commits mailing list