Merge pull request #19 from MattGill98/CUSTCOM-83

CUSTCOM-83 Infinite Loop Causing CPU Hogging
payara · Dec 16, 2019 · 66cb4ed · 66cb4ed
2 parents ea945c3 + fcb2067
commit 66cb4ed
Show file tree

Hide file tree

Showing 48 changed files with 103 additions and 95 deletions.
diff --git a/bom/pom.xml b/bom/pom.xml
@@ -55,7 +55,7 @@
     <artifactId>grizzly-bom</artifactId>
     <packaging>pom</packaging>
     <name>grizzly-bom</name>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
 
     <description>Grizzly Bill of Materials (BOM)</description>
 

diff --git a/extras/bundles/grizzly-httpservice-bundle/pom.xml b/extras/bundles/grizzly-httpservice-bundle/pom.xml
@@ -44,13 +44,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <name>Grizzly OSGi HttpService Bundle</name>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <groupId>org.glassfish.grizzly.osgi</groupId>
     <artifactId>grizzly-httpservice-bundle</artifactId>
     <build>

diff --git a/extras/bundles/pom.xml b/extras/bundles/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-extra-bundles</artifactId>
     <packaging>pom</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-extra-bundles</name>
 
     <modules>

diff --git a/extras/connection-pool/pom.xml b/extras/connection-pool/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>connection-pool</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>connection-pool</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/grizzly-httpservice/pom.xml b/extras/grizzly-httpservice/pom.xml
@@ -44,14 +44,14 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
     <packaging>jar</packaging>
     <name>Grizzly OSGi HttpService</name>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <groupId>org.glassfish.grizzly.osgi</groupId>
     <artifactId>grizzly-httpservice</artifactId>
     <dependencies>

diff --git a/extras/http-server-jaxws/pom.xml b/extras/http-server-jaxws/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server-jaxws</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-server-jaxws</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/http-server-multipart/pom.xml b/extras/http-server-multipart/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server-multipart</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-server-multipart</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/http-servlet-extras/pom.xml b/extras/http-servlet-extras/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-servlet-extras</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-servlet-extras</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/extras/pom.xml b/extras/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-extras</artifactId>
     <packaging>pom</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-extras</name>
     <profiles>
         <profile>

diff --git a/extras/tls-sni/pom.xml b/extras/tls-sni/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>tls-sni</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>tls-sni</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/comet/pom.xml b/modules/bundles/comet/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-comet-server</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-comet-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/core/pom.xml b/modules/bundles/core/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-core</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/http-all/pom.xml b/modules/bundles/http-all/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-all</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-all</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/http-servlet/pom.xml b/modules/bundles/http-servlet/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-servlet-server</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-servlet-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/http/pom.xml b/modules/bundles/http/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server-core</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-server-core</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/bundles/pom.xml b/modules/bundles/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-bundles</artifactId>
     <packaging>pom</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-bundles</name>
 
     <modules>

diff --git a/modules/bundles/websockets/pom.xml b/modules/bundles/websockets/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-websockets-server</artifactId>
     <packaging>jar</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-websockets-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/comet/pom.xml b/modules/comet/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-comet</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-comet</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/grizzly/pom.xml b/modules/grizzly/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-framework</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-framework</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLBaseFilter.java b/modules/grizzly/src/main/java/org/glassfish/grizzly/ssl/SSLBaseFilter.java
@@ -1,7 +1,8 @@
 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
  *
- * Copyright (c) 2012-2016 Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2012-2019 Oracle and/or its affiliates and others.
+ * All rights reserved.
  *
  * The contents of this file are subject to the terms of either the GNU
  * General Public License Version 2 only ("GPL") or the Common Development
@@ -36,6 +37,9 @@
  * and therefore, elected the GPL Version 2 license, then the option applies
  * only if the new code is made subject to such option by the copyright
  * holder.
+ * 
+ * Contributors:
+ *   Payara Services - Propagate stop action on a closed SSL connection
  */
 
 package org.glassfish.grizzly.ssl;
@@ -466,7 +470,11 @@ protected NextAction unwrapAll(final FilterChainContext ctx,
 
             if (output.hasRemaining() || isClosed) {
                 ctx.setMessage(output);
-                return ctx.getInvokeAction(makeInputRemainder(sslCtx, ctx, input));
+                if (!isClosed) {
+                    return ctx.getInvokeAction(makeInputRemainder(sslCtx, ctx, input));
+                } else {
+                    LOGGER.finer("Closed SSL connection detected, terminating chain.");
+                }
             }
         }
 

diff --git a/modules/http-ajp/pom.xml b/modules/http-ajp/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-ajp</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-ajp</name>
     <url>http://grizzly.java.net</url>
     <build>

diff --git a/modules/http-server/pom.xml b/modules/http-server/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-server</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-server</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/http-servlet/pom.xml b/modules/http-servlet/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http-servlet</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http-servlet</name>
     <build>
         <defaultGoal>install</defaultGoal>

diff --git a/modules/http/pom.xml b/modules/http/pom.xml
@@ -45,13 +45,13 @@
     <parent>
         <groupId>org.glassfish.grizzly</groupId>
         <artifactId>grizzly-project</artifactId>
-        <version>2.3.31</version>
+        <version>2.3.31.payara-p4</version>
         <relativePath>../../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>grizzly-http</artifactId>
     <packaging>bundle</packaging>
-    <version>2.3.31</version>
+    <version>2.3.31.payara-p4</version>
     <name>grizzly-http</name>
     <build>
         <defaultGoal>install</defaultGoal>