Eclipse
/
jetty.project
mirror of https://github.com/jetty/jetty.project.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merged branch 'master' into 'jetty-9.1'.

This commit is contained in:
Simone Bordet 2013-07-26 19:17:30 +02:00
parent e628478eb4 61ea4d6705
commit 89be2de57f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
jetty-http/src/main/java/org/eclipse/jetty/http/HttpTester.java
View File

@ -67,10 +67,8 @@ public class HttpTester
{ {
Response r=new Response(); Response r=new Response();
HttpParser parser =new HttpParser(r); HttpParser parser =new HttpParser(r);
if (parser.parseNext(response)) parser.parseNext(response);
return r; return r;
else
return null;
} }
@ -93,7 +91,7 @@ public class HttpTester
{ {
_version=version; _version=version;
} }
public void setContent(byte[] bytes) public void setContent(byte[] bytes)
{ {
try try

5
jetty-servlets/src/main/java/org/eclipse/jetty/servlets/DoSFilter.java
View File

@ -19,6 +19,7 @@
package org.eclipse.jetty.servlets; package org.eclipse.jetty.servlets;
import java.io.IOException; import java.io.IOException;
import java.io.Serializable;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
@ -1066,8 +1067,10 @@ public class DoSFilter implements Filter
* A RateTracker is associated with a connection, and stores request rate * A RateTracker is associated with a connection, and stores request rate
* data. * data.
*/ */
class RateTracker extends Timeout.Task implements HttpSessionBindingListener, HttpSessionActivationListener class RateTracker extends Timeout.Task implements HttpSessionBindingListener, HttpSessionActivationListener, Serializable
{ {
private static final long serialVersionUID = 3534663738034577872L;
transient protected final String _id; transient protected final String _id;
transient protected final int _type; transient protected final int _type;
transient protected final long[] _timestamps; transient protected final long[] _timestamps;