Skip to content

Commit

Permalink
Merge pull request payara#36 from luiseufrasio/FISH-1515-Payara6
Browse files Browse the repository at this point in the history 
FISH-1515 Connection Closes Prematurely On HTTP/2 HTTPS Connections When Request Takes Long To Complete
  • Loading branch information
@luiseufrasio
luiseufrasio authored Jul 13, 2022
2 parents ef3c7b7 + 54998b2 commit fa04327
Show file tree
Hide file tree
Showing 44 changed files with 50 additions and 74 deletions.
2 changes: 1 addition & 1 deletion boms/bom/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@

<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<packaging>pom</packaging>

<name>grizzly-bom</name>
Expand Down
2 changes: 1 addition & 1 deletion extras/bundles/grizzly-httpservice-bundle/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/bundles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/connection-pool/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/grizzly-httpservice/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/http-server-jaxws/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/http-server-multipart/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/http-servlet-extras/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion extras/tls-sni/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/comet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/core/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/http-all/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/http-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/bundles/websockets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/comet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/grizzly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
8 changes: 7 additions & 1 deletion modules/grizzly/src/main/java/org/glassfish/grizzly/utils/IdleTimeoutFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
import org.glassfish.grizzly.filterchain.BaseFilter;
import org.glassfish.grizzly.filterchain.FilterChainContext;
import org.glassfish.grizzly.filterchain.NextAction;
import org.glassfish.grizzly.nio.NIOConnection;
import org.glassfish.grizzly.nio.transport.TCPNIOConnection;

/**
* The Filter is responsible for tracking {@link Connection} activity and closing {@link Connection} once it becomes
Expand Down Expand Up @@ -322,7 +324,11 @@ public boolean doWork(final Connection connection) {
if (handler != null) {
handler.onTimeout(connection);
}
connection.closeSilently();
if (connection.getLocalAddress().toString().endsWith("8181")) {
return true;
} else {
connection.closeSilently();
}
}

return true;
Expand Down
30 changes: 0 additions & 30 deletions modules/grizzly/src/test/java/org/glassfish/grizzly/GrizzlyVersionTest.java
View file

This file was deleted.

2 changes: 1 addition & 1 deletion modules/http-ajp/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/http-servlet/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/http2/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring/grizzly/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring/http-server/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring/http/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/monitoring/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
</parent>

<artifactId>grizzly-modules</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion modules/portunif/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion modules/websockets/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
4 changes: 2 additions & 2 deletions pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,12 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-bom</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>boms/bom/pom.xml</relativePath>
</parent>

<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version> <!-- Version must be repeated so versions-maven-plugin:set works correctly -->
<version>4.0.0.payara-p1</version> <!-- Version must be repeated so versions-maven-plugin:set works correctly -->
<packaging>pom</packaging>

<name>grizzly-project</name>
Expand Down
2 changes: 1 addition & 1 deletion samples/connection-pool-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion samples/framework-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion samples/http-ajp-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion samples/http-jaxws-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
2 changes: 1 addition & 1 deletion samples/http-multipart-samples/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<parent>
<groupId>org.glassfish.grizzly</groupId>
<artifactId>grizzly-project</artifactId>
<version>4.0.0.payara-p1-SNAPSHOT</version>
<version>4.0.0.payara-p1</version>
<relativePath>../../pom.xml</relativePath>
</parent>

Expand Down
Loading

0 comments on commit fa04327

Please sign in to comment.