aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2012-07-05 11:47:50 (EDT)
committerThomas Becker2012-07-05 11:47:50 (EDT)
commit17b585d2ce02be7c32bdea6373f4d63652032386 (patch)
tree7ffc11616df90fc4eb4c2a002e32123b442d5275
parent723f53ec64f5ed588ece1fdf290a3235916e4513 (diff)
downloadorg.eclipse.jetty.project-17b585d2ce02be7c32bdea6373f4d63652032386.zip
org.eclipse.jetty.project-17b585d2ce02be7c32bdea6373f4d63652032386.tar.gz
org.eclipse.jetty.project-17b585d2ce02be7c32bdea6373f4d63652032386.tar.bz2
spdy: isIfModifiedSinceHeaderPresent should have been removed, but slipped through a conflict merge. remove that method.refs/changes/36/6636/1
-rw-r--r--jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java5
1 files changed, 0 insertions, 5 deletions
diff --git a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
index 92b83d1..6f7ca5a 100644
--- a/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
+++ b/jetty-spdy/spdy-jetty-http/src/main/java/org/eclipse/jetty/spdy/http/ServerHTTPSPDYAsyncConnection.java
@@ -464,11 +464,6 @@ public class ServerHTTPSPDYAsyncConnection extends AbstractHttpConnection implem
return pushHeaders;
}
- private boolean isIfModifiedSinceHeaderPresent()
- {
- return headers.get("if-modified-since") != null;
- }
-
private Buffer consumeContent(long maxIdleTime) throws IOException, InterruptedException
{
while (true)