diff options
author | Greg Wilkins | 2013-03-26 12:36:18 +0000 |
---|---|---|
committer | Greg Wilkins | 2013-03-26 12:36:31 +0000 |
commit | 108a8e9dca51c71828d74a928b29829589f87011 (patch) | |
tree | f16a139a0f740c4ec6aa5998288afde256695dde | |
parent | 968b3159260c71425623a475bfd1fb1cc4a67246 (diff) | |
download | org.eclipse.jetty.project-108a8e9dca51c71828d74a928b29829589f87011.tar.gz org.eclipse.jetty.project-108a8e9dca51c71828d74a928b29829589f87011.tar.xz org.eclipse.jetty.project-108a8e9dca51c71828d74a928b29829589f87011.zip |
404326 set status when Request.setHandled(true) is called
4 files changed, 7 insertions, 3 deletions
diff --git a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java index ec27c98fed..b30373e310 100644 --- a/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java +++ b/examples/embedded/src/main/java/org/eclipse/jetty/embedded/LikeJettyXml.java @@ -150,11 +150,11 @@ public class LikeJettyXml // === jetty-requestlog.xml === NCSARequestLog requestLog = new NCSARequestLog(); - requestLog.setFilename(jetty_home + "/logs/jetty-yyyy_mm_dd.log"); + requestLog.setFilename(jetty_home + "/logs/yyyy_mm_dd.request.log"); requestLog.setFilenameDateFormat("yyyy_MM_dd"); requestLog.setRetainDays(90); requestLog.setAppend(true); - requestLog.setExtended(false); + requestLog.setExtended(true); requestLog.setLogCookies(false); requestLog.setLogTimeZone("GMT"); RequestLogHandler requestLogHandler = new RequestLogHandler(); diff --git a/jetty-server/src/main/config/etc/jetty-requestlog.xml b/jetty-server/src/main/config/etc/jetty-requestlog.xml index 247997e306..6e6eb054f0 100644 --- a/jetty-server/src/main/config/etc/jetty-requestlog.xml +++ b/jetty-server/src/main/config/etc/jetty-requestlog.xml @@ -19,7 +19,7 @@ <Set name="filenameDateFormat">yyyy_MM_dd</Set> <Set name="retainDays">90</Set> <Set name="append">true</Set> - <Set name="extended">false</Set> + <Set name="extended">true</Set> <Set name="logCookies">false</Set> <Set name="LogTimeZone">GMT</Set> </New> diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java index db78968d42..5223e97004 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/AbstractNCSARequestLog.java @@ -84,6 +84,7 @@ public abstract class AbstractNCSARequestLog extends AbstractLifeCycle implement * * @see org.eclipse.jetty.server.RequestLog#log(org.eclipse.jetty.server.Request, org.eclipse.jetty.server.Response) */ + @Override public void log(Request request, Response response) { try diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java index a04b74d42b..f2518ff90c 100644 --- a/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java +++ b/jetty-server/src/main/java/org/eclipse/jetty/server/Request.java @@ -1768,6 +1768,9 @@ public class Request implements HttpServletRequest public void setHandled(boolean h) { _handled = h; + Response r=getResponse(); + if (_handled && r.getStatus()==0) + r.setStatus(200); } /* ------------------------------------------------------------ */ |