54085 2011-02-09 02:58:44 -0800 Web Inspector: Network & Resource panels make multiple requests for images with co content 2011-02-10 05:00:07 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 caseq caseq apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 348113 0 caseq 2011-02-09 02:58:44 -0800 Run following snippet with DevTools opened. <script> function doStuff() { var r = Math.floor(Math.random()*100000); var i = new Image(); i.src = 'http://www.facebook.com/ajax/hovercard/shown.php?'+r; } </script> <button onclick="doStuff()">do stuff</button> Observe preview image source in the Network/Resources panels. Expected: data URL, no network requests Actual: original URL, additional network request is being made Original bug report: http://code.google.com/p/chromium/issues/detail?id=72402 348205 1 81806 caseq 2011-02-09 07:06:30 -0800 Created attachment 81806 patch 348212 2 81806 pfeldman 2011-02-09 07:17:28 -0800 Comment on attachment 81806 patch I don't think this is a reliable solution. We might be not accurate wrt resource size, why should we make content request depend on potential resource size inconsistencies. 348275 3 81818 caseq 2011-02-09 09:05:42 -0800 Created attachment 81818 patch - check resource size on back-end, return "" for 0-sized resources, NULL for errors 348281 4 webkit.review.bot 2011-02-09 09:08:52 -0800 Attachment 81818 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/inspector/InspectorResourceAgent.cpp:127: Use 0 instead of NULL. [readability/null] [4] Total errors found: 1 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 348315 5 81818 pfeldman 2011-02-09 09:37:48 -0800 Comment on attachment 81818 patch View in context: https://bugs.webkit.org/attachment.cgi?id=81818&action=review > Source/WebCore/inspector/Inspector.idl:103 > + [domain=Network] void resourceContent(in unsigned long frameId, in String url, in boolean base64Encode, out boolean foundResource, out String content); foundResource -> success > Source/WebCore/inspector/InspectorResourceAgent.cpp:506 > +void InspectorResourceAgent::resourceContent(unsigned long id, const String& url, bool base64Encode, bool* resourceFound, String* content) frameId? 348964 6 caseq 2011-02-10 05:00:07 -0800 Manually committed r78196: http://trac.webkit.org/changeset/78196 81806 2011-02-09 07:06:30 -0800 2011-02-09 09:05:42 -0800 patch resource-content-fix text/plain 2438 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YWE1MzVlLi5iMTg1NjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDItMDkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBOZXR3b3JrICYgUmVzb3VyY2UgcGFuZWxzIG1ha2UgbXVsdGlwbGUgcmVxdWVzdHMgZm9y IGltYWdlcyB3aXRoIGNvIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU0MDg1CisKKyAgICAgICAgLSBkbyBub3QgcmVxdWVzdCByZXNvdXJj ZSBjb250ZW50IGZvciByZXNvdXJjZXMgd2l0aCB6ZXJvIGxlbmd0aAorICAgICAgICAtIGRvIG5v dCB1c2UgcmVhbCBVUkxzIGZvciByZXNvdXJjZXMgd2l0aCB6ZXJvIGxlbmd0aAorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IGNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2UucHJvdG90eXBlLl9jb250ZW50VVJMKToKKwogMjAxMS0wMi0wOSAgTHVjYXMg RGUgTWFyY2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVu ZC9SZXNvdXJjZS5qcwppbmRleCA5MTA4ZDJkLi4yNWVlOGIxIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKQEAgLTYxNiw3ICs2MTYsNyBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgZ2V0IGNvbnRlbnQoKQog ICAgIHsKLSAgICAgICAgcmV0dXJuIHRoaXMuX2NvbnRlbnQ7CisgICAgICAgIHJldHVybiB0aGlz LnJlc291cmNlU2l6ZSA/IHRoaXMuX2NvbnRlbnQgOiAiIjsKICAgICB9LAogCiAgICAgZ2V0IGNv bnRlbnRUaW1lc3RhbXAoKQpAQCAtNjkzLDggKzY5Myw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJj ZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBjYWxsYmFjayhudWxsLCBudWxsKTsKICAgICAg ICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAgICAgICBpZiAodGhpcy5fY29udGVudCkgewot ICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fY29udGVudCwgdGhpcy5fY29udGVudEVuY29kZWQp OworICAgICAgICBpZiAodGhpcy5fY29udGVudCB8fCB0aGlzLnJlc291cmNlU2l6ZSA9PT0gMCkg eworICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5jb250ZW50LCB0aGlzLl9jb250ZW50RW5jb2Rl ZCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KICAgICAgICAgdGhpcy5fcGVuZGlu Z0NvbnRlbnRDYWxsYmFja3MucHVzaChjYWxsYmFjayk7CkBAIC03MTgsMTEgKzcxOCwxMiBAQCBX ZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogICAgIF9jb250ZW50VVJMOiBmdW5j dGlvbigpCiAgICAgewogICAgICAgICBjb25zdCBtYXhEYXRhVXJsU2l6ZSA9IDEwMjQgKiAxMDI0 OworICAgICAgICB2YXIgY29udGVudCA9IHRoaXMuY29udGVudDsKICAgICAgICAgLy8gSWYgcmVz b3VyY2UgY29udGVudCBpcyBub3QgYXZhaWxhYmxlIG9yIHdvbid0IGZpdCBhIGRhdGEgVVJMLCBm YWxsIGJhY2sgdG8gdXNpbmcgb3JpZ2luYWwgVVJMLgotICAgICAgICBpZiAoIXRoaXMuX2NvbnRl bnQgfHwgdGhpcy5fY29udGVudC5sZW5ndGggPiBtYXhEYXRhVXJsU2l6ZSkKKyAgICAgICAgaWYg KGNvbnRlbnQgPT0gbnVsbCB8fCBjb250ZW50Lmxlbmd0aCA+IG1heERhdGFVcmxTaXplKQogICAg ICAgICAgICAgcmV0dXJuIHRoaXMudXJsOwogCi0gICAgICAgIHJldHVybiAiZGF0YToiICsgdGhp cy5taW1lVHlwZSArICh0aGlzLl9jb250ZW50RW5jb2RlZCA/ICI7YmFzZTY0LCIgOiAiLCIpICsg dGhpcy5fY29udGVudDsKKyAgICAgICAgcmV0dXJuICJkYXRhOiIgKyB0aGlzLm1pbWVUeXBlICsg KHRoaXMuX2NvbnRlbnRFbmNvZGVkID8gIjtiYXNlNjQsIiA6ICIsIikgKyBjb250ZW50OwogICAg IH0sCiAKICAgICBfaW5uZXJSZXF1ZXN0Q29udGVudDogZnVuY3Rpb24oKQo= 81818 2011-02-09 09:05:42 -0800 2011-02-09 09:37:48 -0800 patch resource-content-fix text/plain 6537 caseq ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA3YWE1MzVlLi5iMTg1NjM1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTgg QEAKKzIwMTEtMDItMDkgIEFuZHJleSBLb3N5YWtvdiAgPGNhc2VxQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWIgSW5zcGVj dG9yOiBOZXR3b3JrICYgUmVzb3VyY2UgcGFuZWxzIG1ha2UgbXVsdGlwbGUgcmVxdWVzdHMgZm9y IGltYWdlcyB3aXRoIGNvIGNvbnRlbnQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTU0MDg1CisKKyAgICAgICAgLSBkbyBub3QgcmVxdWVzdCByZXNvdXJj ZSBjb250ZW50IGZvciByZXNvdXJjZXMgd2l0aCB6ZXJvIGxlbmd0aAorICAgICAgICAtIGRvIG5v dCB1c2UgcmVhbCBVUkxzIGZvciByZXNvdXJjZXMgd2l0aCB6ZXJvIGxlbmd0aAorCisgICAgICAg ICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rv ci5SZXNvdXJjZS5wcm90b3R5cGUuZ2V0IGNvbnRlbnQpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlJlc291cmNlLnByb3RvdHlwZS5yZXF1ZXN0Q29udGVudCk6CisgICAgICAgIChXZWJJbnNwZWN0 b3IuUmVzb3VyY2UucHJvdG90eXBlLl9jb250ZW50VVJMKToKKwogMjAxMS0wMi0wOSAgTHVjYXMg RGUgTWFyY2hpICA8bHVjYXMuZGVtYXJjaGlAcHJvZnVzaW9uLm1vYmk+CiAKICAgICAgICAgVW5y ZXZpZXdlZCBidWlsZCBmaXguCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yLmlkbCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3IuaWRsCmlu ZGV4IGVhMGY0ODAuLjRjNmFjZWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rv ci9JbnNwZWN0b3IuaWRsCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3Iu aWRsCkBAIC0xMDAsNyArMTAwLDcgQEAgbW9kdWxlIGNvcmUgewogICAgICAgICAvLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLwogCiAgICAgICAgIFtkb21haW49TmV0d29ya10gdm9pZCBjYWNoZWRSZXNvdXJjZXMob3V0 IE9iamVjdCByZXNvdXJjZXMpOwotICAgICAgICBbZG9tYWluPU5ldHdvcmtdIHZvaWQgcmVzb3Vy Y2VDb250ZW50KGluIHVuc2lnbmVkIGxvbmcgZnJhbWVJZCwgaW4gU3RyaW5nIHVybCwgaW4gYm9v bGVhbiBiYXNlNjRFbmNvZGUsIG91dCBTdHJpbmcgY29udGVudCk7CisgICAgICAgIFtkb21haW49 TmV0d29ya10gdm9pZCByZXNvdXJjZUNvbnRlbnQoaW4gdW5zaWduZWQgbG9uZyBmcmFtZUlkLCBp biBTdHJpbmcgdXJsLCBpbiBib29sZWFuIGJhc2U2NEVuY29kZSwgb3V0IGJvb2xlYW4gZm91bmRS ZXNvdXJjZSwgb3V0IFN0cmluZyBjb250ZW50KTsKICAgICAgICAgW2RvbWFpbj1OZXR3b3JrXSB2 b2lkIHNldEV4dHJhSGVhZGVycyhpbiBPYmplY3QgaGVhZGVycyk7CiAKICAgICAgICAgW25vdGlm eSwgZG9tYWluPU5ldHdvcmtdIHZvaWQgZnJhbWVEZXRhY2hlZEZyb21QYXJlbnQob3V0IHVuc2ln bmVkIGxvbmcgZnJhbWVJZCk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv SW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5jcHAKaW5kZXggM2E2OWVlZi4uZDIwOTMxZiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclJlc291cmNlQWdlbnQuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmNwcApA QCAtMTI0LDYgKzEyNCwxMCBAQCBQYXNzUmVmUHRyPFNoYXJlZEJ1ZmZlcj4gSW5zcGVjdG9yUmVz b3VyY2VBZ2VudDo6cmVzb3VyY2VEYXRhKEZyYW1lKiBmcmFtZSwgY29ucwogICAgIGlmICghY2Fj aGVkUmVzb3VyY2UpCiAgICAgICAgIHJldHVybiAwOwogCisgICAgLy8gWmVyby1zaXplZCByZXNv dXJjZXMgZG9uJ3QgaGF2ZSBkYXRhIGF0IGFsbCAtLSBzbyBmYWtlIHRoZSBlbXB0eSBidWZmZXIs IGluc3RlZCBvZiBpbmRpY2F0aW5nIGVycm9yIGJ5IHJldHVucmluZyBOVUxMLgorICAgIGlmICgh Y2FjaGVkUmVzb3VyY2UtPmVuY29kZWRTaXplKCkpCisgICAgICAgIHJldHVybiBTaGFyZWRCdWZm ZXI6OmNyZWF0ZSgpOworCiAgICAgaWYgKGNhY2hlZFJlc291cmNlLT5pc1B1cmdlYWJsZSgpKSB7 CiAgICAgICAgIC8vIElmIHRoZSByZXNvdXJjZSBpcyBwdXJnZWFibGUgdGhlbiBtYWtlIGl0IHVu cHVyZ2VhYmxlIHRvIGdldAogICAgICAgICAvLyBnZXQgaXRzIGRhdGEuIFRoaXMgbWlnaHQgZmFp bCwgaW4gd2hpY2ggY2FzZSB3ZSByZXR1cm4gYW4KQEAgLTQ5OSwxNyArNTAzLDE3IEBAIHZvaWQg SW5zcGVjdG9yUmVzb3VyY2VBZ2VudDo6Y2FjaGVkUmVzb3VyY2VzKFJlZlB0cjxJbnNwZWN0b3JP YmplY3Q+KiBvYmplY3QpCiAgICAgKm9iamVjdCA9IGJ1aWxkT2JqZWN0Rm9yRnJhbWVUcmVlKG1f cGFnZS0+bWFpbkZyYW1lKCksIHRydWUpOwogfQogCi12b2lkIEluc3BlY3RvclJlc291cmNlQWdl bnQ6OnJlc291cmNlQ29udGVudCh1bnNpZ25lZCBsb25nIGlkLCBjb25zdCBTdHJpbmcmIHVybCwg Ym9vbCBiYXNlNjRFbmNvZGUsIFN0cmluZyogY29udGVudCkKK3ZvaWQgSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgaWQsIGNvbnN0IFN0cmluZyYg dXJsLCBib29sIGJhc2U2NEVuY29kZSwgYm9vbCogcmVzb3VyY2VGb3VuZCwgU3RyaW5nKiBjb250 ZW50KQogewotICAgIGZvciAoRnJhbWUqIGZyYW1lID0gbV9wYWdlLT5tYWluRnJhbWUoKTsgZnJh bWU7IGZyYW1lID0gZnJhbWUtPnRyZWUoKS0+dHJhdmVyc2VOZXh0KG1fcGFnZS0+bWFpbkZyYW1l KCkpKSB7Ci0gICAgICAgIGlmIChmcmFtZUlkKGZyYW1lKSAhPSBpZCkKLSAgICAgICAgICAgIGNv bnRpbnVlOwotICAgICAgICBpZiAoYmFzZTY0RW5jb2RlKQotICAgICAgICAgICAgSW5zcGVjdG9y UmVzb3VyY2VBZ2VudDo6cmVzb3VyY2VDb250ZW50QmFzZTY0KGZyYW1lLCBLVVJMKFBhcnNlZFVS TFN0cmluZywgdXJsKSwgY29udGVudCk7Ci0gICAgICAgIGVsc2UKLSAgICAgICAgICAgIEluc3Bl Y3RvclJlc291cmNlQWdlbnQ6OnJlc291cmNlQ29udGVudChmcmFtZSwgS1VSTChQYXJzZWRVUkxT dHJpbmcsIHVybCksIGNvbnRlbnQpOwotICAgICAgICBicmVhazsKKyAgICBGcmFtZSogZnJhbWUg PSBmcmFtZUZvcklkKGlkKTsKKyAgICBpZiAoIWZyYW1lKSB7CisgICAgICAgICpyZXNvdXJjZUZv dW5kID0gZmFsc2U7CisgICAgICAgIHJldHVybjsKICAgICB9CisgICAgaWYgKGJhc2U2NEVuY29k ZSkKKyAgICAgICAgKnJlc291cmNlRm91bmQgPSBJbnNwZWN0b3JSZXNvdXJjZUFnZW50OjpyZXNv dXJjZUNvbnRlbnRCYXNlNjQoZnJhbWUsIEtVUkwoUGFyc2VkVVJMU3RyaW5nLCB1cmwpLCBjb250 ZW50KTsKKyAgICBlbHNlCisgICAgICAgICpyZXNvdXJjZUZvdW5kID0gSW5zcGVjdG9yUmVzb3Vy Y2VBZ2VudDo6cmVzb3VyY2VDb250ZW50KGZyYW1lLCBLVVJMKFBhcnNlZFVSTFN0cmluZywgdXJs KSwgY29udGVudCk7CiB9CiAKIEluc3BlY3RvclJlc291cmNlQWdlbnQ6Okluc3BlY3RvclJlc291 cmNlQWdlbnQoUGFnZSogcGFnZSwgSW5zcGVjdG9yU3RhdGUqIHN0YXRlLCBJbnNwZWN0b3JGcm9u dGVuZCogZnJvbnRlbmQpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5z cGVjdG9yUmVzb3VyY2VBZ2VudC5oIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rv clJlc291cmNlQWdlbnQuaAppbmRleCAyM2RiZWVlLi5lZDBiMjZiIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9yUmVzb3VyY2VBZ2VudC5oCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JSZXNvdXJjZUFnZW50LmgKQEAgLTEwMyw3ICsx MDMsNyBAQCBwdWJsaWM6CiAKICAgICAvLyBDYWxsZWQgZnJvbSBmcm9udGVuZCAKICAgICB2b2lk IGNhY2hlZFJlc291cmNlcyhSZWZQdHI8SW5zcGVjdG9yT2JqZWN0PiopOwotICAgIHZvaWQgcmVz b3VyY2VDb250ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGJv b2wgYmFzZTY0RW5jb2RlLCBTdHJpbmcqIGNvbnRlbnQpOworICAgIHZvaWQgcmVzb3VyY2VDb250 ZW50KHVuc2lnbmVkIGxvbmcgZnJhbWVJRCwgY29uc3QgU3RyaW5nJiB1cmwsIGJvb2wgYmFzZTY0 RW5jb2RlLCBib29sKiByZXNvdXJjZUZvdW5kLCBTdHJpbmcqIGNvbnRlbnQpOwogICAgIHZvaWQg c2V0RXh0cmFIZWFkZXJzKFBhc3NSZWZQdHI8SW5zcGVjdG9yT2JqZWN0Pik7CiAKIHByaXZhdGU6 CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtN YW5hZ2VyLmpzIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFu YWdlci5qcwppbmRleCBkMjQ1MmRmLi40YjkzZGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJD b3JlL2luc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKQEAgLTUzLDcgKzUzLDEx IEBAIFdlYkluc3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7CiAKICAgICByZXF1 ZXN0Q29udGVudDogZnVuY3Rpb24ocmVzb3VyY2UsIGJhc2U2NEVuY29kZSwgY2FsbGJhY2spCiAg ICAgewotICAgICAgICBJbnNwZWN0b3JCYWNrZW5kLnJlc291cmNlQ29udGVudChyZXNvdXJjZS5s b2FkZXIuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCBiYXNlNjRFbmNvZGUsIGNhbGxiYWNrKTsKKyAg ICAgICAgZnVuY3Rpb24gY2FsbGJhY2tXcmFwcGVyKGZvdW5kUmVzb3VyY2UsIGNvbnRlbnQpCisg ICAgICAgIHsKKyAgICAgICAgICAgIGNhbGxiYWNrKGZvdW5kUmVzb3VyY2UgPyBjb250ZW50IDog bnVsbCk7CisgICAgICAgIH0KKyAgICAgICAgSW5zcGVjdG9yQmFja2VuZC5yZXNvdXJjZUNvbnRl bnQocmVzb3VyY2UubG9hZGVyLmZyYW1lSWQsIHJlc291cmNlLnVybCwgYmFzZTY0RW5jb2RlLCBj YWxsYmFja1dyYXBwZXIpOwogICAgIH0sCiAKICAgICBfcHJvY2Vzc0NhY2hlZFJlc291cmNlczog ZnVuY3Rpb24obWFpbkZyYW1lUGF5bG9hZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3Iv ZnJvbnQtZW5kL1Jlc291cmNlLmpzCmluZGV4IDkxMDhkMmQuLjZjZjViOWMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAtNjkzLDggKzY5 Myw4IEBAIFdlYkluc3BlY3Rvci5SZXNvdXJjZS5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBj YWxsYmFjayhudWxsLCBudWxsKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgfQotICAg ICAgICBpZiAodGhpcy5fY29udGVudCkgewotICAgICAgICAgICAgY2FsbGJhY2sodGhpcy5fY29u dGVudCwgdGhpcy5fY29udGVudEVuY29kZWQpOworICAgICAgICBpZiAodHlwZW9mIHRoaXMuX2Nv bnRlbnQgIT09ICJ1bmRlZmluZWQiKSB7CisgICAgICAgICAgICBjYWxsYmFjayh0aGlzLmNvbnRl bnQsIHRoaXMuX2NvbnRlbnRFbmNvZGVkKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogICAgICAgICB0aGlzLl9wZW5kaW5nQ29udGVudENhbGxiYWNrcy5wdXNoKGNhbGxiYWNrKTsK QEAgLTcxOSw3ICs3MTksNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewog ICAgIHsKICAgICAgICAgY29uc3QgbWF4RGF0YVVybFNpemUgPSAxMDI0ICogMTAyNDsKICAgICAg ICAgLy8gSWYgcmVzb3VyY2UgY29udGVudCBpcyBub3QgYXZhaWxhYmxlIG9yIHdvbid0IGZpdCBh IGRhdGEgVVJMLCBmYWxsIGJhY2sgdG8gdXNpbmcgb3JpZ2luYWwgVVJMLgotICAgICAgICBpZiAo IXRoaXMuX2NvbnRlbnQgfHwgdGhpcy5fY29udGVudC5sZW5ndGggPiBtYXhEYXRhVXJsU2l6ZSkK KyAgICAgICAgaWYgKHRoaXMuX2NvbnRlbnQgPT0gbnVsbCB8fCB0aGlzLl9jb250ZW50Lmxlbmd0 aCA+IG1heERhdGFVcmxTaXplKQogICAgICAgICAgICAgcmV0dXJuIHRoaXMudXJsOwogCiAgICAg ICAgIHJldHVybiAiZGF0YToiICsgdGhpcy5taW1lVHlwZSArICh0aGlzLl9jb250ZW50RW5jb2Rl ZCA/ICI7YmFzZTY0LCIgOiAiLCIpICsgdGhpcy5fY29udGVudDsK