69972 2011-10-12 15:41:41 -0700 Spurious warnings when receiving HTTP response code 204 2014-12-13 18:38:41 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) Other Linux RESOLVED INVALID P2 Normal --- 0 rodarmor vsevik ap burg luiz pfeldman rodarmor vsevik webkit.review.bot yurys oldest_to_newest 482801 0 rodarmor 2011-10-12 15:41:41 -0700 1. Open the console 2. Navigate to google.com 3. Observe the warning: "Resource interpreted as Other but transferred with MIME type undefined." (you can repeat the warning by entering https://clients1.google.com/generate_204 into the url bar) I think what's going on here is that the code that generates the warning isn't checking for a 204 status code. As far as I can tell, since a 204 by definition doesn't have any content, this warning is unnecessary. The relevant code is in: /Source/WebCore/inspector/front-end/NetworkManager.js:_updateResourceWithResponse 483009 1 ap 2011-10-12 22:31:27 -0700 See also: bug 60206. 506093 2 115880 rodarmor 2011-11-18 15:02:04 -0800 Created attachment 115880 My proposed patch to NetworkManager Here's my proposed patch. Simply don't check for mime type consistency on 204 responses, since by definition they contain no data. 518486 3 118632 rodarmor 2011-12-09 14:06:15 -0800 Created attachment 118632 Updated patch, hopefully conforms to submission guidelines. 518487 4 118633 rodarmor 2011-12-09 14:07:07 -0800 Created attachment 118633 Updated patch, hopefully conforms to submission guidelines. 518492 5 webkit.review.bot 2011-12-09 14:11:59 -0800 Attachment 118633 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCor..." exit_code: 1 Source/WebCore/ChangeLog:1: ChangeLog entry has no bug number [changelog/bugnumber] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 518502 6 118637 rodarmor 2011-12-09 14:15:25 -0800 Created attachment 118637 ChangeLog now contains bug number. 518897 7 118637 pfeldman 2011-12-11 09:34:44 -0800 Comment on attachment 118637 ChangeLog now contains bug number. View in context: https://bugs.webkit.org/attachment.cgi?id=118637&action=review > Source/WebCore/inspector/front-end/NetworkManager.js:155 > + || resource.statusCode === 204 I don't think this is specific to the 204. This check is basically testing whether the mime type returned with the HTTP response is consistent with the type WebKit assigned to the loaded resource. The actual bug is in line 142 above that prints this.type and this.mimeType instead of resource.type and resource.mimeType. Fixing it will uncover whether 204 needs special handling. 520378 8 rodarmor 2011-12-13 14:31:38 -0800 I'm reading over the code, and I can't see how this.type and this.mimeType are set at all. I know I've seen various different types come up in the warning message, however. Do you know where those values are being set? 520975 9 pfeldman 2011-12-14 09:04:43 -0800 (In reply to comment #8) > I'm reading over the code, and I can't see how this.type and this.mimeType are set at all. I know I've seen various different types come up in the warning message, however. Do you know where those values are being set? As I mentioned above, you should replace "this.mimeType" and "this.type" with "resource.mimeType" and "resource.type" to fix the actual problem. 521006 10 119235 vsevik 2011-12-14 09:45:42 -0800 Created attachment 119235 Patch 521009 11 119235 ap 2011-12-14 09:51:56 -0800 Comment on attachment 119235 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=119235&action=review > LayoutTests/ChangeLog:4 > + Spurious warnings when receiving HTTP response code 204 > + https://bugs.webkit.org/show_bug.cgi?id=69972 The test doesn't use 204 response code. How does it check that the bug is fixed? 521033 12 vsevik 2011-12-14 10:24:47 -0800 (In reply to comment #11) > (From update of attachment 119235 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=119235&action=review > > > LayoutTests/ChangeLog:4 > > + Spurious warnings when receiving HTTP response code 204 > > + https://bugs.webkit.org/show_bug.cgi?id=69972 > > The test doesn't use 204 response code. How does it check that the bug is fixed? Hm... Looks like there is a misunderstanding what is the actual bug here. My patch is actually fixing the words "Other" and "undefined" in console message mentioned in the first post. This will make an original error message clear. I'll file another bug for that and upload my patch there. Meanwhile I am not sure we should fix the original issue at all - I don't think images should be loaded with mime type text/html. rodarmor, why is that needed? 521042 13 vsevik 2011-12-14 10:29:24 -0800 Filed: https://bugs.webkit.org/show_bug.cgi?id=74516 521048 14 vsevik 2011-12-14 10:33:13 -0800 FWIW, I see a lot of these error messages on mail.google.com (can not reproduce on google.com). They are all about loading images without content and they have both 200 and 204 status codes. 1055459 15 burg 2014-12-13 18:38:41 -0800 This warning does not seem to exist any more. 115880 2011-11-18 15:02:04 -0800 2011-12-09 14:06:15 -0800 My proposed patch to NetworkManager NetworkManager.patch text/plain 853 rodarmor LS0tIE5ldHdvcmtNYW5hZ2VyT3JpZ2luYWwuanMJMjAxMS0xMS0xOCAxNDo1OTo0OS4zNDYzMzgw MDAgLTA4MDAKKysrIE5ldHdvcmtNYW5hZ2VyLmpzCTIwMTEtMTEtMTggMTQ6NTk6MzkuMTcyMTc3 MDAwIC0wODAwCkBAIC0xNTEsOCArMTUxLDEwIEBACiAgICAgICAgIC8vIGZvciB0aGlzLCB0aG91 Z2gsIGFzIHRoaXMgd2lsbCBhbHJlYWR5IGJlIHJlcG9ydGVkIGFzIHJlc291cmNlIGxvYWRpbmcg ZmFpbHVyZS4KICAgICAgICAgLy8gQWxzbywgaWYgYSBVUkwgbGlrZSBodHRwOi8vbG9jYWxob3N0 L3dpa2kvbG9hZC5waHA/ZGVidWc9dHJ1ZSZsYW5nPWVuIHByb2R1Y2VzIHRleHQvY3NzIGFuZCBn ZXRzIHJlbG9hZGVkLAogICAgICAgICAvLyBpdCBpcyAzMDQgTm90IE1vZGlmaWVkIGFuZCBpdHMg Z3Vlc3NlZCBtaW1lLXR5cGUgaXMgdGV4dC9waHAsIHdoaWNoIGlzIHdyb25nLgotICAgICAgICAv LyBEb24ndCBjaGVjayBmb3IgbWltZS10eXBlcyBpbiAzMDQtcmVzb3VyY2VzLgotICAgICAgICBp ZiAocmVzb3VyY2UuaGFzRXJyb3JTdGF0dXNDb2RlKCkgfHwgcmVzb3VyY2Uuc3RhdHVzQ29kZSA9 PT0gMzA0KQorICAgICAgICAvLyBEb24ndCBjaGVjayBmb3IgbWltZS10eXBlcyBpbiAzMDQgYW5k IDIwNCByZXNvdXJjZXMuCisgICAgICAgIGlmIChyZXNvdXJjZS5oYXNFcnJvclN0YXR1c0NvZGUo KQorICAgICAgICAgICAgfHwgcmVzb3VyY2Uuc3RhdHVzQ29kZSA9PT0gMzA0CisgICAgICAgICAg ICB8fCByZXNvdXJjZS5zdGF0dXNDb2RlID09PSAyMDQpCiAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKIAogICAgICAgICBpZiAodHlwZW9mIHJlc291cmNlLnR5cGUgPT09ICJ1bmRlZmluZWQiCg== 118632 2011-12-09 14:06:15 -0800 2011-12-09 14:07:07 -0800 Updated patch, hopefully conforms to submission guidelines. 204.patch text/plain 2216 rodarmor SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjQ3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDExLTEyLTA5ICBDYXNleSBS b2Rhcm1vciAgPHJvZGFybW9yQGdvb2dsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgY2hlY2sgbWlt ZSB0eXBlIGZvciBjb25zaXN0ZW5jeSB3aXRoIHJlcXVlc3QgZm9yIHJlc3BvbnNlcyB3aXRoIGEK KyAgICAgICAgMjA0IHN0YXR1cyBjb2RlIHNpbmNlIDIwNHMgY29udGFpbiBubyBtZXNzYWdlIGJv ZHkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiBFeGlzdGluZyB0ZXN0cyBkb24ndCBzZWVtIHRvIHRlc3QgdGhpcyBzb3J0IG9m IHRoaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuX21p bWVUeXBlSXNDb25zaXN0ZW50V2l0aFR5cGUpOgorCiAyMDExLTEyLTA5ICBUb255IENoYW5nICA8 dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEw MjQxNi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01h bmFnZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrTWFuYWdlci5qcwkocmV2aXNpb24gMTAyNDcxKQorKysgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwkod29ya2luZyBjb3B5KQpAQCAt MTQ3LDEzICsxNDcsMTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlw ZQogCiAgICAgX21pbWVUeXBlSXNDb25zaXN0ZW50V2l0aFR5cGU6IGZ1bmN0aW9uKHJlc291cmNl KQogICAgIHsKLSAgICAgICAgLy8gSWYgc3RhdHVzIGlzIGFuIGVycm9yLCBjb250ZW50IGlzIGxp a2VseSB0byBiZSBvZiBhbiBpbmNvbnNpc3RlbnQgdHlwZSwKLSAgICAgICAgLy8gYXMgaXQncyBn b2luZyB0byBiZSBhbiBlcnJvciBtZXNzYWdlLiBXZSBkbyBub3Qgd2FudCB0byBlbWl0IGEgd2Fy bmluZwotICAgICAgICAvLyBmb3IgdGhpcywgdGhvdWdoLCBhcyB0aGlzIHdpbGwgYWxyZWFkeSBi ZSByZXBvcnRlZCBhcyByZXNvdXJjZSBsb2FkaW5nIGZhaWx1cmUuCi0gICAgICAgIC8vIEFsc28s IGlmIGEgVVJMIGxpa2UgaHR0cDovL2xvY2FsaG9zdC93aWtpL2xvYWQucGhwP2RlYnVnPXRydWUm bGFuZz1lbiBwcm9kdWNlcyB0ZXh0L2NzcyBhbmQgZ2V0cyByZWxvYWRlZCwKLSAgICAgICAgLy8g aXQgaXMgMzA0IE5vdCBNb2RpZmllZCBhbmQgaXRzIGd1ZXNzZWQgbWltZS10eXBlIGlzIHRleHQv cGhwLCB3aGljaCBpcyB3cm9uZy4KLSAgICAgICAgLy8gRG9uJ3QgY2hlY2sgZm9yIG1pbWUtdHlw ZXMgaW4gMzA0LXJlc291cmNlcy4KLSAgICAgICAgaWYgKHJlc291cmNlLmhhc0Vycm9yU3RhdHVz Q29kZSgpIHx8IHJlc291cmNlLnN0YXR1c0NvZGUgPT09IDMwNCkKKyAgICAgICAgLy8gSWYgc3Rh dHVzIGlzIGFuIGVycm9yLCBkb24ndCBlbWl0IGEgd2FybmluZyBzaW5jZSBpdCB3aWxsIGFscmVh ZHkgYmUgcmVwb3J0ZWQKKyAgICAgICAgLy8gYXMgYSByZXNvdXJjZSBsb2FkaW5nIGZhaWx1cmUu CisgICAgICAgIC8vIEFsc28sIDIwNCBhbmQgMzA0IHJlc3BvbnNlcyBuZXZlciBjb250YWluIG1l c3NhZ2UgYm9kaWVzLCBzbyBtaW1lIHR5cGUgY2hlY2tpbmcKKyAgICAgICAgLy8gZG9lc24ndCBt YWtlIHNlbnNlLgorICAgICAgICBpZiAocmVzb3VyY2UuaGFzRXJyb3JTdGF0dXNDb2RlKCkKKyAg ICAgICAgICAgIHx8IHJlc291cmNlLnN0YXR1c0NvZGUgPT09IDIwNAorICAgICAgICAgICAgfHwg cmVzb3VyY2Uuc3RhdHVzQ29kZSA9PT0gMzA0KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAK ICAgICAgICAgaWYgKHR5cGVvZiByZXNvdXJjZS50eXBlID09PSAidW5kZWZpbmVkIgo= 118633 2011-12-09 14:07:07 -0800 2011-12-09 14:15:25 -0800 Updated patch, hopefully conforms to submission guidelines. 204.patch text/plain 2216 rodarmor SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjQ3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDExLTEyLTA5ICBDYXNleSBS b2Rhcm1vciAgPHJvZGFybW9yQGdvb2dsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgY2hlY2sgbWlt ZSB0eXBlIGZvciBjb25zaXN0ZW5jeSB3aXRoIHJlcXVlc3QgZm9yIHJlc3BvbnNlcyB3aXRoIGEK KyAgICAgICAgMjA0IHN0YXR1cyBjb2RlIHNpbmNlIDIwNHMgY29udGFpbiBubyBtZXNzYWdlIGJv ZHkuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgTm8g bmV3IHRlc3RzLiBFeGlzdGluZyB0ZXN0cyBkb24ndCBzZWVtIHRvIHRlc3QgdGhpcyBzb3J0IG9m IHRoaW5nLgorCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuX21p bWVUeXBlSXNDb25zaXN0ZW50V2l0aFR5cGUpOgorCiAyMDExLTEyLTA5ICBUb255IENoYW5nICA8 dG9ueUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQgcjEw MjQxNi4KSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01h bmFnZXIuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9OZXR3b3JrTWFuYWdlci5qcwkocmV2aXNpb24gMTAyNDcxKQorKysgU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwkod29ya2luZyBjb3B5KQpAQCAt MTQ3LDEzICsxNDcsMTMgQEAgV2ViSW5zcGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlw ZQogCiAgICAgX21pbWVUeXBlSXNDb25zaXN0ZW50V2l0aFR5cGU6IGZ1bmN0aW9uKHJlc291cmNl KQogICAgIHsKLSAgICAgICAgLy8gSWYgc3RhdHVzIGlzIGFuIGVycm9yLCBjb250ZW50IGlzIGxp a2VseSB0byBiZSBvZiBhbiBpbmNvbnNpc3RlbnQgdHlwZSwKLSAgICAgICAgLy8gYXMgaXQncyBn b2luZyB0byBiZSBhbiBlcnJvciBtZXNzYWdlLiBXZSBkbyBub3Qgd2FudCB0byBlbWl0IGEgd2Fy bmluZwotICAgICAgICAvLyBmb3IgdGhpcywgdGhvdWdoLCBhcyB0aGlzIHdpbGwgYWxyZWFkeSBi ZSByZXBvcnRlZCBhcyByZXNvdXJjZSBsb2FkaW5nIGZhaWx1cmUuCi0gICAgICAgIC8vIEFsc28s IGlmIGEgVVJMIGxpa2UgaHR0cDovL2xvY2FsaG9zdC93aWtpL2xvYWQucGhwP2RlYnVnPXRydWUm bGFuZz1lbiBwcm9kdWNlcyB0ZXh0L2NzcyBhbmQgZ2V0cyByZWxvYWRlZCwKLSAgICAgICAgLy8g aXQgaXMgMzA0IE5vdCBNb2RpZmllZCBhbmQgaXRzIGd1ZXNzZWQgbWltZS10eXBlIGlzIHRleHQv cGhwLCB3aGljaCBpcyB3cm9uZy4KLSAgICAgICAgLy8gRG9uJ3QgY2hlY2sgZm9yIG1pbWUtdHlw ZXMgaW4gMzA0LXJlc291cmNlcy4KLSAgICAgICAgaWYgKHJlc291cmNlLmhhc0Vycm9yU3RhdHVz Q29kZSgpIHx8IHJlc291cmNlLnN0YXR1c0NvZGUgPT09IDMwNCkKKyAgICAgICAgLy8gSWYgc3Rh dHVzIGlzIGFuIGVycm9yLCBkb24ndCBlbWl0IGEgd2FybmluZyBzaW5jZSBpdCB3aWxsIGFscmVh ZHkgYmUgcmVwb3J0ZWQKKyAgICAgICAgLy8gYXMgYSByZXNvdXJjZSBsb2FkaW5nIGZhaWx1cmUu CisgICAgICAgIC8vIEFsc28sIDIwNCBhbmQgMzA0IHJlc3BvbnNlcyBuZXZlciBjb250YWluIG1l c3NhZ2UgYm9kaWVzLCBzbyBtaW1lIHR5cGUgY2hlY2tpbmcKKyAgICAgICAgLy8gZG9lc24ndCBt YWtlIHNlbnNlLgorICAgICAgICBpZiAocmVzb3VyY2UuaGFzRXJyb3JTdGF0dXNDb2RlKCkKKyAg ICAgICAgICAgIHx8IHJlc291cmNlLnN0YXR1c0NvZGUgPT09IDIwNAorICAgICAgICAgICAgfHwg cmVzb3VyY2Uuc3RhdHVzQ29kZSA9PT0gMzA0KQogICAgICAgICAgICAgcmV0dXJuIHRydWU7CiAK ICAgICAgICAgaWYgKHR5cGVvZiByZXNvdXJjZS50eXBlID09PSAidW5kZWZpbmVkIgo= 118637 2011-12-09 14:15:25 -0800 2011-12-14 09:45:27 -0800 ChangeLog now contains bug number. 204.patch2 text/plain 2271 rodarmor SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEwMjQ3MikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE2IEBACisyMDExLTEyLTA5ICBDYXNleSBS b2Rhcm1vciAgPHJvZGFybW9yQGdvb2dsZS5jb20+CisKKyAgICAgICAgRG9uJ3QgY2hlY2sgbWlt ZSB0eXBlIGZvciBjb25zaXN0ZW5jeSB3aXRoIHJlcXVlc3QgZm9yIHJlc3BvbnNlcyB3aXRoIGEK KyAgICAgICAgMjA0IHN0YXR1cyBjb2RlIHNpbmNlIDIwNHMgY29udGFpbiBubyBtZXNzYWdlIGJv ZHkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTk3 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIG5l dyB0ZXN0cy4gRXhpc3RpbmcgdGVzdHMgZG9uJ3Qgc2VlbSB0byB0ZXN0IHRoaXMgc29ydCBvZiB0 aGluZy4KKworICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya0Rpc3BhdGNoZXIucHJvdG90eXBlLl9taW1l VHlwZUlzQ29uc2lzdGVudFdpdGhUeXBlKToKKwogMjAxMS0xMi0wOSAgVG9ueSBDaGFuZyAgPHRv bnlAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHIxMDI0 MTYuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5h Z2VyLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQv TmV0d29ya01hbmFnZXIuanMJKHJldmlzaW9uIDEwMjQ3MSkKKysrIFNvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMJKHdvcmtpbmcgY29weSkKQEAgLTE0 NywxMyArMTQ3LDEzIEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUK IAogICAgIF9taW1lVHlwZUlzQ29uc2lzdGVudFdpdGhUeXBlOiBmdW5jdGlvbihyZXNvdXJjZSkK ICAgICB7Ci0gICAgICAgIC8vIElmIHN0YXR1cyBpcyBhbiBlcnJvciwgY29udGVudCBpcyBsaWtl bHkgdG8gYmUgb2YgYW4gaW5jb25zaXN0ZW50IHR5cGUsCi0gICAgICAgIC8vIGFzIGl0J3MgZ29p bmcgdG8gYmUgYW4gZXJyb3IgbWVzc2FnZS4gV2UgZG8gbm90IHdhbnQgdG8gZW1pdCBhIHdhcm5p bmcKLSAgICAgICAgLy8gZm9yIHRoaXMsIHRob3VnaCwgYXMgdGhpcyB3aWxsIGFscmVhZHkgYmUg cmVwb3J0ZWQgYXMgcmVzb3VyY2UgbG9hZGluZyBmYWlsdXJlLgotICAgICAgICAvLyBBbHNvLCBp ZiBhIFVSTCBsaWtlIGh0dHA6Ly9sb2NhbGhvc3Qvd2lraS9sb2FkLnBocD9kZWJ1Zz10cnVlJmxh bmc9ZW4gcHJvZHVjZXMgdGV4dC9jc3MgYW5kIGdldHMgcmVsb2FkZWQsCi0gICAgICAgIC8vIGl0 IGlzIDMwNCBOb3QgTW9kaWZpZWQgYW5kIGl0cyBndWVzc2VkIG1pbWUtdHlwZSBpcyB0ZXh0L3Bo cCwgd2hpY2ggaXMgd3JvbmcuCi0gICAgICAgIC8vIERvbid0IGNoZWNrIGZvciBtaW1lLXR5cGVz IGluIDMwNC1yZXNvdXJjZXMuCi0gICAgICAgIGlmIChyZXNvdXJjZS5oYXNFcnJvclN0YXR1c0Nv ZGUoKSB8fCByZXNvdXJjZS5zdGF0dXNDb2RlID09PSAzMDQpCisgICAgICAgIC8vIElmIHN0YXR1 cyBpcyBhbiBlcnJvciwgZG9uJ3QgZW1pdCBhIHdhcm5pbmcgc2luY2UgaXQgd2lsbCBhbHJlYWR5 IGJlIHJlcG9ydGVkCisgICAgICAgIC8vIGFzIGEgcmVzb3VyY2UgbG9hZGluZyBmYWlsdXJlLgor ICAgICAgICAvLyBBbHNvLCAyMDQgYW5kIDMwNCByZXNwb25zZXMgbmV2ZXIgY29udGFpbiBtZXNz YWdlIGJvZGllcywgc28gbWltZSB0eXBlIGNoZWNraW5nCisgICAgICAgIC8vIGRvZXNuJ3QgbWFr ZSBzZW5zZS4KKyAgICAgICAgaWYgKHJlc291cmNlLmhhc0Vycm9yU3RhdHVzQ29kZSgpCisgICAg ICAgICAgICB8fCByZXNvdXJjZS5zdGF0dXNDb2RlID09PSAyMDQKKyAgICAgICAgICAgIHx8IHJl c291cmNlLnN0YXR1c0NvZGUgPT09IDMwNCkKICAgICAgICAgICAgIHJldHVybiB0cnVlOwogCiAg ICAgICAgIGlmICh0eXBlb2YgcmVzb3VyY2UudHlwZSA9PT0gInVuZGVmaW5lZCIK 119235 2011-12-14 09:45:42 -0800 2011-12-14 11:47:58 -0800 Patch bug-69972-20111214214540.patch text/plain 6584 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyNzYzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVjNTEyNTZiYjI2Yjll ZDY0YmY5MWQwYzZjMDRiMmYxMzI3NzUyOC4uMWI1Mjk5ODc2OGI4MDM0MzhjZmFhMDZmYmFhMWMw ODdjYThmMDJkZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDExLTEyLTE0ICBWc2V2 b2xvZCBWbGFzb3YgIDx2c2V2aWtAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFNwdXJpb3VzIHdh cm5pbmdzIHdoZW4gcmVjZWl2aW5nIEhUVFAgcmVzcG9uc2UgY29kZSAyMDQKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY5OTcyCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGVzdDogaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9zY3JpcHQtYXMtdGV4dC1sb2FkaW5nLmh0bWwKKworICAgICAgICAqIGlu c3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanM6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZS5fZm9ybWF0TWVzc2FnZSk6CisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qczoKKyAgICAgICAgKFdlYklu c3BlY3Rvci5OZXR3b3JrRGlzcGF0Y2hlci5wcm90b3R5cGUuX3VwZGF0ZVJlc291cmNlV2l0aFJl c3BvbnNlKToKKwogMjAxMS0xMi0xMyAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBUcmVlT3V0bGluZSdzIGlzIGJyb2tlbiB3 aGVuIGxpIGVsZW1lbnRzIGhhdmUgcGFkZGluZy1sZWZ0IGRpZmZlcmVudCBmcm9tIDE0cHguCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNz YWdlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db25zb2xlTWVzc2Fn ZS5qcwppbmRleCBhYjg3MjdiYzZiMDgzYTQ5ODhlZGVjOTlkODhhMWFlNmFlNDJmYTVjLi5hMWJl MjhiZjY5NmRkOWJmYzFjNzc3YmVjMjY0YzM1M2EzNGY4OGVkIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL0NvbnNvbGVNZXNzYWdlLmpzCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvQ29uc29sZU1lc3NhZ2UuanMKQEAgLTEzOSw3 ICsxMzksNyBAQCBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2VJbXBsLnByb3RvdHlwZSA9IHsK IAogICAgICAgICB0aGlzLl9mb3JtYXR0ZWRNZXNzYWdlLmFwcGVuZENoaWxkKG1lc3NhZ2VUZXh0 KTsKIAotICAgICAgICB2YXIgZHVtcFN0YWNrVHJhY2UgPSAhIXRoaXMuX3N0YWNrVHJhY2UgJiYg KHRoaXMuc291cmNlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJj ZS5OZXR3b3JrIHx8IHRoaXMubGV2ZWwgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5N ZXNzYWdlTGV2ZWwuRXJyb3IgfHwgdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1l c3NhZ2UuTWVzc2FnZVR5cGUuVHJhY2UpOworICAgICAgICB2YXIgZHVtcFN0YWNrVHJhY2UgPSAh IXRoaXMuX3N0YWNrVHJhY2UgJiYgdGhpcy5fc3RhY2tUcmFjZS5sZW5ndGggJiYgKHRoaXMuc291 cmNlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVzc2FnZVNvdXJjZS5OZXR3b3Jr IHx8IHRoaXMubGV2ZWwgPT09IFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlTGV2 ZWwuRXJyb3IgfHwgdGhpcy50eXBlID09PSBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2UuTWVz c2FnZVR5cGUuVHJhY2UpOwogICAgICAgICBpZiAoZHVtcFN0YWNrVHJhY2UpIHsKICAgICAgICAg ICAgIHZhciBvbCA9IGRvY3VtZW50LmNyZWF0ZUVsZW1lbnQoIm9sIik7CiAgICAgICAgICAgICBv bC5jbGFzc05hbWUgPSAib3V0bGluZS1kaXNjbG9zdXJlIjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMgYi9Tb3VyY2UvV2Vi Q29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCmluZGV4IGQ2Y2Y3MDZk NWE0YTdlZDUxMjQ1OWQwZTc5OTZlNGQwMmNkNDljZGYuLmVkNzgwMDM4ZjQ5MWQ1NDA3YjkxM2M0 YjJlOGFiOTkyNzg5NWMwNjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9m cm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwpAQCAtMTM3LDExICsxMzcsMTYgQEAgV2ViSW5z cGVjdG9yLk5ldHdvcmtEaXNwYXRjaGVyLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgIHJlc291 cmNlLnRpbWluZyA9IHJlc3BvbnNlLnRpbWluZzsKIAogICAgICAgICBpZiAoIXRoaXMuX21pbWVU eXBlSXNDb25zaXN0ZW50V2l0aFR5cGUocmVzb3VyY2UpKSB7Ci0gICAgICAgICAgICBXZWJJbnNw ZWN0b3IuY29uc29sZS5hZGRNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5jcmVh dGUoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3VyY2UuT3RoZXIsCisgICAg ICAgICAgICBXZWJJbnNwZWN0b3IuY29uc29sZS5hZGRNZXNzYWdlKFdlYkluc3BlY3Rvci5Db25z b2xlTWVzc2FnZS5jcmVhdGUoV2ViSW5zcGVjdG9yLkNvbnNvbGVNZXNzYWdlLk1lc3NhZ2VTb3Vy Y2UuTmV0d29yaywKICAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuQ29uc29sZU1lc3NhZ2Uu TWVzc2FnZUxldmVsLldhcm5pbmcsCi0gICAgICAgICAgICAgICAgV2ViSW5zcGVjdG9yLlVJU3Ry aW5nKCJSZXNvdXJjZSBpbnRlcnByZXRlZCBhcyAlcyBidXQgdHJhbnNmZXJyZWQgd2l0aCBNSU1F IHR5cGUgJXMuIiwgV2ViSW5zcGVjdG9yLlJlc291cmNlLlR5cGUudG9VSVN0cmluZyh0aGlzLnR5 cGUpLCB0aGlzLm1pbWVUeXBlKSwKKyAgICAgICAgICAgICAgICBXZWJJbnNwZWN0b3IuVUlTdHJp bmcoIlJlc291cmNlIGludGVycHJldGVkIGFzICVzIGJ1dCB0cmFuc2ZlcnJlZCB3aXRoIE1JTUUg dHlwZSAlczogXCIlc1wiLiIsIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5UeXBlLnRvVUlTdHJpbmco cmVzb3VyY2UudHlwZSksIHJlc291cmNlLm1pbWVUeXBlLCByZXNvdXJjZS51cmwpLAogICAgICAg ICAgICAgICAgIFdlYkluc3BlY3Rvci5Db25zb2xlTWVzc2FnZS5NZXNzYWdlVHlwZS5Mb2csCi0g ICAgICAgICAgICAgICAgdGhpcy51cmwpKTsKKyAgICAgICAgICAgICAgICAiIiwKKyAgICAgICAg ICAgICAgICAwLAorICAgICAgICAgICAgICAgIDEsCisgICAgICAgICAgICAgICAgW10sCisgICAg ICAgICAgICAgICAgbnVsbCwKKyAgICAgICAgICAgICAgICByZXNvdXJjZSkpOwogICAgICAgICB9 CiAgICAgfSwKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCmluZGV4IDU1N2NlNzFmNjhlM2RmY2MzNzY5YWQyYTFkNDBlOTA0MTU3Zjhm ZDUuLjgwZTYzMzI1N2MzMmI0MWY4NDNhYTUyMjExMzBiMDVlMjVhNDNjY2YgMTAwNjQ0Ci0tLSBh L0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNCBAQAorMjAxMS0xMi0xNCAgVnNldm9sb2QgVmxhc292ICA8dnNldmlrQGNocm9taXVt Lm9yZz4KKworICAgICAgICBTcHVyaW91cyB3YXJuaW5ncyB3aGVuIHJlY2VpdmluZyBIVFRQIHJl c3BvbnNlIGNvZGUgMjA0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD02OTk3MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgICogaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc2NyaXB0LWFz LXRleHQucGhwOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3Jr L3NjcmlwdC1hcy10ZXh0LWxvYWRpbmctZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBo dHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3NjcmlwdC1hcy10ZXh0LWxvYWRpbmcuaHRtbDog QWRkZWQuCisKIDIwMTEtMTItMTQgIFphbiBEb2JlcnNlayAgPHphbmRvYmVyc2VrQGdtYWlsLmNv bT4KIAogICAgICAgICBbR3RrXSByZWJhc2VsaW5lIHRlc3QgcmVzdWx0cyBmb3IgZWRpdGluZy9z ZWxlY3Rpb24vdHJhbnNmb3JtZWQtc2VsZWN0aW9uLXJlY3RzLmh0bWwKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3NjcmlwdC1h cy10ZXh0LnBocCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvcmVz b3VyY2VzL3NjcmlwdC1hcy10ZXh0LnBocApuZXcgZmlsZSBtb2RlIDEwMDc1NQppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yZDMxOGVjYzMxMzU2MTZiMmUw ZjIyYjkyYmY5NWI5Zjc3MjJiYjVlCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9yZXNvdXJjZXMvc2NyaXB0LWFzLXRleHQucGhwCkBA IC0wLDAgKzEsOCBAQAorPD9waHAKKyAgICBoZWFkZXIoIkNvbnRlbnQtVHlwZTogdGV4dC9wbGFp biIpOworPz4KKworZnVuY3Rpb24gZm9vKCkKK3sKKyAgICB2YXIgYmFyID0gNDI7Cit9CmRpZmYg LS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9uZXR3b3JrL3NjcmlwdC1h cy10ZXh0LWxvYWRpbmctZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9zY3JpcHQtYXMtdGV4dC1sb2FkaW5nLWV4cGVjdGVkLnR4dApuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi5jMTE3NjgzMTg1NTA0MjI0MzY4ZmJmZGI0ZGY3MDkzOTExYmFkNTIyCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3IvbmV0d29yay9zY3JpcHQt YXMtdGV4dC1sb2FkaW5nLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKK1Rlc3RzIGNvbnNv bGUgbWVzc2FnZSB3aGVuIHNjcmlwdCBpcyBsb2FkZWQgd2l0aCBpbmNvcnJlY3QgdGV4dC9odG1s IG1pbWUgdHlwZS4KKworQnVnIDY5OTcyCitSZXNvdXJjZSBpbnRlcnByZXRlZCBhcyBTY3JpcHQg YnV0IHRyYW5zZmVycmVkIHdpdGggTUlNRSB0eXBlIHRleHQvcGxhaW46ICJodHRwOi8vMTI3LjAu MC4xOjgwMDAvaW5zcGVjdG9yL25ldHdvcmsvcmVzb3VyY2VzL3NjcmlwdC1hcy10ZXh0LnBocCIu CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsv c2NyaXB0LWFzLXRleHQtbG9hZGluZy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3IvbmV0d29yay9zY3JpcHQtYXMtdGV4dC1sb2FkaW5nLmh0bWwKbmV3IGZpbGUgbW9kZSAx MDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGEw MjFhN2MxMmYwZTAxMmYxYjc1MWQ3NTY4MDhiNGVlYzZlNjI2MAotLS0gL2Rldi9udWxsCisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL25ldHdvcmsvc2NyaXB0LWFzLXRleHQt bG9hZGluZy5odG1sCkBAIC0wLDAgKzEsMzAgQEAKKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNy Yz0iLi4vaW5zcGVjdG9yLXRlc3QuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uL2NvbnNv bGUtdGVzdC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gbG9hZFNjcmlwdCgpCit7 CisgICAgdmFyIHMgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJzY3JpcHQiKTsKKyAgICBzLnNy YyA9ICJyZXNvdXJjZXMvc2NyaXB0LWFzLXRleHQucGhwIjsKKyAgICBkb2N1bWVudC5ib2R5LmFw cGVuZENoaWxkKHMpOworfQorCitmdW5jdGlvbiB0ZXN0KCkKK3sKKyAgICBJbnNwZWN0b3JUZXN0 LmFkZENvbnNvbGVTbmlmZmVyKHN0ZXAxKTsKKyAgICBJbnNwZWN0b3JUZXN0LmV2YWx1YXRlSW5Q YWdlKCJsb2FkU2NyaXB0KCkiKTsKKworICAgIGZ1bmN0aW9uIHN0ZXAxKCkKKyAgICB7CisgICAg ICAgIEluc3BlY3RvclRlc3QuZHVtcENvbnNvbGVNZXNzYWdlcygpOworICAgICAgICBJbnNwZWN0 b3JUZXN0LmNvbXBsZXRlVGVzdCgpOworICAgIH0KK30KKzwvc2NyaXB0PgorPC9oZWFkPgorPGJv ZHkgb25sb2FkPSJydW5UZXN0KCkiPgorPHA+VGVzdHMgY29uc29sZSBtZXNzYWdlIHdoZW4gc2Ny aXB0IGlzIGxvYWRlZCB3aXRoIGluY29ycmVjdCB0ZXh0L2h0bWwgbWltZSB0eXBlLjwvcD4KKzxh IGhyZWY9Imh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD02OTk3MiI+QnVn IDY5OTcyPC9hPgorPC9ib2R5PgorPC9odG1sPgo=