SeleniumHQ
diff --git a/‎java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java‎
Lines changed: 2 additions & 0 deletions b/‎java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎java/client/test/org/openqa/selenium/CookieImplementationTest.java‎
Lines changed: 1 addition & 1 deletion b/‎java/client/test/org/openqa/selenium/CookieImplementationTest.java‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎java/client/test/org/openqa/selenium/environment/webserver/CookieServlet.java‎
Lines changed: 3 additions & 4 deletions b/‎java/client/test/org/openqa/selenium/environment/webserver/CookieServlet.java‎
Lines changed: 3 additions & 4 deletions
@@ -791,6 +791,7 @@ public Set<Cookie> getCookies() {
         String path = (String) rawCookie.get("path");
         String domain = (String) rawCookie.get("domain");
         boolean secure = rawCookie.containsKey("secure") && (Boolean) rawCookie.get("secure");
+        boolean httpOnly = rawCookie.containsKey("httpOnly") && (Boolean) rawCookie.get("httpOnly");
 
         Number expiryNum = (Number) rawCookie.get("expiry");
         Date expiry = expiryNum == null ? null : new Date(
@@ -800,6 +801,7 @@ public Set<Cookie> getCookies() {
             .path(path)
             .domain(domain)
             .isSecure(secure)
+            .isHttpOnly(httpOnly)
             .expiresOn(expiry)
             .build());
       }
 
@@ -436,7 +436,7 @@ public void canHandleHttpOnlyCookie() {
     assertNotNull(retrieved);
   }
 
-  @Ignore(ALL)
+  @Ignore(SAFARI)
   @Test
   public void testRetainsHttpOnlyFlag() {
     Cookie addedCookie =
 
@@ -61,10 +61,9 @@ protected void doGet(HttpServletRequest request, HttpServletResponse response)
       if (secure != null) {
         newCookie.setSecure(Boolean.parseBoolean(secure));
       }
-      // TODO: Requires servlet-api 3.0+
-      //if (httpOnly != null) {
-      //  newCookie.setHttpOnly(Boolean.parseBoolean(httpOnly));
-      //}
+      if (httpOnly != null) {
+        newCookie.setHttpOnly(Boolean.parseBoolean(httpOnly));
+      }
       response.addCookie(newCookie);
 
       response.getOutputStream().println(
Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,7 @@ public void canHandleHttpOnlyCookie() {`
`436`	`436`	`assertNotNull(retrieved);`
`437`	`437`	`}`
`438`	`438`
`439`		`- @Ignore(ALL)`
	`439`	`+ @Ignore(SAFARI)`
`440`	`440`	`@Test`
`441`	`441`	`public void testRetainsHttpOnlyFlag() {`
`442`	`442`	`Cookie addedCookie =`