mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-19 00:01:41 +02:00
remove unused private header entries (HeaderFramework)
X_YACY_ORIGINAL_REQUEST_LINE X_YACY_KEEP_ALIVE_REQUEST_COUNT CONNECTION_PROP_REQUESTLINE
This commit is contained in:
parent
6d16fa993d
commit
b9056ef2db
|
@ -206,8 +206,8 @@ public class HeaderFramework extends TreeMap<String, String> implements Map<Stri
|
|||
public static final String CONNECTION_PROP_ARGS = "ARGS";
|
||||
public static final String CONNECTION_PROP_CLIENTIP = "CLIENTIP";
|
||||
public static final String CONNECTION_PROP_PERSISTENT = "PERSISTENT";
|
||||
public static final String CONNECTION_PROP_KEEP_ALIVE_COUNT = "KEEP-ALIVE_COUNT";
|
||||
public static final String CONNECTION_PROP_REQUESTLINE = "REQUESTLINE";
|
||||
//public static final String CONNECTION_PROP_KEEP_ALIVE_COUNT = "KEEP-ALIVE_COUNT";
|
||||
//public static final String CONNECTION_PROP_REQUESTLINE = "REQUESTLINE";
|
||||
//public static final String CONNECTION_PROP_PREV_REQUESTLINE = "PREVREQUESTLINE";
|
||||
public static final String CONNECTION_PROP_REQUEST_START = "REQUEST_START";
|
||||
public static final String CONNECTION_PROP_REQUEST_END = "REQUEST_END";
|
||||
|
|
|
@ -134,7 +134,6 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
|
|||
prop.put(HeaderFramework.CONNECTION_PROP_HTTP_VER, HeaderFramework.HTTP_VERSION_1_1);
|
||||
prop.put(HeaderFramework.CONNECTION_PROP_HOST, hostwithport);
|
||||
prop.put(HeaderFramework.CONNECTION_PROP_PATH, proxyurl.getFile().replaceAll(" ", "%20"));
|
||||
prop.put(HeaderFramework.CONNECTION_PROP_REQUESTLINE, "PROXY");
|
||||
prop.put(HeaderFramework.CONNECTION_PROP_CLIENTIP, Domains.LOCALHOST);
|
||||
|
||||
yacyRequestHeader.put(HeaderFramework.HOST, hostwithport );
|
||||
|
@ -177,12 +176,11 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
|
|||
response.addHeader(HeaderFramework.LOCATION, location);
|
||||
}
|
||||
|
||||
//final String mimeType = outgoingHeader.getContentType();
|
||||
final String mimeType = outgoingHeader.getContentType();
|
||||
if ((mimeType != null) && (mimeType.startsWith("text/html") || mimeType.startsWith("text"))) {
|
||||
final StringWriter buffer = new StringWriter();
|
||||
|
||||
if (outgoingHeader.containsKey(HeaderFramework.TRANSFER_ENCODING)) {
|
||||
if (outgoingHeader.containsKey(HeaderFramework.TRANSFER_ENCODING) && outgoingHeader.get(HeaderFramework.TRANSFER_ENCODING).contains("chunked")) {
|
||||
FileUtils.copy(new ChunkedInputStream(proxyout), buffer, UTF8.charset);
|
||||
} else {
|
||||
FileUtils.copy(proxyout, buffer, UTF8.charset);
|
||||
|
@ -345,10 +343,6 @@ public class YaCyProxyServlet extends ProxyServlet implements Servlet {
|
|||
@Override
|
||||
protected HttpURI proxyHttpURI(HttpServletRequest request, String uri) throws MalformedURLException {
|
||||
String strARGS = request.getQueryString();
|
||||
if (strARGS.startsWith("action=")) {
|
||||
int detectnextargument = strARGS.indexOf("&");
|
||||
strARGS = strARGS.substring(detectnextargument + 1);
|
||||
}
|
||||
if (strARGS.startsWith("url=")) {
|
||||
final String strUrl = strARGS.substring(4); // strip url=
|
||||
|
||||
|
|
|
@ -278,7 +278,7 @@ public final class HTTPDProxyHandler {
|
|||
sb.proxyLastAccess = System.currentTimeMillis();
|
||||
|
||||
// using an ByteCount OutputStream to count the send bytes (needed for the logfile)
|
||||
countedRespond = new ByteCountOutputStream(respond,((String) conProp.get(HeaderFramework.CONNECTION_PROP_REQUESTLINE)).length() + 2,"PROXY");
|
||||
countedRespond = new ByteCountOutputStream(respond, "PROXY");
|
||||
|
||||
final String ip = (String) conProp.get(HeaderFramework.CONNECTION_PROP_CLIENTIP); // the ip from the connecting peer
|
||||
|
||||
|
@ -990,13 +990,11 @@ public final class HTTPDProxyHandler {
|
|||
}
|
||||
} else {
|
||||
if (unknownError) {
|
||||
log.severe("Unknown Error while processing request '" +
|
||||
conProp.get(HeaderFramework.CONNECTION_PROP_REQUESTLINE) + "':" +
|
||||
log.severe("Unknown Error while processing request 'PROXY':" +
|
||||
"\n" + Thread.currentThread().getName() +
|
||||
"\n" + errorMessage,e);
|
||||
} else {
|
||||
log.warn("Error while processing request '" +
|
||||
conProp.get(HeaderFramework.CONNECTION_PROP_REQUESTLINE) + "':" +
|
||||
log.warn("Error while processing request 'PROXY':" +
|
||||
"\n" + Thread.currentThread().getName() +
|
||||
"\n" + errorMessage);
|
||||
}
|
||||
|
|
|
@ -458,11 +458,6 @@ public final class HTTPDemon {
|
|||
!responseHeader.containsKey(HeaderFramework.CONTENT_LENGTH))
|
||||
responseHeader.put(HeaderFramework.CONTENT_LENGTH, "0");
|
||||
|
||||
// adding some yacy specific headers
|
||||
responseHeader.put(HeaderFramework.X_YACY_KEEP_ALIVE_REQUEST_COUNT,(String) conProp.get(HeaderFramework.CONNECTION_PROP_KEEP_ALIVE_COUNT));
|
||||
responseHeader.put(HeaderFramework.X_YACY_ORIGINAL_REQUEST_LINE,(String) conProp.get(HeaderFramework.CONNECTION_PROP_REQUESTLINE));
|
||||
//responseHeader.put(HeaderFramework.X_YACY_PREVIOUS_REQUEST_LINE,conProp.getProperty(HeaderFramework.CONNECTION_PROP_PREV_REQUESTLINE));
|
||||
|
||||
//read custom headers
|
||||
final Iterator<ResponseHeader.Entry> it = responseHeader.getAdditionalHeaderProperties().iterator();
|
||||
ResponseHeader.Entry e;
|
||||
|
|
Loading…
Reference in New Issue
Block a user