svn commit: r1708889 - /tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

[markt]

Author: markt
Date: Thu Oct 15 20:36:20 2015
New Revision: 1708889

URL: http://svn.apache.org/viewvc?rev=1708889&view=rev
Log:
Servlet 4.0
Implement a PushBuidler TODO
Conditional requests

Modified:
    tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java

Modified: tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java
URL: 
http://svn.apache.org/viewvc/tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java?rev=1708889&r1=1708888&r2=1708889&view=diff
==============================================================================
--- tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java 
(original)
+++ tomcat/trunk/java/org/apache/catalina/core/ApplicationPushBuilder.java Thu 
Oct 15 20:36:20 2015
@@ -375,7 +375,11 @@ public class ApplicationPushBuilder impl
         }
 
         if (conditional) {
-            // TODO conditional
+            if (etag != null) {
+                setHeader("if-none-match", etag);
+            } else if (lastModified != null) {
+                setHeader("if-modified-since", lastModified);
+            }
         }
 
         // Cookies
@@ -388,6 +392,8 @@ public class ApplicationPushBuilder impl
         path = null;
         etag = null;
         lastModified = null;
+        headers.remove("if-none-match");
+        headers.remove("if-modified-since");
     }
 
 



---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org