boxtec
/
yacy_search_server
mirror of https://github.com/yacy/yacy_search_server
4
1
Fork 0
Code Issues Projects Releases Wiki Activity

move writeHeaders from Jetty8 servlet to YaCyDefaultServlet

Browse Source 
- after removing Jetty server dependency (of Response using HttpServletResponse only)
pull/1/head
reger 11 years ago
parent b85f702f22
commit 082c9a98c1
2 changed files with 31 additions and 64 deletions
Show Stats Download Patch File Download Diff File

69
source/net/yacy/http/Jetty8YaCyDefaultServlet.java
Unescape View File

@ -111,8 +111,8 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
String servletPath = null;
String pathInfo = null;
Enumeration<String> reqRanges = null;
Boolean included = request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
if (included != null && included.booleanValue()) {
boolean included = request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
if (included) {
servletPath = (String) request.getAttribute(RequestDispatcher.INCLUDE_SERVLET_PATH);
pathInfo = (String) request.getAttribute(RequestDispatcher.INCLUDE_PATH_INFO);
if (servletPath == null) {
@ -120,7 +120,6 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
pathInfo = request.getPathInfo();
}
} else {
included = Boolean.FALSE;
servletPath = _pathInfoOnly ? "/" : request.getServletPath();
pathInfo = request.getPathInfo();
@ -142,7 +141,7 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
// is gzip enabled?
String pathInContextGz = null;
boolean gzip = false;
if (!included.booleanValue() && _gzip && reqRanges == null && !endsWithSlash) {
if (!included && _gzip && reqRanges == null && !endsWithSlash) {
// Look for a gzip resource
pathInContextGz = pathInContext + ".gz";
resource = getResource(pathInContextGz);
@ -204,7 +203,7 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
if (hasClass) { // this is a YaCy servlet, handle the template
handleTemplate(pathInfo, request, response);
} else {
if (included.booleanValue() || passConditionalHeaders(request, response, resource, content)) {
if (included || passConditionalHeaders(request, response, resource, content)) {
if (gzip) {
response.setHeader(HeaderFramework.CONTENT_ENCODING, HeaderFramework.CONTENT_ENCODING_GZIP);
String mt = _servletContext.getMimeType(pathInContext);
@ -212,7 +211,7 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
response.setContentType(mt);
}
}
sendData(request, response, included.booleanValue(), resource, content, reqRanges);
sendData(request, response, included, resource, content, reqRanges);
}
}
}
@ -240,21 +239,19 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
else if (null != (welcome = getWelcomeFile(pathInContext))) {
ConcurrentLog.fine("FILEHANDLER","welcome={}" + welcome);
// Forward to the index
RequestDispatcher dispatcher = request.getRequestDispatcher(welcome);
if (dispatcher != null) {
if (included.booleanValue()) {
if (included) {
dispatcher.include(request, response);
} else {
request.setAttribute("org.eclipse.jetty.server.welcome", welcome);
dispatcher.forward(request, response);
}
}
} else {
content = new HttpContent.ResourceAsHttpContent(resource, _mimeTypes.getMimeByExtension(resource.toString()), _etags);
if (included.booleanValue() || passConditionalHeaders(request, response, resource, content)) {
if (included || passConditionalHeaders(request, response, resource, content)) {
sendDirectory(request, response, resource, pathInContext);
}
}
@ -566,57 +563,5 @@ public class Jetty8YaCyDefaultServlet extends YaCyDefaultServlet implements Reso
}
multi.close();
}
return;
}
/* ------------------------------------------------------------ */
@Override
protected void writeHeaders(HttpServletResponse response, HttpContent content, long count) {
if (content.getContentType() != null && response.getContentType() == null) {
response.setContentType(content.getContentType().toString());
}
if (response instanceof Response) {
Response r = (Response) response;
HttpFields fields = r.getHttpFields();
if (content.getLastModified() != null) {
fields.put(HttpHeaders.LAST_MODIFIED_BUFFER, content.getLastModified());
} else if (content.getResource() != null) {
long lml = content.getResource().lastModified();
if (lml != -1) {
fields.putDateField(HttpHeaders.LAST_MODIFIED_BUFFER, lml);
}
}
if (count != -1) {
r.setLongContentLength(count);
}
writeOptionHeaders(fields);
if (_etags) {
fields.put(HttpHeaders.ETAG_BUFFER, content.getETag());
}
} else {
long lml = content.getResource().lastModified();
if (lml >= 0) {
response.setDateHeader(HeaderFramework.LAST_MODIFIED, lml);
}
if (count != -1) {
if (count < Integer.MAX_VALUE) {
response.setContentLength((int) count);
} else {
response.setHeader(HeaderFramework.CONTENT_LENGTH, Long.toString(count));
}
}
writeOptionHeaders(response);
if (_etags) {
response.setHeader(HeaderFramework.ETAG, content.getETag().toString());
}
}
}
}

26
source/net/yacy/http/YaCyDefaultServlet.java
Unescape View File

@ -25,7 +25,6 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
@ -323,7 +322,30 @@ public abstract class YaCyDefaultServlet extends HttpServlet {
throws IOException;
/* ------------------------------------------------------------ */
abstract protected void writeHeaders(HttpServletResponse response, HttpContent content, long count);
protected void writeHeaders(HttpServletResponse response, HttpContent content, long count) {
if (content.getContentType() != null && response.getContentType() == null) {
response.setContentType(content.getContentType().toString());
}
long lml = content.getResource().lastModified();
if (lml >= 0) {
response.setDateHeader(HeaderFramework.LAST_MODIFIED, lml);
}
if (count != -1) {
if (count < Integer.MAX_VALUE) {
response.setContentLength((int) count);
} else {
response.setHeader(HeaderFramework.CONTENT_LENGTH, Long.toString(count));
}
}
writeOptionHeaders(response);
if (_etags) {
response.setHeader(HeaderFramework.ETAG, content.getETag().toString());
}
}
/* ------------------------------------------------------------ */
protected void writeOptionHeaders(HttpFields fields) {

Write Preview
Loading…
Cancel
Save