updated jetty from 9.4.17 to 9.4.35

and fixed a bug in ServerSideIncludes that appeared only in that recent
version of jetty

.classpath

@@ -45,20 +45,6 @@
 	<classpathentry kind="lib" path="lib/commons-io-2.7.jar"/>
 	<classpathentry kind="lib" path="lib/slf4j-api-1.7.25.jar"/>
 	<classpathentry kind="lib" path="lib/chardet.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-client-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-continuation-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-deploy-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-http-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-io-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-jmx-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-proxy-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-security-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-server-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlet-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-servlets-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-util-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-webapp-9.4.17.v20190418.jar"/>
-	<classpathentry kind="lib" path="lib/jetty-xml-9.4.17.v20190418.jar"/>
 	<classpathentry kind="lib" path="lib/httpclient-4.5.12.jar"/>
 	<classpathentry kind="lib" path="lib/httpmime-4.5.12.jar"/>
 	<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
@@ -87,6 +73,20 @@
 	<classpathentry kind="lib" path="lib/metrics-core-3.2.2.jar"/>
 	<classpathentry kind="lib" path="lib/spatial4j-0.6.jar"/>
 	<classpathentry kind="lib" path="lib/jsoup-1.12.1.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-client-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-continuation-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-deploy-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-http-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-io-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-jmx-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-proxy-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-security-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-server-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlet-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-servlets-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-util-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-webapp-9.4.35.v20201120.jar"/>
+	<classpathentry kind="lib" path="lib/jetty-xml-9.4.35.v20201120.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
 	<classpathentry kind="lib" path="lib/icu4j-63.1.jar"/>
 	<classpathentry kind="lib" path="lib/javax.servlet-api-3.1.0.jar"/>

build.xml

@@ -202,20 +202,20 @@
         <pathelement location="${lib}/javax.servlet-api-3.1.0.jar" />
     	<pathelement location="${lib}/jcifs-1.3.17.jar" />
     	<pathelement location="${lib}/jcl-over-slf4j-1.7.25.jar" />
-        <pathelement location="${lib}/jetty-client-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-continuation-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-deploy-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-http-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-io-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-jmx-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-proxy-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-security-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-server-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-servlet-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-servlets-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-util-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-webapp-9.4.17.v20190418.jar" />
-        <pathelement location="${lib}/jetty-xml-9.4.17.v20190418.jar" />
+        <pathelement location="${lib}/jetty-client-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-continuation-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-deploy-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-http-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-io-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-jmx-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-proxy-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-security-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-server-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-servlet-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-servlets-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-util-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-webapp-9.4.35.v20201120.jar" />
+        <pathelement location="${lib}/jetty-xml-9.4.35.v20201120.jar" />
     	<pathelement location="${lib}/jsch-0.1.54.jar" />
     	<pathelement location="${lib}/json-simple-1.1.1.jar" />
     	<pathelement location="${lib}/jsonic-1.3.10.jar" />

pom.xml

@@ -36,7 +36,7 @@
         <!-- the Solr version used in dependency section for all related dependencies -->
         <solr.version>6.6.6</solr.version> 
         <!-- the Jetty version used in dependency section for all related dependencies -->
-        <jetty.version>9.4.17.v20190418</jetty.version>
+        <jetty.version>9.4.35.v20201120</jetty.version>
                 
         <!-- properties used for filtering yacyBuildProperties.java -->       
         <REPL_DATE>${DSTAMP}</REPL_DATE>

source/net/yacy/http/servlets/YaCyDefaultServlet.java

@@ -1216,7 +1216,7 @@ public class YaCyDefaultServlet extends HttpServlet  {
             p = buffer.indexOf(inctxt, offset);
         }
         out.write(in, offset, in.length - offset);
-        out.close();
+        //DO NOT out.close(); because that would interrupt the server stream - it causes that the content is cut off from here on
         buffer.close();
     }