Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adding retry port TCP option to Servlet 4.0 Fat_2 #30348

Merged
merged 1 commit into from
Dec 6, 2024
+13 −6
Merged

Adding retry port TCP option to Servlet 4.0 Fat_2 #30348

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion ...m.ws.webcontainer.servlet.4.0_fat.2/publish/files/serverConfigs/ResponseHeadersServer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2021 IBM Corporation and others.
Copyright (c) 2021, 2024 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -41,6 +41,7 @@
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<headers add="foo:bar"/>
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

</server>
3 changes: 2 additions & 1 deletion dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_headers/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2021 IBM Corporation and others.
Copyright (c) 2024 IBM Corporation and others.
pnicolucci marked this conversation as resolved.
Show resolved Hide resolved
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand All @@ -21,6 +21,7 @@
host="*"
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

<javaPermission className="java.util.PropertyPermission"
Expand Down
1 change: 1 addition & 0 deletions ...m.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_incompatible/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<samesite none="AddCookieCookie"/>
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

<javaPermission className="java.util.PropertyPermission"
Expand Down
3 changes: 2 additions & 1 deletion ...om.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitioned/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-->
<server description="Partitioned Cookies Test">
<!-- No SameSite Configurations in this server.xml because they are all setup individually in each test -->
<include location="../fatTestPorts.xml"/>
<include location="../fatTestCommon.xml"/>

<featureManager>
<feature>servlet-4.0</feature>
Expand All @@ -19,6 +19,7 @@
host="*"
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

</server>
3 changes: 2 additions & 1 deletion ...s.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_partitionedSecurity/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-->
<server description="Server for testing the Cookie SameSite attribute">

<include location="../fatTestPorts.xml" />
<include location="../fatTestCommon.xml"/>

<featureManager>
<feature>servlet-4.0</feature>
Expand All @@ -22,6 +22,7 @@
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<samesite none="*" partitioned="false" />
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

<keyStore id="defaultKeyStore" password="{xor}EzY9Oi0rJg==" /> <!-- pwd: Liberty, expires
Expand Down
3 changes: 2 additions & 1 deletion dev/com.ibm.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSite/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!--
Copyright (c) 2020, 2021 IBM Corporation and others.
Copyright (c) 2020, 2024 IBM Corporation and others.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License 2.0
which accompanies this distribution, and is available at
Expand All @@ -21,6 +21,7 @@
host="*"
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

<javaPermission className="java.util.PropertyPermission"
Expand Down
3 changes: 2 additions & 1 deletion ...m.ws.webcontainer.servlet.4.0_fat.2/publish/servers/servlet40_sameSiteSecurity/server.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
-->
<server description="Server for testing the Cookie SameSite attribute">

<include location="../fatTestPorts.xml" />
<include location="../fatTestCommon.xml"/>

<featureManager>
<feature>servlet-4.0</feature>
Expand All @@ -22,6 +22,7 @@
httpPort="${bvt.prop.HTTP_default}"
httpsPort="${bvt.prop.HTTP_default.secure}">
<samesite lax="*" />
<tcpOptions id="defaultTCPOptions" portOpenRetries="60"/>
</httpEndpoint>

<keyStore id="defaultKeyStore" password="{xor}EzY9Oi0rJg==" /> <!-- pwd: Liberty, expires1/4/2099 -->
Expand Down