Distributed Peer-to-Peer Web Search Engine and Intranet Search Appliance
Java decentralizedintranet-searchintranet-search-enginep2pp2p-networkprivacyprivacy-protectionsearch-enginesearchenginewebweb-search-enginewebsearchwebseearch-engine
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
Michael Peter Christen3213d9db37f4
diff --git a/.classpath b/.classpathindex 805065059..553c7f073 100644--- a/.classpath+++ b/.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"/>diff --git a/build.xml b/build.xmlindex 8fbea20c4..ae4dbd1ca 100644--- a/build.xml+++ b/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" />diff --git a/lib/jetty-client-9.4.17.v20190418.jar b/lib/jetty-client-9.4.17.v20190418.jardeleted file mode 100644index f7789f59f..000000000Binary files a/lib/jetty-client-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-client-9.4.35.v20201120.jar b/lib/jetty-client-9.4.35.v20201120.jarnew file mode 100644index 000000000..e0553df52Binary files /dev/null and b/lib/jetty-client-9.4.35.v20201120.jar differdiff --git a/lib/jetty-continuation-9.4.17.v20190418.jar b/lib/jetty-continuation-9.4.17.v20190418.jardeleted file mode 100644index 394a5f92f..000000000Binary files a/lib/jetty-continuation-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-continuation-9.4.35.v20201120.jar b/lib/jetty-continuation-9.4.35.v20201120.jarnew file mode 100644index 000000000..cdd8cad52Binary files /dev/null and b/lib/jetty-continuation-9.4.35.v20201120.jar differdiff --git a/lib/jetty-deploy-9.4.17.v20190418.jar b/lib/jetty-deploy-9.4.17.v20190418.jardeleted file mode 100644index a6c17ea46..000000000Binary files a/lib/jetty-deploy-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-deploy-9.4.35.v20201120.jar b/lib/jetty-deploy-9.4.35.v20201120.jarnew file mode 100644index 000000000..ff7fc9fb0Binary files /dev/null and b/lib/jetty-deploy-9.4.35.v20201120.jar differdiff --git a/lib/jetty-http-9.4.17.v20190418.jar b/lib/jetty-http-9.4.17.v20190418.jardeleted file mode 100644index 9f902999e..000000000Binary files a/lib/jetty-http-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-http-9.4.35.v20201120.jar b/lib/jetty-http-9.4.35.v20201120.jarnew file mode 100644index 000000000..58ef5c1a9Binary files /dev/null and b/lib/jetty-http-9.4.35.v20201120.jar differdiff --git a/lib/jetty-io-9.4.17.v20190418.jar b/lib/jetty-io-9.4.17.v20190418.jardeleted file mode 100644index d50a6cedc..000000000Binary files a/lib/jetty-io-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-io-9.4.35.v20201120.jar b/lib/jetty-io-9.4.35.v20201120.jarnew file mode 100644index 000000000..c499b8dc8Binary files /dev/null and b/lib/jetty-io-9.4.35.v20201120.jar differdiff --git a/lib/jetty-jmx-9.4.17.v20190418.jar b/lib/jetty-jmx-9.4.17.v20190418.jardeleted file mode 100644index 66566b960..000000000Binary files a/lib/jetty-jmx-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-jmx-9.4.35.v20201120.jar b/lib/jetty-jmx-9.4.35.v20201120.jarnew file mode 100644index 000000000..ce7e2798eBinary files /dev/null and b/lib/jetty-jmx-9.4.35.v20201120.jar differdiff --git a/lib/jetty-proxy-9.4.17.v20190418.jar b/lib/jetty-proxy-9.4.17.v20190418.jardeleted file mode 100644index 1317ee93e..000000000Binary files a/lib/jetty-proxy-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-proxy-9.4.35.v20201120.jar b/lib/jetty-proxy-9.4.35.v20201120.jarnew file mode 100644index 000000000..2deedb714Binary files /dev/null and b/lib/jetty-proxy-9.4.35.v20201120.jar differdiff --git a/lib/jetty-security-9.4.17.v20190418.jar b/lib/jetty-security-9.4.17.v20190418.jardeleted file mode 100644index f73726079..000000000Binary files a/lib/jetty-security-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-security-9.4.35.v20201120.jar b/lib/jetty-security-9.4.35.v20201120.jarnew file mode 100644index 000000000..f66301313Binary files /dev/null and b/lib/jetty-security-9.4.35.v20201120.jar differdiff --git a/lib/jetty-server-9.4.17.v20190418.jar b/lib/jetty-server-9.4.17.v20190418.jardeleted file mode 100644index 8da23a85a..000000000Binary files a/lib/jetty-server-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-server-9.4.35.v20201120.jar b/lib/jetty-server-9.4.35.v20201120.jarnew file mode 100644index 000000000..62292e5cfBinary files /dev/null and b/lib/jetty-server-9.4.35.v20201120.jar differdiff --git a/lib/jetty-servlet-9.4.17.v20190418.jar b/lib/jetty-servlet-9.4.17.v20190418.jardeleted file mode 100644index f8a5214d3..000000000Binary files a/lib/jetty-servlet-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-servlet-9.4.35.v20201120.jar b/lib/jetty-servlet-9.4.35.v20201120.jarnew file mode 100644index 000000000..f7ab62aa4Binary files /dev/null and b/lib/jetty-servlet-9.4.35.v20201120.jar differdiff --git a/lib/jetty-servlets-9.4.17.v20190418.jar b/lib/jetty-servlets-9.4.17.v20190418.jardeleted file mode 100644index 115ffdf2c..000000000Binary files a/lib/jetty-servlets-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-servlets-9.4.35.v20201120.jar b/lib/jetty-servlets-9.4.35.v20201120.jarnew file mode 100644index 000000000..75fb22acdBinary files /dev/null and b/lib/jetty-servlets-9.4.35.v20201120.jar differdiff --git a/lib/jetty-util-9.4.17.v20190418.jar b/lib/jetty-util-9.4.17.v20190418.jardeleted file mode 100644index b1b38a658..000000000Binary files a/lib/jetty-util-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-util-9.4.35.v20201120.jar b/lib/jetty-util-9.4.35.v20201120.jarnew file mode 100644index 000000000..53fff668eBinary files /dev/null and b/lib/jetty-util-9.4.35.v20201120.jar differdiff --git a/lib/jetty-webapp-9.4.17.v20190418.jar b/lib/jetty-webapp-9.4.17.v20190418.jardeleted file mode 100644index c034965c1..000000000Binary files a/lib/jetty-webapp-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-webapp-9.4.35.v20201120.jar b/lib/jetty-webapp-9.4.35.v20201120.jarnew file mode 100644index 000000000..adce1a61fBinary files /dev/null and b/lib/jetty-webapp-9.4.35.v20201120.jar differdiff --git a/lib/jetty-xml-9.4.17.v20190418.jar b/lib/jetty-xml-9.4.17.v20190418.jardeleted file mode 100644index 26383f7ba..000000000Binary files a/lib/jetty-xml-9.4.17.v20190418.jar and /dev/null differdiff --git a/lib/jetty-xml-9.4.35.v20201120.jar b/lib/jetty-xml-9.4.35.v20201120.jarnew file mode 100644index 000000000..76f6d4248Binary files /dev/null and b/lib/jetty-xml-9.4.35.v20201120.jar differdiff --git a/pom.xml b/pom.xmlindex 3173e5a41..8c5204d45 100644--- a/pom.xml+++ b/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>diff --git a/source/net/yacy/http/servlets/YaCyDefaultServlet.java b/source/net/yacy/http/servlets/YaCyDefaultServlet.javaindex f9ee451df..92746e05d 100644--- a/source/net/yacy/http/servlets/YaCyDefaultServlet.java+++ b/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 onbuffer.close();}