Index: web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java
===================================================================
--- web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java	(revision 24514)
+++ web/web-core/src/main/java/org/apache/catalina/connector/OutputBuffer.java	(working copy)
@@ -703,7 +703,7 @@
             return;
         }
     
-        if (response.containsHeader(SET_COOKIE_HEADER)) {
+        if (response.containsSessionCookie()) {
             return;
         }