Merge r176990 - REGRESSION (173394): Support for webcam is broken

https://bugs.webkit.org/show_bug.cgi?id=139313 Test by Antti Koivisto, reviewed and tweaked by Alexey Proskuryakov. * http/tests/multipart/multipart-image-expected.html: Added. * http/tests/multipart/multipart-image.html: Added. * http/tests/multipart/resources/multipart.php: Multiopart boundary must start on a new line, so make it so. In newwer OS versions, CFNetwork has a workaround that makes invalid multipart response work, which is why the test was passing locally. Canonical link: https://commits.webkit.org/154760.258@webkitgtk/2.6 git-svn-id: https://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.6@178327 268f45cc-cd09-0410-ab3c-d52691b4dbfc
WebKit · Jan 13, 2015 · e164e28 · e164e28
1 parent c9b24c1
commit e164e28
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/LayoutTests/http/tests/multipart/multipart-image.html b/LayoutTests/http/tests/multipart/multipart-image.html
@@ -14,14 +14,16 @@
         /* width of abe.png */
         if (img.offsetWidth == 76)
             testRunner.notifyDone();
-        if (++count > 20)
+        if (++count > 100) // Wait up to 10 seconds in failure case.
             testRunner.notifyDone();
     }, 100);
 }
 </script>
 </head>
 <body>
-<!-- The last image is repeated due to a WebCore side bug that causes last part to not render. -->
-<img id=test src="resources/multipart.php?interval=0.1&img1=green-100x100.png&img2=abe.png&img3=abe.png" onload="loadedFirstPart()">
-</body>
+<!--
+    The last image is repeated due to https://bugs.webkit.org/show_bug.cgi?id=36536, which causes last part to not render. 
+    It's repeated three times because otherwise the test didn't pass in 10.8, for an unknown mysterious reason.
+-->
+<img id=test src="resources/multipart.php?interval=0.1&img1=green-100x100.png&img2=abe.png&img3=abe.png&img4=abe.png" onload="loadedFirstPart()">
 </html>
diff --git a/LayoutTests/http/tests/multipart/resources/multipart.php b/LayoutTests/http/tests/multipart/resources/multipart.php
@@ -7,7 +7,7 @@ function sendPart($data)
 
         echo("Content-Type: image/png\r\n\r\n");
         echo($data);
-        echo("--$boundary\r\n");
+        echo("\r\n--$boundary\r\n");
         flush();
     }