mirror of
https://github.com/yacy/yacy_search_server.git
synced 2024-09-21 00:00:13 +02:00
Merge branch 'master' of ssh://git@gitorious.org/yacy/rc1.git
This commit is contained in:
commit
58e08b1211
|
@ -416,16 +416,20 @@ public final class HTTPDFileHandler {
|
||||||
|
|
||||||
// we are finished with parsing
|
// we are finished with parsing
|
||||||
// the result of value hand-over is in args and argc
|
// the result of value hand-over is in args and argc
|
||||||
if (path.length() == 0) {
|
if (path.isEmpty()) {
|
||||||
HTTPDemon.sendRespondError(conProp,out,4,400,null,"Bad Request",null);
|
HTTPDemon.sendRespondError(conProp,out,4,400,null,"Bad Request",null);
|
||||||
out.flush();
|
out.flush();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
File targetClass=null;
|
File targetClass = null;
|
||||||
|
|
||||||
// locate the file
|
// locate the file
|
||||||
if (path.length() > 0 && path.charAt(0) != '/' && path.charAt(0) != '\\') path = "/" + path; // attach leading slash
|
if (!path.isEmpty() && path.charAt(0) != '/' && path.charAt(0) != '\\') {
|
||||||
if (path.endsWith("index.html")) path = path.substring(0, path.length() - 10);
|
path = "/" + path; // attach leading slash
|
||||||
|
}
|
||||||
|
if (path.endsWith("index.html")) {
|
||||||
|
path = path.substring(0, path.length() - 10);
|
||||||
|
}
|
||||||
|
|
||||||
// a different language can be desired (by i.e. ConfigBasic.html) than the one stored in the locale.language
|
// a different language can be desired (by i.e. ConfigBasic.html) than the one stored in the locale.language
|
||||||
String localeSelection = switchboard.getConfig("locale.language","default");
|
String localeSelection = switchboard.getConfig("locale.language","default");
|
||||||
|
@ -832,9 +836,7 @@ public final class HTTPDFileHandler {
|
||||||
|
|
||||||
targetDate = new Date(System.currentTimeMillis());
|
targetDate = new Date(System.currentTimeMillis());
|
||||||
|
|
||||||
if (exitValue == 0
|
if (cgiBody != null && !cgiBody.isEmpty()) {
|
||||||
&& cgiBody != null
|
|
||||||
&& !cgiBody.isEmpty()) {
|
|
||||||
HTTPDemon.sendRespondHeader(
|
HTTPDemon.sendRespondHeader(
|
||||||
conProp,
|
conProp,
|
||||||
out,
|
out,
|
||||||
|
|
Loading…
Reference in New Issue
Block a user