Bug 23091: Some webarchive http tests intermittently fail due to Connection...

        <https://bugs.webkit.org/show_bug.cgi?id=23091>

        Reviewed by Darin Adler.

WebKitTools:

        * DumpRenderTree/mac/DumpRenderTree.mm:
        (normalizeHTTPResponseHeaderFields): Remove Keep-Alive and
        Connection headers from webarchive results.

LayoutTests:

        Updated test results after removing Keep-Alive and Connection
        headers from webarchive tests.

        * http/tests/webarchive/test-css-url-encoding-expected.webarchive:
        * http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive:
        * http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive:
        * http/tests/webarchive/test-preload-resources-expected.webarchive:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@39576 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3dd66cd..57724c0 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2009-01-03  David D. Kilzer  <ddkilzer@webkit.org>
+
+        Bug 23091: Some webarchive http tests intermittently fail due to Connection/Keep-Alive header differences
+
+        <https://bugs.webkit.org/show_bug.cgi?id=23091>
+
+        Reviewed by Darin Adler.
+
+        Updated test results after removing Keep-Alive and Connection
+        headers from webarchive tests.
+
+        * http/tests/webarchive/test-css-url-encoding-expected.webarchive:
+        * http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive:
+        * http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive:
+        * http/tests/webarchive/test-preload-resources-expected.webarchive:
+
 2009-01-03  Rob Buis  <rwlbuis@gmail.com>
 
         Reviewed by Darin.

diff --git a/LayoutTests/http/tests/webarchive/test-css-url-encoding-expected.webarchive b/LayoutTests/http/tests/webarchive/test-css-url-encoding-expected.webarchive
index 63d020c..fbd16bd 100644 (file)
--- a/LayoutTests/http/tests/webarchive/test-css-url-encoding-expected.webarchive
+++ b/LayoutTests/http/tests/webarchive/test-css-url-encoding-expected.webarchive
@@ -91,8 +91,6 @@ Webarchive fails to save images referenced in CSS</a>
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -101,8 +99,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -170,8 +166,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -180,8 +174,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -249,8 +241,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -259,8 +249,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -328,8 +316,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -338,8 +324,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -375,8 +359,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>196</string>
                                        <key>Content-Type</key>
@@ -385,8 +367,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -424,8 +404,6 @@ div.background-shift-jis {
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>194</string>
                                        <key>Content-Type</key>
@@ -434,8 +412,6 @@ div.background-shift-jis {
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -477,8 +453,6 @@ div.background-utf-8 {
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>190</string>
                                        <key>Content-Type</key>
@@ -487,8 +461,6 @@ div.background-utf-8 {
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>

diff --git a/LayoutTests/http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive b/LayoutTests/http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive
index 9e26ca0..fc55136 100644 (file)
--- a/LayoutTests/http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive
+++ b/LayoutTests/http/tests/webarchive/test-css-url-encoding-shift-jis-expected.webarchive
@@ -93,8 +93,6 @@ Webarchive fails to save images referenced in CSS</a>
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -103,8 +101,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -172,8 +168,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -182,8 +176,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -251,8 +243,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -261,8 +251,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -330,8 +318,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -340,8 +326,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -377,8 +361,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>196</string>
                                        <key>Content-Type</key>
@@ -387,8 +369,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -426,8 +406,6 @@ div.background-shift-jis {
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>194</string>
                                        <key>Content-Type</key>
@@ -436,8 +414,6 @@ div.background-shift-jis {
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -479,8 +455,6 @@ div.background-utf-8 {
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>190</string>
                                        <key>Content-Type</key>
@@ -489,8 +463,6 @@ div.background-utf-8 {
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>

diff --git a/LayoutTests/http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive b/LayoutTests/http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive
index bbcdf31..2f99c8d 100644 (file)
--- a/LayoutTests/http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive
+++ b/LayoutTests/http/tests/webarchive/test-css-url-encoding-utf-8-expected.webarchive
@@ -93,8 +93,6 @@ Webarchive fails to save images referenced in CSS</a>
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -103,8 +101,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -172,8 +168,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -182,8 +176,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -251,8 +243,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -261,8 +251,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -330,8 +318,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>1476</string>
                                        <key>Content-Type</key>
@@ -340,8 +326,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -377,8 +361,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>196</string>
                                        <key>Content-Type</key>
@@ -387,8 +369,6 @@ Webarchive fails to save images referenced in CSS&lt;/a&gt;
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -426,8 +406,6 @@ div.background-shift-jis {
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>194</string>
                                        <key>Content-Type</key>
@@ -436,8 +414,6 @@ div.background-shift-jis {
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -479,8 +455,6 @@ div.background-utf-8 {
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>190</string>
                                        <key>Content-Type</key>
@@ -489,8 +463,6 @@ div.background-utf-8 {
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>

diff --git a/LayoutTests/http/tests/webarchive/test-preload-resources-expected.webarchive b/LayoutTests/http/tests/webarchive/test-preload-resources-expected.webarchive
index 6520465..0264967 100644 (file)
--- a/LayoutTests/http/tests/webarchive/test-preload-resources-expected.webarchive
+++ b/LayoutTests/http/tests/webarchive/test-preload-resources-expected.webarchive
@@ -55,8 +55,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -65,8 +63,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -96,8 +92,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -106,8 +100,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -137,8 +129,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -147,8 +137,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -178,8 +166,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -188,8 +174,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -219,8 +203,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -229,8 +211,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -260,8 +240,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -270,8 +248,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>
@@ -301,8 +277,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                <dict>
                                        <key>Accept-Ranges</key>
                                        <string>bytes</string>
-                                       <key>Connection</key>
-                                       <string>Keep-Alive</string>
                                        <key>Content-Length</key>
                                        <string>33</string>
                                        <key>Content-Type</key>
@@ -311,8 +285,6 @@ REGRESSION (35867): Many resources missing when saving webarchive of webkit.org&
                                        <string>Sun, 16 Nov 2008 17:00:00 GMT</string>
                                        <key>Etag</key>
                                        <string>"301925-21-45c7d72d3e780"</string>
-                                       <key>Keep-Alive</key>
-                                       <string>timeout=15</string>
                                        <key>Last-Modified</key>
                                        <string>Sun, 16 Nov 2008 16:55:00 GMT</string>
                                        <key>Server</key>

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b7067ae..d3f9c2f 100644 (file)
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2009-01-03  David D. Kilzer  <ddkilzer@webkit.org>
+
+        Bug 23091: Some webarchive http tests intermittently fail due to Connection/Keep-Alive header differences
+
+        <https://bugs.webkit.org/show_bug.cgi?id=23091>
+
+        Reviewed by Darin Adler.
+
+        * DumpRenderTree/mac/DumpRenderTree.mm:
+        (normalizeHTTPResponseHeaderFields): Remove Keep-Alive and
+        Connection headers from webarchive results.
+
 2008-12-31  Zan Dobersek  <zandobersek@gmail.com>
 
         Reviewed by Holger Freyther.

diff --git a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
index afb2b0d..43ce9f5 100644 (file)
--- a/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
+++ b/WebKitTools/DumpRenderTree/mac/DumpRenderTree.mm
@@ -690,16 +690,21 @@ static void convertWebResourceDataToString(NSMutableDictionary *resource)
 
 static void normalizeHTTPResponseHeaderFields(NSMutableDictionary *fields)
 {
+    // Normalize headers
     if ([fields objectForKey:@"Date"])
         [fields setObject:@"Sun, 16 Nov 2008 17:00:00 GMT" forKey:@"Date"];
     if ([fields objectForKey:@"Last-Modified"])
         [fields setObject:@"Sun, 16 Nov 2008 16:55:00 GMT" forKey:@"Last-Modified"];
-    if ([fields objectForKey:@"Keep-Alive"])
-        [fields setObject:@"timeout=15" forKey:@"Keep-Alive"];
     if ([fields objectForKey:@"Etag"])
         [fields setObject:@"\"301925-21-45c7d72d3e780\"" forKey:@"Etag"];
     if ([fields objectForKey:@"Server"])
         [fields setObject:@"Apache/2.2.9 (Unix) mod_ssl/2.2.9 OpenSSL/0.9.7l PHP/5.2.6" forKey:@"Server"];
+
+    // Remove headers
+    if ([fields objectForKey:@"Connection"])
+        [fields removeObjectForKey:@"Connection"];
+    if ([fields objectForKey:@"Keep-Alive"])
+        [fields removeObjectForKey:@"Keep-Alive"];
 }
 
 static void normalizeWebResourceURL(NSMutableString *webResourceURL)