51366 2010-12-20 17:20:58 -0800 REGRESSION (r66452): Form data no longer contains 'Content-Type' header for files with unrecognized extensions 2010-12-21 16:15:20 -0800 1 1 1 Unclassified WebKit Forms 528+ (Nightly build) PC OS X 10.5 RESOLVED FIXED InRadar, Regression P2 Normal --- 44389 1 aestes jianli abarth ap darin eric fishd jianli levin webkit.review.bot oldest_to_newest 324667 0 aestes 2010-12-20 17:20:58 -0800 Prior to r66452, WebKit would include 'Content-Type: application/octet-stream' for files with no extension or with extensions that can't be resolved to a more appropriate MIME type. r66452 changed this behavior to exclude the 'Content-Type' header in these cases. This change violates RFC 1867, which says in section 3.3: "Each part should be labelled with an appropriate content-type if the media type is known (e.g., inferred from the file extension or operating system typing information) or as application/octet-stream." 324668 1 aestes 2010-12-20 17:22:36 -0800 <rdar://problem/8545265> 324671 2 77058 aestes 2010-12-20 17:33:26 -0800 Created attachment 77058 Test 324672 3 aestes 2010-12-20 17:34:27 -0800 (In reply to comment #2) > Created an attachment (id=77058) [details] > Test To run the test, apply this patch and run it with run-webkit-tests. 324688 4 aestes 2010-12-20 18:38:33 -0800 I'm actually just about to upload a patch for this. 324689 5 77061 jianli 2010-12-20 18:38:54 -0800 Created attachment 77061 Proposed Patch 324690 6 77061 aestes 2010-12-20 18:43:46 -0800 Comment on attachment 77061 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77061&action=review > WebCore/platform/network/FormData.cpp:231 > + contentType = "application/octet-stream"; I think the more appropriate way to fix this is to change createBlobDataForFile() to call MIMETypeRegistry::getMIMETypeForPath() rather than MIMETypeRegistry::getMIMETypeForExtension(). getMIMETypeForPath() already has the logic to default to 'application/octet-stream'. If we claim that 'application/octet-stream' is the appropriate default MIME type, we should consolidate that logic in one place. 324722 7 77071 aestes 2010-12-20 19:31:48 -0800 Created attachment 77071 Patch 324723 8 aestes 2010-12-20 19:32:54 -0800 I didn't mean to step on top of your patch, Jian. We were just both working on this at the same time. 324730 9 aestes 2010-12-20 19:40:19 -0800 Side note: Darin (Adler) pointed out that it's inconsistent to have MIMETypeRegistry::getMIMETypeForPath() return 'application/octet-stream' by default but MIMETypeRegistry::getMIMETypeForExtension() return the empty string. There should be a separate bug to clean this up and have them both return the same thing. 324733 10 jianli 2010-12-20 19:46:02 -0800 (In reply to comment #9) > Side note: Darin (Adler) pointed out that it's inconsistent to have MIMETypeRegistry::getMIMETypeForPath() return 'application/octet-stream' by default but MIMETypeRegistry::getMIMETypeForExtension() return the empty string. There should be a separate bug to clean this up and have them both return the same thing. I did not realize that you're also working the patch. I thought you just filed a bug and produced a layout test for testing. Per the File API spec (http://www.w3.org/TR/FileAPI/#dfn-type): type The ASCII-encoded string in lower case representing the media type of the Blob, expressed as an RFC2046 MIME type [RFC2046]. User agents SHOULD return the MIME type of the Blob, if it is known. If implementations cannot determine the media type of the Blob, they MUST return the empty string. So this is the reason I called getMIMETypeForExtension() on purpose in File.cpp. I think we need to unify getMIMETypeForExtension and getMIMETypeForPath. But we need to allow passing the default MIME type as an argument if the valid one cannot be found. How do you think? 325164 11 77071 aestes 2010-12-21 13:15:34 -0800 Comment on attachment 77071 Patch r- based on Jian's comments. 325166 12 77061 darin 2010-12-21 13:19:29 -0800 Comment on attachment 77061 Proposed Patch View in context: https://bugs.webkit.org/attachment.cgi?id=77061&action=review Things I’d like to see after landing this: 1) Functions in MIME type registry made consistent about how the express no known MIME type. Null string seems a good standard; maybe we can move to that everywhere. 2) The "application/octet-stream" MIME type string in one place rather than repeated multiple places. The model should be how we use the blankURL() function for the "about:blank" URL. 3) Test coverage for the Blob case we would have broken with Andy’s patch. >> WebCore/platform/network/FormData.cpp:231 >> + contentType = "application/octet-stream"; > > I think the more appropriate way to fix this is to change createBlobDataForFile() to call MIMETypeRegistry::getMIMETypeForPath() rather than MIMETypeRegistry::getMIMETypeForExtension(). getMIMETypeForPath() already has the logic to default to 'application/octet-stream'. If we claim that 'application/octet-stream' is the appropriate default MIME type, we should consolidate that logic in one place. As we discussed, it’s fine to have the fix here, but things are a mess, with multiple layers that do not agree on how to say “no known MIME type”. Lets get this fixed, and then do a bit of cleanup. 325170 13 aestes 2010-12-21 13:22:48 -0800 I filed https://bugs.webkit.org/show_bug.cgi?id=51416 for the MIMETypeRegistry issue. 325196 14 aestes 2010-12-21 14:17:32 -0800 I'll land Jian's patch now that Darin has reviewed it. 325202 15 aestes 2010-12-21 14:37:12 -0800 Committed r74427: <http://trac.webkit.org/changeset/74427> 325230 16 webkit.review.bot 2010-12-21 15:22:13 -0800 http://trac.webkit.org/changeset/74427 might have broken SnowLeopard Intel Release (Tests) The following tests are not passing: http/tests/local/formdata/send-form-data-with-sliced-file.html 325254 17 aestes 2010-12-21 16:15:20 -0800 (In reply to comment #16) > http://trac.webkit.org/changeset/74427 might have broken SnowLeopard Intel Release (Tests) > The following tests are not passing: > http/tests/local/formdata/send-form-data-with-sliced-file.html I believe the new result for this test os correct; I updated it in http://trac.webkit.org/changeset/74435. From reading the FileAPI spec, it sounds like a sliced blob should not have a content type unless one is specified explicitly as the third argument to Blob.slice() (as opposed to it inheriting content type from its parent blob). When this is the case, Blob.type should return the empty string and the Content-Type in the HTTP POST should be 'application/octet-stream' according to RFC 1867. The new test results are showing that the latter is indeed the case for sliced files. Jian, let me know if you disagree with this assessment. 77058 2010-12-20 17:33:26 -0800 2010-12-20 18:38:54 -0800 Test bug-51366-20101220173324.patch text/plain 3146 aestes SW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHJldmlzaW9uIDc0Mzc3KQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTAtMTItMjAgIEFuZHkgRXN0ZXMgIDxhZXN0 ZXNAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIFJFR1JFU1NJT04gKHI2NjQ1Mik6IEZvcm0gZGF0YSBubyBsb25nZXIgY29udGFpbnMg J0NvbnRlbnQtVHlwZScgaGVhZGVyCisgICAgICAgIGZvciBmaWxlcyB3aXRoIHVucmVjb2duaXpl ZCBleHRlbnNpb25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9NTEzNjYKKyAgICAgICAgCisgICAgICAgIEFkZCBhIHRlc3Qgd2l0aCBmYWlsaW5nIHJl c3VsdHMgdG8gZGVtb25zdHJhdGUgdGhlIHJlZ3Jlc3Npb24uCisKKyAgICAgICAgKiBodHRwL3Rl c3RzL2xvY2FsL2Zvcm1kYXRhL2Zvcm0tZGF0YS13aXRoLXVua25vd24tZmlsZS1leHRlbnNpb24t ZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2xvY2FsL2Zvcm1kYXRh L2Zvcm0tZGF0YS13aXRoLXVua25vd24tZmlsZS1leHRlbnNpb24uaHRtbDogQWRkZWQuCisgICAg ICAgICogaHR0cC90ZXN0cy9sb2NhbC9yZXNvdXJjZXMvZmlsZS5pbnZhbGlkOiBBZGRlZC4KKwog MjAxMC0xMi0yMCAgT2xpdmVyIEh1bnQgIDxvbGl2ZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IEdlb2ZmcmV5IEdhcmVuLgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9s b2NhbC9mb3JtZGF0YS9mb3JtLWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLWV4cGVj dGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvY2FsL2Zvcm1k YXRhL2Zvcm0tZGF0YS13aXRoLXVua25vd24tZmlsZS1leHRlbnNpb24tZXhwZWN0ZWQudHh0CShy ZXZpc2lvbiAwKQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9mb3Jt LWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKQEAgLTAsMCArMSw2IEBACisKK0ZBSUwgeGhyLnJlc3BvbnNlVGV4dCBzaG91bGQgYmUgZmls ZT1maWxlLmludmFsaWQ6YXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtOjEyMzQ1Njc4OTAuIFdhcyBm aWxlMT1maWxlLmludmFsaWQ6OjEyMzQ1Njc4OTAuCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBp cyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9s b2NhbC9mb3JtZGF0YS9mb3JtLWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLmh0bWwK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9mb3Jt LWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLmh0bWwJKHJldmlzaW9uIDApCisrKyBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvY2FsL2Zvcm1kYXRhL2Zvcm0tZGF0YS13aXRoLXVua25v d24tZmlsZS1leHRlbnNpb24uaHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyOCBAQAorPCFE T0NUWVBFIEhUTUwgUFVCTElDICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVh ZD4KKzxsaW5rIHJlbD0ic3R5bGVzaGVldCIgaHJlZj0iLi4vLi4vLi4vLi4vZmFzdC9qcy9yZXNv dXJjZXMvanMtdGVzdC1zdHlsZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL2Zhc3Qv anMvcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5Pgor PHAgaWQ9ImRlc2NyaXB0aW9uIj48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3Jp cHQgc3JjPSJyZXNvdXJjZXMvc2VuZC1mb3JtLWRhdGEtY29tbW9uLmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQ+CisgICAgZnVuY3Rpb24gYWRkWEhSRXZlbnRIYW5kbGVycyh4aHIsIGZpbGUpIHsKKyAg ICAgICAgeGhyLm9ucmVhZHlzdGF0ZWNoYW5nZSA9IGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICAg ICAgICBpZiAoeGhyLnJlYWR5U3RhdGUgPT0geGhyLkRPTkUpIHsKKyAgICAgICAgICAgICAgICB3 aW5kb3cueGhyID0geGhyOworICAgICAgICAgICAgICAgIHNob3VsZEJlKCJ4aHIucmVzcG9uc2VU ZXh0IiwgIidmaWxlPWZpbGUuaW52YWxpZDphcHBsaWNhdGlvbi9vY3RldC1zdHJlYW06MTIzNDU2 Nzg5MCciKTsKKyAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0K KyAgICAgICAgfQorICAgIH0KKyAgICAKKyAgICB0ZXN0U2VuZGluZ0Zvcm1EYXRhKFt7J3R5cGUn OiAnZmlsZScsICduYW1lJzogJ2ZpbGUxJywgJ3ZhbHVlJzogJy4uL3Jlc291cmNlcy9maWxlLmlu dmFsaWQnfV0sIHRydWUsIGFkZFhIUkV2ZW50SGFuZGxlcnMpOworICAgIHZhciBzdWNjZXNzZnVs bHlQYXJzZWQgPSB0cnVlOworICAgIHZhciBqc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKzwvc2NyaXB0 PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9z dC5qcyI+PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2xvY2FsL3Jlc291cmNlcy9maWxlLmludmFsaWQKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9yZXNvdXJjZXMvZmlsZS5pbnZhbGlkCShyZXZpc2lvbiAw KQorKysgTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9yZXNvdXJjZXMvZmlsZS5pbnZhbGlk CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxIEBACisxMjM0NTY3ODkwClwgTm8gbmV3bGluZSBhdCBl bmQgb2YgZmlsZQo= 77061 2010-12-20 18:38:54 -0800 2010-12-21 13:19:29 -0800 Proposed Patch 51366 text/plain 5008 jianli ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBiMTU2YjBkLi40NTc2YTI3IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTcgQEAKIDIwMTAtMTIt MjAgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWcgNTEzNjY6IFJFR1JFU1NJT04gKHI2 NjQ1Mik6IEZvcm0gZGF0YSBubyBsb25nZXIgY29udGFpbnMKKyAgICAgICAgJ0NvbnRlbnQtVHlw ZScgaGVhZGVyIGZvciBmaWxlcyB3aXRoIHVucmVjb2duaXplZCBleHRlbnNpb25zCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTM2NgorCisgICAgICAg ICogaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9mb3JtLWRhdGEtd2l0aC11bmtub3duLWZpbGUt ZXh0ZW5zaW9uLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogaHR0cC90ZXN0cy9sb2Nh bC9mb3JtZGF0YS9mb3JtLWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLmh0bWw6IEFk ZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL2ZpbGUuaW52YWxpZDog QWRkZWQuCisKKzIwMTAtMTItMjAgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgorCiAg ICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgogCiAgICAgICAgIEFkZCBsYXN0TW9kaWZp ZWREYXRlIGF0dHJpYnV0ZSB0byBGaWxlIGludGVyZmFjZSBwZXIgRmlsZSBBUEkgc3BlYwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9mb3JtLWRhdGEt d2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5rbm93bi1maWxlLWV4dGVu c2lvbi1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uNzk5 YzBiZQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvZm9y bWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5rbm93bi1maWxlLWV4dGVuc2lvbi1leHBlY3RlZC50eHQK QEAgLTAsMCArMSw2IEBACisKK1BBU1MgeGhyLnJlc3BvbnNlVGV4dCBpcyAnZmlsZTE9ZmlsZS5p bnZhbGlkOmFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbToxMjM0NTY3ODkwJworUEFTUyBzdWNjZXNz ZnVsbHlQYXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5rbm93bi1m aWxlLWV4dGVuc2lvbi5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0 YS9mb3JtLWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLmh0bWwKbmV3IGZpbGUgbW9k ZSAxMDA3NTUKaW5kZXggMDAwMDAwMC4uNDY3NGFhZAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91 dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5rbm93bi1m aWxlLWV4dGVuc2lvbi5odG1sCkBAIC0wLDAgKzEsMjggQEAKKzwhRE9DVFlQRSBIVE1MIFBVQkxJ QyAiLS8vSUVURi8vRFREIEhUTUwvL0VOIj4KKzxodG1sPgorPGhlYWQ+Cis8bGluayByZWw9InN0 eWxlc2hlZXQiIGhyZWY9Ii4uLy4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3Qtc3R5 bGUuY3NzIj4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10 ZXN0LXByZS5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlv biI+PC9wPgorPGRpdiBpZD0iY29uc29sZSI+PC9kaXY+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2Vz L3NlbmQtZm9ybS1kYXRhLWNvbW1vbi5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorICAgIGZ1bmN0 aW9uIGFkZFhIUkV2ZW50SGFuZGxlcnMoeGhyLCBmaWxlKSB7CisgICAgICAgIHhoci5vbnJlYWR5 c3RhdGVjaGFuZ2UgPSBmdW5jdGlvbihldmVudCkgeworICAgICAgICAgICAgaWYgKHhoci5yZWFk eVN0YXRlID09IHhoci5ET05FKSB7CisgICAgICAgICAgICAgICAgd2luZG93LnhociA9IHhocjsK KyAgICAgICAgICAgICAgICBzaG91bGRCZSgieGhyLnJlc3BvbnNlVGV4dCIsICInZmlsZTE9Zmls ZS5pbnZhbGlkOmFwcGxpY2F0aW9uL29jdGV0LXN0cmVhbToxMjM0NTY3ODkwJyIpOworICAgICAg ICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgfQorICAgICAgICB9CisgICAg fQorICAgIAorICAgIHRlc3RTZW5kaW5nRm9ybURhdGEoW3sndHlwZSc6ICdmaWxlJywgJ25hbWUn OiAnZmlsZTEnLCAndmFsdWUnOiAnLi4vcmVzb3VyY2VzL2ZpbGUuaW52YWxpZCd9XSwgdHJ1ZSwg YWRkWEhSRXZlbnRIYW5kbGVycyk7CisgICAgdmFyIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7 CisgICAgdmFyIGpzVGVzdElzQXN5bmMgPSB0cnVlOworPC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i Li4vLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4K KzwvYm9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9j YWwvcmVzb3VyY2VzL2ZpbGUuaW52YWxpZCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9jYWwv cmVzb3VyY2VzL2ZpbGUuaW52YWxpZApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw Li42YTUzN2I1Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2Nh bC9yZXNvdXJjZXMvZmlsZS5pbnZhbGlkCkBAIC0wLDAgKzEgQEAKKzEyMzQ1Njc4OTAKXCBObyBu ZXdsaW5lIGF0IGVuZCBvZiBmaWxlCmRpZmYgLS1naXQgYS9XZWJDb3JlL0NoYW5nZUxvZyBiL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IDBmZDQzNGIuLmQ2Mjg1ZDkgMTAwNjQ0Ci0tLSBhL1dlYkNv cmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIw MTAtMTItMjAgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgogCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEZpeCBidWcgNTEzNjY6IFJFR1JFU1NJ T04gKHI2NjQ1Mik6IEZvcm0gZGF0YSBubyBsb25nZXIgY29udGFpbnMKKyAgICAgICAgJ0NvbnRl bnQtVHlwZScgaGVhZGVyIGZvciBmaWxlcyB3aXRoIHVucmVjb2duaXplZCBleHRlbnNpb25zCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01MTM2NgorCisg ICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5r bm93bi1maWxlLWV4dGVuc2lvbi5odG1sCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0Zv cm1EYXRhLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkZvcm1EYXRhOjphcHBlbmRLZXlWYWx1ZVBh aXJJdGVtcyk6CisKKzIwMTAtMTItMjAgIEppYW4gTGkgIDxqaWFubGlAY2hyb21pdW0ub3JnPgor CiAgICAgICAgIFJldmlld2VkIGJ5IERhdmlkIExldmluLgogCiAgICAgICAgIEFkZCBsYXN0TW9k aWZpZWREYXRlIGF0dHJpYnV0ZSB0byBGaWxlIGludGVyZmFjZSBwZXIgRmlsZSBBUEkgc3BlYwpk aWZmIC0tZ2l0IGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcCBiL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9Gb3JtRGF0YS5jcHAKaW5kZXggNDA2YTM3NS4uYjIwYjQxYSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Zvcm1EYXRhLmNwcAorKysgYi9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvRm9ybURhdGEuY3BwCkBAIC0yMjUsOSArMjI1LDEzIEBA IHZvaWQgRm9ybURhdGE6OmFwcGVuZEtleVZhbHVlUGFpckl0ZW1zKGNvbnN0IEZvcm1EYXRhTGlz dCYgbGlzdCwgY29uc3QgVGV4dEVuY29kCiAgICAgICAgICAgICAgICAgLy8gV2UgaGF2ZSB0byBp bmNsdWRlIHRoZSBmaWxlbmFtZT0iLi4iIHBhcnQgaW4gdGhlIGhlYWRlciwgZXZlbiBpZiB0aGUg ZmlsZW5hbWUgaXMgZW1wdHkKICAgICAgICAgICAgICAgICBGb3JtRGF0YUJ1aWxkZXI6OmFkZEZp bGVuYW1lVG9NdWx0aVBhcnRIZWFkZXIoaGVhZGVyLCBlbmNvZGluZywgbmFtZSk7CiAKLSAgICAg ICAgICAgICAgICAvLyBBZGQgdGhlIGNvbnRlbnQgdHlwZSBpZiBpdCBpcyBhdmFpbGFibGUuCi0g ICAgICAgICAgICAgICAgaWYgKCF2YWx1ZS5ibG9iKCktPnR5cGUoKS5pc0VtcHR5KCkpCi0gICAg ICAgICAgICAgICAgICAgIEZvcm1EYXRhQnVpbGRlcjo6YWRkQ29udGVudFR5cGVUb011bHRpUGFy dEhlYWRlcihoZWFkZXIsIHZhbHVlLmJsb2IoKS0+dHlwZSgpLmxhdGluMSgpKTsKKyAgICAgICAg ICAgICAgICAvLyBBZGQgdGhlIGNvbnRlbnQgdHlwZSBpZiBhdmFpbGFibGUsIG9yICJhcHBsaWNh dGlvbi9vY3RldC1zdHJlYW0iIG90aGVyd2lzZSAoUkZDIDE4NjcpLgorICAgICAgICAgICAgICAg IFN0cmluZyBjb250ZW50VHlwZTsKKyAgICAgICAgICAgICAgICBpZiAodmFsdWUuYmxvYigpLT50 eXBlKCkuaXNFbXB0eSgpKQorICAgICAgICAgICAgICAgICAgICBjb250ZW50VHlwZSA9ICJhcHBs aWNhdGlvbi9vY3RldC1zdHJlYW0iOworICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICAgICAgY29udGVudFR5cGUgPSB2YWx1ZS5ibG9iKCktPnR5cGUoKTsKKyAgICAgICAgICAg ICAgICBGb3JtRGF0YUJ1aWxkZXI6OmFkZENvbnRlbnRUeXBlVG9NdWx0aVBhcnRIZWFkZXIoaGVh ZGVyLCBjb250ZW50VHlwZS5sYXRpbjEoKSk7CiAgICAgICAgICAgICB9CiAKICAgICAgICAgICAg IEZvcm1EYXRhQnVpbGRlcjo6ZmluaXNoTXVsdGlQYXJ0SGVhZGVyKGhlYWRlcik7Cg== 77071 2010-12-20 19:31:48 -0800 2010-12-21 13:15:58 -0800 Patch bug-51366-20101220193146.patch text/plain 4554 aestes SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA3NDM4MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTggQEAKKzIwMTAtMTItMjAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29t PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJFR1JF U1NJT04gKHI2NjQ1Mik6IEZvcm0gZGF0YSBubyBsb25nZXIgY29udGFpbnMgJ0NvbnRlbnQtVHlw ZScgaGVhZGVyCisgICAgICAgIGZvciBmaWxlcyB3aXRoIHVucmVjb2duaXplZCBleHRlbnNpb25z LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEzNjYK KworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL2xvY2FsL2Zvcm1kYXRhL2Zvcm0tZGF0YS13aXRo LXVua25vd24tZmlsZS1leHRlbnNpb24uaHRtbAorCisgICAgICAgICogZmlsZWFwaS9GaWxlLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUJsb2JEYXRhRm9yRmlsZSk6IENhbGwgZ2V0TUlN RVR5cGVGb3JQYXRoKCkgaW5zdGVhZCBvZgorICAgICAgICBnZXRNSU1FVHlwZUZvckV4dGVuc2lv bigpLCB3aGljaCByZXR1cm5zICdhcHBsaWNhdGlvbi9vY3RldC1zdHJlYW0nCisgICAgICAgIHdo ZW4gbm8gbW9yZSBhcHByb3ByaWF0ZSBNSU1FIHR5cGUgY2FuIGJlIGZvdW5kLgorCiAyMDEwLTEy LTIwICBTdGV2ZSBMYWNleSAgPHNqbEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgRGF2aWQgTGV2aW4uCkluZGV4OiBXZWJDb3JlL2ZpbGVhcGkvRmlsZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gV2ViQ29yZS9maWxlYXBpL0ZpbGUuY3BwCShyZXZpc2lvbiA3NDM1NSkKKysrIFdlYkNv cmUvZmlsZWFwaS9GaWxlLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEgKzMzLDcgQEAgbmFt ZXNwYWNlIFdlYkNvcmUgewogCiBzdGF0aWMgUGFzc093blB0cjxCbG9iRGF0YT4gY3JlYXRlQmxv YkRhdGFGb3JGaWxlKGNvbnN0IFN0cmluZyYgcGF0aCkKIHsKLSAgICBTdHJpbmcgdHlwZTsKLSAg ICBpbnQgaW5kZXggPSBwYXRoLnJldmVyc2VGaW5kKCcuJyk7Ci0gICAgaWYgKGluZGV4ICE9IC0x KQotICAgICAgICB0eXBlID0gTUlNRVR5cGVSZWdpc3RyeTo6Z2V0TUlNRVR5cGVGb3JFeHRlbnNp b24ocGF0aC5zdWJzdHJpbmcoaW5kZXggKyAxKSk7Ci0KKyAgICBTdHJpbmcgdHlwZSA9IE1JTUVU eXBlUmVnaXN0cnk6OmdldE1JTUVUeXBlRm9yUGF0aChwYXRoKTsKICAgICBPd25QdHI8QmxvYkRh dGE+IGJsb2JEYXRhID0gQmxvYkRhdGE6OmNyZWF0ZSgpOwogICAgIGJsb2JEYXRhLT5zZXRDb250 ZW50VHlwZSh0eXBlKTsKICAgICBibG9iRGF0YS0+YXBwZW5kRmlsZShwYXRoKTsKSW5kZXg6IExh eW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHJldmlzaW9uIDc0MzgzKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkp CkBAIC0xLDMgKzEsMTUgQEAKKzIwMTAtMTItMjAgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUu Y29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJF R1JFU1NJT04gKHI2NjQ1Mik6IEZvcm0gZGF0YSBubyBsb25nZXIgY29udGFpbnMgJ0NvbnRlbnQt VHlwZScgaGVhZGVyCisgICAgICAgIGZvciBmaWxlcyB3aXRoIHVucmVjb2duaXplZCBleHRlbnNp b25zLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NTEz NjYKKworICAgICAgICAqIGh0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgt dW5rbm93bi1maWxlLWV4dGVuc2lvbi1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0 dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5rbm93bi1maWxlLWV4dGVu c2lvbi5odG1sOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2xvY2FsL3Jlc291cmNlcy9m aWxlLmludmFsaWQ6IEFkZGVkLgorCiAyMDEwLTEyLTIwICBUb255IEdlbnRpbGNvcmUgIDx0b255 Z0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCBidWlsZCBmaXguCkluZGV4OiBM YXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvY2FsL2Zvcm1kYXRhL2Zvcm0tZGF0YS13aXRoLXVua25v d24tZmlsZS1leHRlbnNpb24tZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3Rz L2h0dHAvdGVzdHMvbG9jYWwvZm9ybWRhdGEvZm9ybS1kYXRhLXdpdGgtdW5rbm93bi1maWxlLWV4 dGVuc2lvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2xvY2FsL2Zvcm1kYXRhL2Zvcm0tZGF0YS13aXRoLXVua25vd24tZmlsZS1leHRlbnNpb24t ZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDYgQEAKKworUEFTUyB4aHIucmVz cG9uc2VUZXh0IGlzICdmaWxlMT1maWxlLmludmFsaWQ6YXBwbGljYXRpb24vb2N0ZXQtc3RyZWFt OjEyMzQ1Njc4OTAnCitQQVNTIHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09N UExFVEUKKwpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9mb3Jt LWRhdGEtd2l0aC11bmtub3duLWZpbGUtZXh0ZW5zaW9uLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9mb3JtZGF0YS9mb3JtLWRhdGEtd2l0aC11bmtub3du LWZpbGUtZXh0ZW5zaW9uLmh0bWwJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2xvY2FsL2Zvcm1kYXRhL2Zvcm0tZGF0YS13aXRoLXVua25vd24tZmlsZS1leHRlbnNpb24u aHRtbAkocmV2aXNpb24gMCkKQEAgLTAsMCArMSwyOCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElD ICItLy9JRVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxsaW5rIHJlbD0ic3R5 bGVzaGVldCIgaHJlZj0iLi4vLi4vLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1zdHls ZS5jc3MiPgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRl c3QtcHJlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHAgaWQ9ImRlc2NyaXB0aW9u Ij48L3A+Cis8ZGl2IGlkPSJjb25zb2xlIj48L2Rpdj4KKzxzY3JpcHQgc3JjPSJyZXNvdXJjZXMv c2VuZC1mb3JtLWRhdGEtY29tbW9uLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CisgICAgZnVuY3Rp b24gYWRkWEhSRXZlbnRIYW5kbGVycyh4aHIsIGZpbGUpIHsKKyAgICAgICAgeGhyLm9ucmVhZHlz dGF0ZWNoYW5nZSA9IGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICAgICAgICBpZiAoeGhyLnJlYWR5 U3RhdGUgPT0geGhyLkRPTkUpIHsKKyAgICAgICAgICAgICAgICB3aW5kb3cueGhyID0geGhyOwor ICAgICAgICAgICAgICAgIHNob3VsZEJlKCJ4aHIucmVzcG9uc2VUZXh0IiwgIidmaWxlMT1maWxl LmludmFsaWQ6YXBwbGljYXRpb24vb2N0ZXQtc3RyZWFtOjEyMzQ1Njc4OTAnIik7CisgICAgICAg ICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKyAgICB9 CisgICAgCisgICAgdGVzdFNlbmRpbmdGb3JtRGF0YShbeyd0eXBlJzogJ2ZpbGUnLCAnbmFtZSc6 ICdmaWxlMScsICd2YWx1ZSc6ICcuLi9yZXNvdXJjZXMvZmlsZS5pbnZhbGlkJ31dLCB0cnVlLCBh ZGRYSFJFdmVudEhhbmRsZXJzKTsKKyAgICB2YXIgc3VjY2Vzc2Z1bGx5UGFyc2VkID0gdHJ1ZTsK KyAgICB2YXIganNUZXN0SXNBc3luYyA9IHRydWU7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIu Li8uLi8uLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXBvc3QuanMiPjwvc2NyaXB0Pgor PC9ib2R5PgorPC9odG1sPgpJbmRleDogTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2NhbC9yZXNv dXJjZXMvZmlsZS5pbnZhbGlkCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv bG9jYWwvcmVzb3VyY2VzL2ZpbGUuaW52YWxpZAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3Rz L2h0dHAvdGVzdHMvbG9jYWwvcmVzb3VyY2VzL2ZpbGUuaW52YWxpZAkocmV2aXNpb24gMCkKQEAg LTAsMCArMSBAQAorMTIzNDU2Nzg5MApcIE5vIG5ld2xpbmUgYXQgZW5kIG9mIGZpbGUK