summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.classpath28
-rw-r--r--build.xml28
-rw-r--r--lib/jetty-client-9.4.11.v20180605.jar (renamed from lib/jetty-client-9.4.9.v20180320.jar)bin279672 -> 281919 bytes
-rw-r--r--lib/jetty-continuation-9.4.11.v20180605.jar (renamed from lib/jetty-continuation-9.4.9.v20180320.jar)bin16677 -> 16681 bytes
-rw-r--r--lib/jetty-deploy-9.4.11.v20180605.jar (renamed from lib/jetty-deploy-9.4.9.v20180320.jar)bin52477 -> 52467 bytes
-rw-r--r--lib/jetty-http-9.4.11.v20180605.jar (renamed from lib/jetty-http-9.4.9.v20180320.jar)bin169671 -> 195948 bytes
-rw-r--r--lib/jetty-io-9.4.11.v20180605.jar (renamed from lib/jetty-io-9.4.9.v20180320.jar)bin134935 -> 135153 bytes
-rw-r--r--lib/jetty-jmx-9.4.11.v20180605.jarbin0 -> 25361 bytes
-rw-r--r--lib/jetty-jmx-9.4.9.v20180320.jarbin25322 -> 0 bytes
-rw-r--r--lib/jetty-proxy-9.4.11.v20180605.jar (renamed from lib/jetty-proxy-9.4.9.v20180320.jar)bin87530 -> 87513 bytes
-rw-r--r--lib/jetty-security-9.4.11.v20180605.jar (renamed from lib/jetty-security-9.4.9.v20180320.jar)bin93202 -> 93072 bytes
-rw-r--r--lib/jetty-server-9.4.11.v20180605.jar (renamed from lib/jetty-server-9.4.9.v20180320.jar)bin584440 -> 591927 bytes
-rw-r--r--lib/jetty-servlet-9.4.11.v20180605.jar (renamed from lib/jetty-servlet-9.4.9.v20180320.jar)bin110556 -> 110825 bytes
-rw-r--r--lib/jetty-servlets-9.4.11.v20180605.jar (renamed from lib/jetty-servlets-9.4.9.v20180320.jar)bin93193 -> 93192 bytes
-rw-r--r--lib/jetty-util-9.4.11.v20180605.jar (renamed from lib/jetty-util-9.4.9.v20180320.jar)bin493316 -> 499219 bytes
-rw-r--r--lib/jetty-webapp-9.4.11.v20180605.jar (renamed from lib/jetty-webapp-9.4.9.v20180320.jar)bin128548 -> 128603 bytes
-rw-r--r--lib/jetty-xml-9.4.11.v20180605.jar (renamed from lib/jetty-xml-9.4.9.v20180320.jar)bin52420 -> 52044 bytes
-rw-r--r--pom.xml2
-rw-r--r--source/net/yacy/http/servlets/YaCyDefaultServlet.java19
19 files changed, 38 insertions, 39 deletions
diff --git a/.classpath b/.classpath
index e4b086f62..f8bb61f36 100644
--- a/.classpath
+++ b/.classpath
@@ -43,20 +43,20 @@
<classpathentry kind="lib" path="lib/commons-io-2.6.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.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-continuation-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-deploy-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-http-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-io-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-jmx-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-proxy-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-security-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-server-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-servlet-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-servlets-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-util-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-webapp-9.4.9.v20180320.jar"/>
- <classpathentry kind="lib" path="lib/jetty-xml-9.4.9.v20180320.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-client-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-continuation-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-deploy-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-http-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-io-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-jmx-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-proxy-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-security-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-server-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-servlet-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-servlets-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-util-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-webapp-9.4.11.v20180605.jar"/>
+ <classpathentry kind="lib" path="lib/jetty-xml-9.4.11.v20180605.jar"/>
<classpathentry kind="lib" path="lib/httpclient-4.5.5.jar"/>
<classpathentry kind="lib" path="lib/httpmime-4.5.5.jar"/>
<classpathentry kind="lib" path="lib/noggit-0.6.jar"/>
diff --git a/build.xml b/build.xml
index 07bf30317..757e7c0af 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.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-continuation-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-deploy-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-http-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-io-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-jmx-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-proxy-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-security-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-server-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-servlet-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-servlets-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-util-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-webapp-9.4.9.v20180320.jar" />
- <pathelement location="${lib}/jetty-xml-9.4.9.v20180320.jar" />
+ <pathelement location="${lib}/jetty-client-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-continuation-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-deploy-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-http-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-io-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-jmx-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-proxy-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-security-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-server-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-servlet-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-servlets-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-util-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-webapp-9.4.11.v20180605.jar" />
+ <pathelement location="${lib}/jetty-xml-9.4.11.v20180605.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.9.v20180320.jar b/lib/jetty-client-9.4.11.v20180605.jar
index 12a58a916..603fd2f5b 100644
--- a/lib/jetty-client-9.4.9.v20180320.jar
+++ b/lib/jetty-client-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-continuation-9.4.9.v20180320.jar b/lib/jetty-continuation-9.4.11.v20180605.jar
index 1bb996abf..f8dba29c9 100644
--- a/lib/jetty-continuation-9.4.9.v20180320.jar
+++ b/lib/jetty-continuation-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-deploy-9.4.9.v20180320.jar b/lib/jetty-deploy-9.4.11.v20180605.jar
index cec8e6c32..5638d57e5 100644
--- a/lib/jetty-deploy-9.4.9.v20180320.jar
+++ b/lib/jetty-deploy-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-http-9.4.9.v20180320.jar b/lib/jetty-http-9.4.11.v20180605.jar
index c4ed2e2c7..8d50fc2f1 100644
--- a/lib/jetty-http-9.4.9.v20180320.jar
+++ b/lib/jetty-http-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-io-9.4.9.v20180320.jar b/lib/jetty-io-9.4.11.v20180605.jar
index 143b16c4b..9e6d05f46 100644
--- a/lib/jetty-io-9.4.9.v20180320.jar
+++ b/lib/jetty-io-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-jmx-9.4.11.v20180605.jar b/lib/jetty-jmx-9.4.11.v20180605.jar
new file mode 100644
index 000000000..6882e827a
--- /dev/null
+++ b/lib/jetty-jmx-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-jmx-9.4.9.v20180320.jar b/lib/jetty-jmx-9.4.9.v20180320.jar
deleted file mode 100644
index c0a27c627..000000000
--- a/lib/jetty-jmx-9.4.9.v20180320.jar
+++ /dev/null
Binary files differ
diff --git a/lib/jetty-proxy-9.4.9.v20180320.jar b/lib/jetty-proxy-9.4.11.v20180605.jar
index d77519e23..813c3c48f 100644
--- a/lib/jetty-proxy-9.4.9.v20180320.jar
+++ b/lib/jetty-proxy-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-security-9.4.9.v20180320.jar b/lib/jetty-security-9.4.11.v20180605.jar
index c54f9ec76..e50841774 100644
--- a/lib/jetty-security-9.4.9.v20180320.jar
+++ b/lib/jetty-security-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-server-9.4.9.v20180320.jar b/lib/jetty-server-9.4.11.v20180605.jar
index 50b5f01f2..e6c8973ad 100644
--- a/lib/jetty-server-9.4.9.v20180320.jar
+++ b/lib/jetty-server-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-servlet-9.4.9.v20180320.jar b/lib/jetty-servlet-9.4.11.v20180605.jar
index 3a1ec0eac..d18dbb5c0 100644
--- a/lib/jetty-servlet-9.4.9.v20180320.jar
+++ b/lib/jetty-servlet-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-servlets-9.4.9.v20180320.jar b/lib/jetty-servlets-9.4.11.v20180605.jar
index 4cfa7a637..46b438366 100644
--- a/lib/jetty-servlets-9.4.9.v20180320.jar
+++ b/lib/jetty-servlets-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-util-9.4.9.v20180320.jar b/lib/jetty-util-9.4.11.v20180605.jar
index 9c4975bfd..f02e95925 100644
--- a/lib/jetty-util-9.4.9.v20180320.jar
+++ b/lib/jetty-util-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-webapp-9.4.9.v20180320.jar b/lib/jetty-webapp-9.4.11.v20180605.jar
index 3e720b0fd..761e7aea8 100644
--- a/lib/jetty-webapp-9.4.9.v20180320.jar
+++ b/lib/jetty-webapp-9.4.11.v20180605.jar
Binary files differ
diff --git a/lib/jetty-xml-9.4.9.v20180320.jar b/lib/jetty-xml-9.4.11.v20180605.jar
index 192f04332..1a2b30dba 100644
--- a/lib/jetty-xml-9.4.9.v20180320.jar
+++ b/lib/jetty-xml-9.4.11.v20180605.jar
Binary files differ
diff --git a/pom.xml b/pom.xml
index fec98b108..f0dc95318 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.3</solr.version>
<!-- the Jetty version used in dependency section for all related dependencies -->
- <jetty.version>9.4.9.v20180320</jetty.version>
+ <jetty.version>9.4.11.v20180605</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.java
index 882a13e22..f72f80598 100644
--- a/source/net/yacy/http/servlets/YaCyDefaultServlet.java
+++ b/source/net/yacy/http/servlets/YaCyDefaultServlet.java
@@ -537,7 +537,7 @@ public class YaCyDefaultServlet extends HttpServlet {
}
} else {
// Parse the satisfiable ranges
- List<?> ranges = InclusiveByteRange.satisfiableRanges(reqRanges, content_length);
+ final List<InclusiveByteRange> ranges = InclusiveByteRange.satisfiableRanges(reqRanges, content_length);
// if there are no satisfiable ranges, send 416 response
if (ranges == null || ranges.isEmpty()) {
@@ -553,14 +553,13 @@ public class YaCyDefaultServlet extends HttpServlet {
// if there is only a single valid range (must be satisfiable
// since were here now), send that range with a 216 response
if (ranges.size() == 1) {
- InclusiveByteRange singleSatisfiableRange =
- (InclusiveByteRange) ranges.get(0);
- long singleLength = singleSatisfiableRange.getSize(content_length);
+ final InclusiveByteRange singleSatisfiableRange = ranges.iterator().next();
+ long singleLength = singleSatisfiableRange.getSize();
writeHeaders(response, resource, singleLength);
response.setStatus(HttpServletResponse.SC_PARTIAL_CONTENT);
response.setHeader(HttpHeader.CONTENT_RANGE.asString(),
singleSatisfiableRange.toHeaderRangeString(content_length));
- resource.writeTo(out, singleSatisfiableRange.getFirst(content_length), singleLength);
+ resource.writeTo(out, singleSatisfiableRange.getFirst(), singleLength);
out.close();
return;
}
@@ -595,7 +594,7 @@ public class YaCyDefaultServlet extends HttpServlet {
int length = 0;
String[] header = new String[ranges.size()];
for (int i = 0; i < ranges.size(); i++) {
- InclusiveByteRange ibr = (InclusiveByteRange) ranges.get(i);
+ InclusiveByteRange ibr = ranges.get(i);
header[i] = ibr.toHeaderRangeString(content_length);
length +=
((i > 0) ? 2 : 0)
@@ -603,17 +602,17 @@ public class YaCyDefaultServlet extends HttpServlet {
+ (mimetype == null ? 0 : HeaderFramework.CONTENT_TYPE.length() + 2 + mimetype.length()) + 2
+ HeaderFramework.CONTENT_RANGE.length() + 2 + header[i].length() + 2
+ 2
- + (ibr.getLast(content_length) - ibr.getFirst(content_length)) + 1;
+ + (ibr.getLast() - ibr.getFirst()) + 1;
}
length += 2 + 2 + multi.getBoundary().length() + 2 + 2;
response.setContentLength(length);
for (int i = 0; i < ranges.size(); i++) {
- InclusiveByteRange ibr = (InclusiveByteRange) ranges.get(i);
+ InclusiveByteRange ibr = ranges.get(i);
multi.startPart(mimetype, new String[]{HeaderFramework.CONTENT_RANGE + ": " + header[i]});
- long start = ibr.getFirst(content_length);
- long size = ibr.getSize(content_length);
+ long start = ibr.getFirst();
+ long size = ibr.getSize();
if (in != null) {
// Handle non cached resource
if (start < pos) {
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-08 09:28:41 +0000