Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'jetty-server')
-rw-r--r--jetty-server/src/main/config/etc/jetty-requestlog.xml2
-rw-r--r--jetty-server/src/main/config/modules/requestlog.mod3
-rw-r--r--jetty-server/src/main/config/modules/ssl.mod2
-rw-r--r--jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java2
4 files changed, 6 insertions, 3 deletions
diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml
index 213177731a..7b1b241b73 100644
--- a/jetty-server/src/main/config/etc/jetty-requestlog.xml
+++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml
@@ -15,7 +15,7 @@
<New id="RequestLog" class="org.eclipse.jetty.server.handler.RequestLogHandler">
<Set name="requestLog">
<New id="RequestLogImpl" class="org.eclipse.jetty.server.AsyncNCSARequestLog">
- <Set name="filename"><Property name="jetty.logs" default="./logs" />/yyyy_mm_dd.request.log</Set>
+ <Set name="filename"><Property name="jetty.base" default="." />/logs/yyyy_mm_dd.request.log</Set>
<Set name="filenameDateFormat">yyyy_MM_dd</Set>
<Set name="retainDays"><Property name="requestlog.retain" default="90"/></Set>
<Set name="append"><Property name="requestlog.append" default="false"/></Set>
diff --git a/jetty-server/src/main/config/modules/requestlog.mod b/jetty-server/src/main/config/modules/requestlog.mod
index 9d17958a46..b726373f00 100644
--- a/jetty-server/src/main/config/modules/requestlog.mod
+++ b/jetty-server/src/main/config/modules/requestlog.mod
@@ -8,6 +8,9 @@ server
[xml]
etc/jetty-requestlog.xml
+[files]
+logs/
+
[ini]
# requestlog.retain=90
# requestlog.append=true
diff --git a/jetty-server/src/main/config/modules/ssl.mod b/jetty-server/src/main/config/modules/ssl.mod
index be4a4aebe3..90feccc31e 100644
--- a/jetty-server/src/main/config/modules/ssl.mod
+++ b/jetty-server/src/main/config/modules/ssl.mod
@@ -7,7 +7,7 @@ server
[xml]
etc/jetty-ssl.xml
-[download]
+[files]
http://git.eclipse.org/c/jetty/org.eclipse.jetty.project.git/plain/jetty-server/src/main/config/etc/keystore:etc/keystore
[ini]
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
index a9dba922ad..b06612fddf 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/HttpInput.java
@@ -239,7 +239,7 @@ public abstract class HttpInput<T> extends ServletInputStream implements Runnabl
}
catch (IOException e)
{
- throw new RuntimeIOException(e);
+ LOG.debug(e);
}
}
}

Back to the top