69025 2011-09-28 13:37:14 -0700 Web Inspector: Make search-in-resource test simpler. 2011-09-29 05:58:37 -0700 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 vsevik vsevik apavlov bweinstein joepeck keishi loislo pfeldman pmuellr rik timothy webkit.review.bot yurys oldest_to_newest 474973 0 vsevik 2011-09-28 13:37:14 -0700 Make search-in-resource test simpler. 474986 1 109069 vsevik 2011-09-28 13:52:49 -0700 Created attachment 109069 Patch 475226 2 109069 pfeldman 2011-09-28 22:24:38 -0700 Comment on attachment 109069 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=109069&action=review > LayoutTests/http/tests/inspector/search/search-test.js:41 > + setTimeout(InspectorTest._runAfterResourcesAreCreated.bind(InspectorTest, resourceURLs, callback), 0); setTimeout is a source of flake. You should sniff for calls you expect instead. > Source/WebCore/inspector/InspectorPageAgent.cpp:489 > + *object = InspectorArray::create(); It is not an object. Rename this to "array" or "results"? > Source/WebCore/inspector/front-end/NetworkManager.js:70 > + searchInResource: function(resource, query, callback) This change blurs the distinction between Requests vs Resources. We should not talk to PageAgent from within network manager if at all possible. 475387 3 109155 vsevik 2011-09-29 05:40:23 -0700 Created attachment 109155 Patch 475388 4 webkit.review.bot 2011-09-29 05:43:48 -0700 Attachment 109155 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'LayoutTests/ChangeLog', u'LayoutTests/http..." exit_code: 1 Source/WebCore/inspector/InspectorPageAgent.cpp:487: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Source/WebCore/inspector/InspectorPageAgent.cpp:525: The parameter type should use PassRefPtr instead of RefPtr. [readability/pass_ptr] [5] Total errors found: 2 in 6 files If any of these errors are false positives, please file a bug against check-webkit-style. 475391 5 vsevik 2011-09-29 05:58:37 -0700 Committed r96323: <http://trac.webkit.org/changeset/96323> 109069 2011-09-28 13:52:49 -0700 2011-09-29 05:40:15 -0700 Patch bug-69025-20110929005247.patch text/plain 10395 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTYyMjMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCBlM2RiMTcyM2EzZDBlNjM4ZDMxZGI3 ZTE2YTY5NGViOTFmZjY3OTU4Li5mM2FlOTllN2VmZTQ0YTZlNWNmYzIyMTk3ZjllOTEwNDM3ZGJj ZjUwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDUgKzEsMjAgQEAKIDIwMTEtMDktMjggIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBzZWFy Y2gtaW4tcmVzb3VyY2UgdGVzdCBzaW1wbGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkwMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gt aW4tcmVzb3VyY2UtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9y L3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2UuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL2lu c3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXJlc291cmNlcy5odG1sOgorICAgICAgICAqIGh0dHAv dGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxp emVfU2VhcmNoVGVzdC5JbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUmVzb3VyY2VzQXJlQ3JlYXRlZCk6 CisgICAgICAgIChpbml0aWFsaXplX1NlYXJjaFRlc3QuSW5zcGVjdG9yVGVzdC5fcnVuQWZ0ZXJS ZXNvdXJjZXNBcmVDcmVhdGVkKToKKyAgICAgICAgKGluaXRpYWxpemVfU2VhcmNoVGVzdCk6CisK KzIwMTEtMDktMjggIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKICAg ICAgICAgV2ViIEluc3BlY3RvcjogQWRkIHN1cHBvcnQgZm9yIHNlYXJjaCBpbiBzaW5nbGUgcmVz b3VyY2UgdG8gcGFnZSBhZ2VudC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTY4OTk4CiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv aW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZS1leHBl Y3RlZC50eHQKaW5kZXggODgzMzk4MzQ4MDQxZTVkZjFhNmRmMzU2NzVjZGQxODczN2E0ZDc1ZS4u ODQ4ZjRiNmNlZDIwZDg2NzdkY2ZjOTllZTk3M2RkYWU5OTJlMjJiOCAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZS1l eHBlY3RlZC50eHQKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNo L3NlYXJjaC1pbi1yZXNvdXJjZS1leHBlY3RlZC50eHQKQEAgLTgsMTYgKzgsNCBAQCBsaW5lTnVt YmVyOiAzLCBsaW5lOiAnICAgIC8vIHNlYXJjaFRlc3RVbmlxdWVTdHJpbmcgdHdvIG9jY3VyZW5j ZXMgb24gdGhlIHNhbWUgbAogbGluZU51bWJlcjogOSwgbGluZTogJyAgICBzZWFyY2hUZXN0VW5p cXVlU3RyaW5nKCk7JwogbGluZU51bWJlcjogMTAsIGxpbmU6ICcgICAgLy8gU0VBUkNIVGVzdFVu aXF1ZVN0cmluZygpOycKIAotaHR0cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9zZWFyY2gv cmVzb3VyY2VzL3NlYXJjaC5jc3MKLVNlYXJjaCBtYXRjaGVzOiAKLWxpbmVOdW1iZXI6IDAsIGxp bmU6ICdkaXYuc2VhcmNoVGVzdFVuaXF1ZVN0cmluZyB7JwotbGluZU51bWJlcjogNCwgbGluZTog J2Rpdi5zZWFyY2hUZXN0VW5pcXVlU3RyaW5nOmhvdmVyIHsnCi1saW5lTnVtYmVyOiA1LCBsaW5l OiAnICAgIC8qIGFub3RoZXIgc2VhcmNoVGVzdFVuaXF1ZVN0cmluZyBvY2N1cmVuY2UgKi8nCi0K LWh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivc2VhcmNoL3Jlc291cmNlcy9zZWFyY2gu aHRtbAotU2VhcmNoIG1hdGNoZXM6IAotbGluZU51bWJlcjogNSwgbGluZTogJzxkaXY+c2VhcmNo VGVzdFVuaXF1ZVN0cmluZzwvZGl2PicKLWxpbmVOdW1iZXI6IDcsIGxpbmU6ICc8IS0tIHNlYXJj aFRlc3RVbmlxdWVTdHJpbmcgLS0+JwotbGluZU51bWJlcjogOSwgbGluZTogJzxkaXYgaWQ9InNl YXJjaFRlc3RVbmlxdWVTdHJpbmciPmRpdiB0ZXh0PC9kaXY+JwotCiAKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2Uu aHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4t cmVzb3VyY2UuaHRtbAppbmRleCAwMTdiYTM4M2M5NGNiMzk1ZDY3MjdjNDFjMGJlNjA2ODA3ZTRm NGRjLi4wMzI3NGE2ZDU5ZGNjMTc4Yzg4NGU0NGY2YzVmOWNkY2Y1MjYyNTYyIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXJlc291 cmNlLmh0bWwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3Nl YXJjaC1pbi1yZXNvdXJjZS5odG1sCkBAIC0xLDM5ICsxLDIyIEBACiA8aHRtbD4KIDxoZWFkPgog PHNjcmlwdCBzcmM9Ii4uL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KLTxzY3JpcHQgc3Jj PSIuLi9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUtdGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2Ny aXB0IHNyYz0ic2VhcmNoLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdD4KIGZ1bmN0aW9uIHRl c3QoKQogewogICAgIC8vIFRoaXMgZmlsZSBzaG91bGQgbm90IG1hdGNoIHNlYXJjaCBxdWVyeS4K ICAgICB2YXIgdGV4dCA9ICJzZWFyY2hUZXN0IiArICJVbmlxdWVTdHJpbmciOwotICAgIEluc3Bl Y3RvclRlc3QucnVuQWZ0ZXJSZXNvdXJjZXNBcmVGaW5pc2hlZChbInNlYXJjaC5qcyIsICJzZWFy Y2guY3NzIiwgInNlYXJjaC5odG1sIl0sIHN0ZXAyKTsKKyAgICBJbnNwZWN0b3JUZXN0LnJ1bkFm dGVyUmVzb3VyY2VzQXJlQ3JlYXRlZChbInNlYXJjaC5qcyJdLCBzdGVwMik7CiAKICAgICBmdW5j dGlvbiBzdGVwMigpCiAgICAgewogICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3Iu cmVzb3VyY2VGb3JVUkwoImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivc2VhcmNoL3Jl c291cmNlcy9zZWFyY2guanMiKTsKICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQocmVz b3VyY2UudXJsKTsKLSAgICAgICAgUGFnZUFnZW50LnNlYXJjaEluUmVzb3VyY2UocmVzb3VyY2Uu ZnJhbWVJZCwgcmVzb3VyY2UudXJsLCB0ZXh0LCBzdGVwMyk7CisgICAgICAgIHJlc291cmNlLnNl YXJjaEluQ29udGVudCh0ZXh0LCBzdGVwMyk7CiAgICAgfQogCi0gICAgZnVuY3Rpb24gc3RlcDMo ZXJyb3IsIHNlYXJjaE1hdGNoZXMpCi0gICAgewotICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBT ZWFyY2hNYXRjaGVzKHNlYXJjaE1hdGNoZXMpOwotICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJ bnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Iv c2VhcmNoL3Jlc291cmNlcy9zZWFyY2guY3NzIik7Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRk UmVzdWx0KHJlc291cmNlLnVybCk7Ci0gICAgICAgIFBhZ2VBZ2VudC5zZWFyY2hJblJlc291cmNl KHJlc291cmNlLmZyYW1lSWQsIHJlc291cmNlLnVybCwgdGV4dCwgc3RlcDQpOwotICAgIH0KLQot ICAgIGZ1bmN0aW9uIHN0ZXA0KGVycm9yLCBzZWFyY2hNYXRjaGVzKQotICAgIHsKLSAgICAgICAg SW5zcGVjdG9yVGVzdC5kdW1wU2VhcmNoTWF0Y2hlcyhzZWFyY2hNYXRjaGVzKTsKLSAgICAgICAg dmFyIHJlc291cmNlID0gV2ViSW5zcGVjdG9yLnJlc291cmNlRm9yVVJMKCJodHRwOi8vMTI3LjAu MC4xOjgwMDAvaW5zcGVjdG9yL3NlYXJjaC9yZXNvdXJjZXMvc2VhcmNoLmh0bWwiKTsKLSAgICAg ICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQocmVzb3VyY2UudXJsKTsKLSAgICAgICAgUGFnZUFn ZW50LnNlYXJjaEluUmVzb3VyY2UocmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCB0ZXh0 LCBzdGVwNSk7Ci0gICAgfQotCi0gICAgZnVuY3Rpb24gc3RlcDUoZXJyb3IsIHNlYXJjaE1hdGNo ZXMpCisgICAgZnVuY3Rpb24gc3RlcDMoc2VhcmNoTWF0Y2hlcykKICAgICB7CiAgICAgICAgIElu c3BlY3RvclRlc3QuZHVtcFNlYXJjaE1hdGNoZXMoc2VhcmNoTWF0Y2hlcyk7CiAgICAgICAgIElu c3BlY3RvclRlc3QuY29tcGxldGVUZXN0KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXJlc291cmNlcy5odG1sIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZXMuaHRt bAppbmRleCAyZTdlN2YzMWI1NDg4Nzc4ZWE4ZjEwYzc0Nzg1NjZiNjgyYjlkNmU5Li5iOTk5OWVh YThiMDQxYWNmNDU3ODFiZWZkMTNjZTM3MjQ2YzJhZWFhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXJlc291cmNlcy5odG1sCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tcmVz b3VyY2VzLmh0bWwKQEAgLTEsNyArMSw2IEBACiA8aHRtbD4KIDxoZWFkPgogPHNjcmlwdCBzcmM9 Ii4uL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KLTxzY3JpcHQgc3JjPSIuLi9yZXNvdXJj ZS10cmVlL3Jlc291cmNlLXRyZWUtdGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0ic2Vh cmNoLXRlc3QuanMiPjwvc2NyaXB0PgogPHNjcmlwdD4KIGZ1bmN0aW9uIHRlc3QoKQpkaWZmIC0t Z2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC10ZXN0 LmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC10ZXN0 LmpzCmluZGV4IDY1MWI4ZGYxODFjMzFiMzhhNWQ4NmQwOTdhM2ZjNzIzYTY2ZjUwYWMuLmJhZTU3 MmUwNmZjYzlhODkxMjIyNjQwNDFhNzI5NmJkNGE3M2FkOWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtdGVzdC5qcworKysgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLXRlc3QuanMKQEAgLTE2 LDQgKzE2LDI5IEBAIEluc3BlY3RvclRlc3QuZHVtcFNlYXJjaE1hdGNoZXMgPSBmdW5jdGlvbihz ZWFyY2hNYXRjaGVzKQogICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KCIiKTsKIH07CiAKK0lu c3BlY3RvclRlc3QucnVuQWZ0ZXJSZXNvdXJjZXNBcmVDcmVhdGVkID0gZnVuY3Rpb24ocmVzb3Vy Y2VVUkxzLCBjYWxsYmFjaykKK3sKKyAgICBJbnNwZWN0b3JUZXN0Ll9ydW5BZnRlclJlc291cmNl c0FyZUNyZWF0ZWQocmVzb3VyY2VVUkxzLmtleVNldCgpLCBjYWxsYmFjayk7Cit9CisKK0luc3Bl Y3RvclRlc3QuX3J1bkFmdGVyUmVzb3VyY2VzQXJlQ3JlYXRlZCA9IGZ1bmN0aW9uKHJlc291cmNl VVJMcywgY2FsbGJhY2spCit7CisgICAgZnVuY3Rpb24gdmlzaXQocmVzb3VyY2UpCisgICAgewor ICAgICAgICBmb3IgKHZhciB1cmwgaW4gcmVzb3VyY2VVUkxzKSB7CisgICAgICAgICAgICBpZiAo cmVzb3VyY2UudXJsLmluZGV4T2YodXJsKSAhPT0gLTEpCisgICAgICAgICAgICAgICAgZGVsZXRl IHJlc291cmNlVVJMc1t1cmxdOworICAgICAgICB9CisKKyAgICAgICAgaWYgKCFPYmplY3Qua2V5 cyhyZXNvdXJjZVVSTHMpLmxlbmd0aCkgeworICAgICAgICAgICAgY2FsbGJhY2soKTsKKyAgICAg ICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfQorCisgICAgdmFyIHN1Y2NlZWRl ZCA9IFdlYkluc3BlY3Rvci5yZXNvdXJjZVRyZWVNb2RlbC5mb3JBbGxSZXNvdXJjZXModmlzaXQp OworICAgIGlmICghc3VjY2VlZGVkKQorICAgICAgICBzZXRUaW1lb3V0KEluc3BlY3RvclRlc3Qu X3J1bkFmdGVyUmVzb3VyY2VzQXJlQ3JlYXRlZC5iaW5kKEluc3BlY3RvclRlc3QsIHJlc291cmNl VVJMcywgY2FsbGJhY2spLCAwKTsKK30KKwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA1NjU5Y2RhNjY3Yzlm MzVkMThmODVhNmRjZjcyMDM3MzViMjlkYzk4Li5kOGI1OTVjMzJhN2ZmN2U2NWZmZWZlNzk4YzBk ZGM5MzdlOWJjNWJhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjIgQEAKIDIwMTEtMDktMjggIFZz ZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+CiAKKyAgICAgICAgV2ViIEluc3Bl Y3RvcjogTWFrZSBzZWFyY2gtaW4tcmVzb3VyY2UgdGVzdCBzaW1wbGVyLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkwMjUKKworICAgICAgICBDaGFu Z2VkIHNlYXJjaC1pbi1yZXNvdXJjZSB0ZXN0LgorICAgICAgICBNb3ZlZCBQYWdlQWdlbnQuc2Vh cmNoSW5SZXNvdXJjZSBjYWxsIHRvIE5ldHdvcmtNYW5hZ2VyLgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VB Z2VudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JQYWdlQWdlbnQ6OnNlYXJjaElu UmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuTmV0d29ya01hbmFnZXIucHJvdG90eXBlLnNlYXJj aEluUmVzb3VyY2UpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6 CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnNlYXJjaEluQ29udGVu dCk6CisKKzIwMTEtMDktMjggIFZzZXZvbG9kIFZsYXNvdiAgPHZzZXZpa0BjaHJvbWl1bS5vcmc+ CisKICAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkIHN1cHBvcnQgZm9yIHNlYXJjaCBpbiBzaW5n bGUgcmVzb3VyY2UgdG8gcGFnZSBhZ2VudC4KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTY4OTk4CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3BwIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9y L0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKaW5kZXggYjY4NDhmMTQyYjQwN2I3N2Y5Y2E0YzY0OWFi MDQ4YmNjZDJiYjgyNy4uNzU0NTExNDA1MWRlNDVhZmM0NzUxMThkY2RiY2JjZDU2NGZlZTgwMCAx MDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAK QEAgLTQ4NiwxNyArNDg2LDE1IEBAIHN0YXRpYyBib29sIHRleHRDb250ZW50Rm9yQ2FjaGVkUmVz b3VyY2UoQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJlc291cmNlLCBTdHJpbmcqCiAKIHZvaWQgSW5z cGVjdG9yUGFnZUFnZW50OjpzZWFyY2hJblJlc291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3Ry aW5nJiBmcmFtZUlkLCBjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBxdWVyeSwgUmVm UHRyPEluc3BlY3RvckFycmF5Piogb2JqZWN0KQogewotICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJh eT4gcmVzdWx0ID0gSW5zcGVjdG9yQXJyYXk6OmNyZWF0ZSgpOworICAgICpvYmplY3QgPSBJbnNw ZWN0b3JBcnJheTo6Y3JlYXRlKCk7CiAKICAgICBGcmFtZSogZnJhbWUgPSBmcmFtZUZvcklkKGZy YW1lSWQpOwogICAgIEtVUkwga3VybChQYXJzZWRVUkxTdHJpbmcsIHVybCk7CiAKICAgICBGcmFt ZUxvYWRlciogZnJhbWVMb2FkZXIgPSBmcmFtZSA/IGZyYW1lLT5sb2FkZXIoKSA6IDA7CiAgICAg RG9jdW1lbnRMb2FkZXIqIGxvYWRlciA9IGZyYW1lTG9hZGVyID8gZnJhbWVMb2FkZXItPmRvY3Vt ZW50TG9hZGVyKCkgOiAwOwotICAgIGlmICghbG9hZGVyKSB7Ci0gICAgICAgICpvYmplY3QgPSBy ZXN1bHQ7CisgICAgaWYgKCFsb2FkZXIpCiAgICAgICAgIHJldHVybjsKLSAgICB9CiAKICAgICBT dHJpbmcgY29udGVudDsKICAgICBib29sIHN1Y2Nlc3MgPSBmYWxzZTsKQEAgLTUwOCwxMyArNTA2 LDEwIEBAIHZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpzZWFyY2hJblJlc291cmNlKEVycm9yU3Ry aW5nKiwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjCiAgICAgICAgIHN1Y2Nlc3MgPSB0ZXh0Q29u dGVudEZvckNhY2hlZFJlc291cmNlKHJlc291cmNlLCAmY29udGVudCk7CiAgICAgfQogCi0gICAg aWYgKCFzdWNjZXNzKSB7Ci0gICAgICAgICpvYmplY3QgPSByZXN1bHQ7CisgICAgaWYgKCFzdWNj ZXNzKQogICAgICAgICByZXR1cm47Ci0gICAgfQogCi0gICAgcmVzdWx0ID0gQ29udGVudFNlYXJj aFV0aWxzOjpzZWFyY2hJblRleHRCeUxpbmVzKHF1ZXJ5LCBjb250ZW50KTsKLSAgICAqb2JqZWN0 ID0gcmVzdWx0OworICAgICpvYmplY3QgPSBDb250ZW50U2VhcmNoVXRpbHM6OnNlYXJjaEluVGV4 dEJ5TGluZXMocXVlcnksIGNvbnRlbnQpOwogfQogCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0 b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9yU2VhcmNoUmVzdWx0KGNvbnN0IFN0cmluZyYgZnJhbWVJ ZCwgY29uc3QgU3RyaW5nJiB1cmwsIGludCBtYXRjaGVzQ291bnQpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzIGIvU291cmNl L1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9OZXR3b3JrTWFuYWdlci5qcwppbmRleCAzNDQ2 YTZkOTQxMTBkNzdjNTMyMmRiMGFjMGY2YTc2OWNmMGZmMThiLi5mYzFhZmFmMGFhOWQ4OTgwMzVi NTRhNmI0YmE2ZmZjMWI2ZmJkZDcxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0 b3IvZnJvbnQtZW5kL05ldHdvcmtNYW5hZ2VyLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3Bl Y3Rvci9mcm9udC1lbmQvTmV0d29ya01hbmFnZXIuanMKQEAgLTY3LDYgKzY3LDE2IEBAIFdlYklu c3BlY3Rvci5OZXR3b3JrTWFuYWdlci5wcm90b3R5cGUgPSB7CiAgICAgICAgICAgICBQYWdlQWdl bnQuZ2V0UmVzb3VyY2VDb250ZW50KHJlc291cmNlLmZyYW1lSWQsIHJlc291cmNlLnVybCwgY2Fs bGJhY2tXcmFwcGVyKTsKICAgICB9LAogCisgICAgc2VhcmNoSW5SZXNvdXJjZTogZnVuY3Rpb24o cmVzb3VyY2UsIHF1ZXJ5LCBjYWxsYmFjaykKKyAgICB7CisgICAgICAgIGZ1bmN0aW9uIGNhbGxi YWNrV3JhcHBlcihlcnJvciwgc2VhcmNoTWF0Y2hlcykKKyAgICAgICAgeworICAgICAgICAgICAg Y2FsbGJhY2soc2VhcmNoTWF0Y2hlcyB8fCBbXSk7CisgICAgICAgIH0KKyAgICAgICAgCisgICAg ICAgIFBhZ2VBZ2VudC5zZWFyY2hJblJlc291cmNlKHJlc291cmNlLmZyYW1lSWQsIHJlc291cmNl LnVybCwgcXVlcnksIGNhbGxiYWNrV3JhcHBlcik7CisgICAgfSwKKwogICAgIGluZmxpZ2h0UmVz b3VyY2VGb3JVUkw6IGZ1bmN0aW9uKHVybCkKICAgICB7CiAgICAgICAgIHJldHVybiB0aGlzLl9k aXNwYXRjaGVyLl9pbmZsaWdodFJlc291cmNlc0J5VVJMW3VybF07CmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzIGIvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwppbmRleCA0MjJhOWI3Njg2OWNjMTI4 NzdhZDRiN2Q3MmRlMjczNzM1OWI1MDBlLi42ODFkN2E2ZGFmZWZkZTFhYjdjYTg0ODAzM2ZmZDhj N2JiMzY2ODk2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L1Jlc291cmNlLmpzCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVz b3VyY2UuanMKQEAgLTg2OSw3ICs4NjksNyBAQCBXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90 eXBlID0gewogCiAgICAgc2VhcmNoSW5Db250ZW50OiBmdW5jdGlvbihxdWVyeSwgY2FsbGJhY2sp CiAgICAgewotICAgICAgICBQYWdlQWdlbnQuc2VhcmNoSW5SZXNvdXJjZShxdWVyeSwgY2FsbGJh Y2spOworICAgICAgICBXZWJJbnNwZWN0b3IubmV0d29ya01hbmFnZXIuc2VhcmNoSW5SZXNvdXJj ZSh0aGlzLCBxdWVyeSwgY2FsbGJhY2spOwogICAgIH0sCiAKICAgICBwb3B1bGF0ZUltYWdlU291 cmNlOiBmdW5jdGlvbihpbWFnZSkK 109155 2011-09-29 05:40:23 -0700 2011-09-29 05:55:42 -0700 Patch bug-69025-20110929164021.patch text/plain 12371 vsevik U3VidmVyc2lvbiBSZXZpc2lvbjogOTYzMjIKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5n ZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwppbmRleCAyY2UyNDQ1NWRkMWVlZmRkZDQ2NWEy NWY3YjM0OTMyY2E0NDE3OWQ4Li5iMDAwNDJlMmJkNzQyYTlkMTU4YmIyMWJkYzY1NTFlOTM0NDNl ZmVkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMTEtMDktMjkgIFZzZXZvbG9kIFZsYXNvdiAg PHZzZXZpa0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogTWFrZSBzZWFy Y2gtaW4tcmVzb3VyY2UgdGVzdCBzaW1wbGVyLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NjkwMjUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gt aW4tcmVzb3VyY2UtZXhwZWN0ZWQudHh0OgorICAgICAgICAqIGh0dHAvdGVzdHMvaW5zcGVjdG9y L3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2UuaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3RzL2lu c3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXJlc291cmNlcy5odG1sOgorICAgICAgICAqIGh0dHAv dGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtdGVzdC5qczoKKyAgICAgICAgKGluaXRpYWxp emVfU2VhcmNoVGVzdC5JbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUmVzb3VyY2VzQXJlQ3JlYXRlZCk6 CisgICAgICAgIChpbml0aWFsaXplX1NlYXJjaFRlc3QuSW5zcGVjdG9yVGVzdC5fcnVuQWZ0ZXJS ZXNvdXJjZXNBcmVDcmVhdGVkKToKKyAgICAgICAgKGluaXRpYWxpemVfU2VhcmNoVGVzdC5JbnNw ZWN0b3JUZXN0Ll9ydW5BZnRlclJlc291cmNlc0FyZUNyZWF0ZWQubWF5YmVDYWxsYmFjayk6Cisg ICAgICAgIChpbml0aWFsaXplX1NlYXJjaFRlc3QuSW5zcGVjdG9yVGVzdC5fcnVuQWZ0ZXJSZXNv dXJjZXNBcmVDcmVhdGVkLmFkZFNuaWZmZXIpOgorICAgICAgICAoaW5pdGlhbGl6ZV9TZWFyY2hU ZXN0Lkluc3BlY3RvclRlc3QuX3J1bkFmdGVyUmVzb3VyY2VzQXJlQ3JlYXRlZC5vblJlc291cmNl QmluZCk6CisgICAgICAgIChpbml0aWFsaXplX1NlYXJjaFRlc3QuSW5zcGVjdG9yVGVzdC5fcnVu QWZ0ZXJSZXNvdXJjZXNBcmVDcmVhdGVkLnZpc2l0KToKKyAgICAgICAgKGluaXRpYWxpemVfU2Vh cmNoVGVzdCk6CisKIDIwMTEtMDktMjcgIFBhdmVsIEZlbGRtYW4gIDxwZmVsZG1hbkBnb29nbGUu Y29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFNjcmlwdHMgcGFuZWwgd2l0aG91dCBmb2xk ZXJzIGNhdXNlcyBlcnJvcnMgd2hlbiBjcmVhdGluZyBjb250ZW50IHNjcmlwdHMgc2VjdGlvbi4K ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFy Y2gtaW4tcmVzb3VyY2UtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZS1leHBlY3RlZC50eHQKaW5kZXggODgzMzk4 MzQ4MDQxZTVkZjFhNmRmMzU2NzVjZGQxODczN2E0ZDc1ZS4uODQ4ZjRiNmNlZDIwZDg2NzdkY2Zj OTllZTk3M2RkYWU5OTJlMjJiOCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9p bnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZS1leHBlY3RlZC50eHQKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZS1l eHBlY3RlZC50eHQKQEAgLTgsMTYgKzgsNCBAQCBsaW5lTnVtYmVyOiAzLCBsaW5lOiAnICAgIC8v IHNlYXJjaFRlc3RVbmlxdWVTdHJpbmcgdHdvIG9jY3VyZW5jZXMgb24gdGhlIHNhbWUgbAogbGlu ZU51bWJlcjogOSwgbGluZTogJyAgICBzZWFyY2hUZXN0VW5pcXVlU3RyaW5nKCk7JwogbGluZU51 bWJlcjogMTAsIGxpbmU6ICcgICAgLy8gU0VBUkNIVGVzdFVuaXF1ZVN0cmluZygpOycKIAotaHR0 cDovLzEyNy4wLjAuMTo4MDAwL2luc3BlY3Rvci9zZWFyY2gvcmVzb3VyY2VzL3NlYXJjaC5jc3MK LVNlYXJjaCBtYXRjaGVzOiAKLWxpbmVOdW1iZXI6IDAsIGxpbmU6ICdkaXYuc2VhcmNoVGVzdFVu aXF1ZVN0cmluZyB7JwotbGluZU51bWJlcjogNCwgbGluZTogJ2Rpdi5zZWFyY2hUZXN0VW5pcXVl U3RyaW5nOmhvdmVyIHsnCi1saW5lTnVtYmVyOiA1LCBsaW5lOiAnICAgIC8qIGFub3RoZXIgc2Vh cmNoVGVzdFVuaXF1ZVN0cmluZyBvY2N1cmVuY2UgKi8nCi0KLWh0dHA6Ly8xMjcuMC4wLjE6ODAw MC9pbnNwZWN0b3Ivc2VhcmNoL3Jlc291cmNlcy9zZWFyY2guaHRtbAotU2VhcmNoIG1hdGNoZXM6 IAotbGluZU51bWJlcjogNSwgbGluZTogJzxkaXY+c2VhcmNoVGVzdFVuaXF1ZVN0cmluZzwvZGl2 PicKLWxpbmVOdW1iZXI6IDcsIGxpbmU6ICc8IS0tIHNlYXJjaFRlc3RVbmlxdWVTdHJpbmcgLS0+ JwotbGluZU51bWJlcjogOSwgbGluZTogJzxkaXYgaWQ9InNlYXJjaFRlc3RVbmlxdWVTdHJpbmci PmRpdiB0ZXh0PC9kaXY+JwotCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv aW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2UuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2UuaHRtbAppbmRleCAw MTdiYTM4M2M5NGNiMzk1ZDY3MjdjNDFjMGJlNjA2ODA3ZTRmNGRjLi4wMzI3NGE2ZDU5ZGNjMTc4 Yzg4NGU0NGY2YzVmOWNkY2Y1MjYyNTYyIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL2luc3BlY3Rvci9zZWFyY2gvc2VhcmNoLWluLXJlc291cmNlLmh0bWwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZS5odG1s CkBAIC0xLDM5ICsxLDIyIEBACiA8aHRtbD4KIDxoZWFkPgogPHNjcmlwdCBzcmM9Ii4uL2luc3Bl Y3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KLTxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZS10cmVlL3Jl c291cmNlLXRyZWUtdGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0ic2VhcmNoLXRlc3Qu anMiPjwvc2NyaXB0PgogPHNjcmlwdD4KIGZ1bmN0aW9uIHRlc3QoKQogewogICAgIC8vIFRoaXMg ZmlsZSBzaG91bGQgbm90IG1hdGNoIHNlYXJjaCBxdWVyeS4KICAgICB2YXIgdGV4dCA9ICJzZWFy Y2hUZXN0IiArICJVbmlxdWVTdHJpbmciOwotICAgIEluc3BlY3RvclRlc3QucnVuQWZ0ZXJSZXNv dXJjZXNBcmVGaW5pc2hlZChbInNlYXJjaC5qcyIsICJzZWFyY2guY3NzIiwgInNlYXJjaC5odG1s Il0sIHN0ZXAyKTsKKyAgICBJbnNwZWN0b3JUZXN0LnJ1bkFmdGVyUmVzb3VyY2VzQXJlQ3JlYXRl ZChbInNlYXJjaC5qcyJdLCBzdGVwMik7CiAKICAgICBmdW5jdGlvbiBzdGVwMigpCiAgICAgewog ICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JVUkwoImh0dHA6 Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivc2VhcmNoL3Jlc291cmNlcy9zZWFyY2guanMiKTsK ICAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRSZXN1bHQocmVzb3VyY2UudXJsKTsKLSAgICAgICAg UGFnZUFnZW50LnNlYXJjaEluUmVzb3VyY2UocmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UudXJs LCB0ZXh0LCBzdGVwMyk7CisgICAgICAgIHJlc291cmNlLnNlYXJjaEluQ29udGVudCh0ZXh0LCBz dGVwMyk7CiAgICAgfQogCi0gICAgZnVuY3Rpb24gc3RlcDMoZXJyb3IsIHNlYXJjaE1hdGNoZXMp Ci0gICAgewotICAgICAgICBJbnNwZWN0b3JUZXN0LmR1bXBTZWFyY2hNYXRjaGVzKHNlYXJjaE1h dGNoZXMpOwotICAgICAgICB2YXIgcmVzb3VyY2UgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VGb3JV UkwoImh0dHA6Ly8xMjcuMC4wLjE6ODAwMC9pbnNwZWN0b3Ivc2VhcmNoL3Jlc291cmNlcy9zZWFy Y2guY3NzIik7Ci0gICAgICAgIEluc3BlY3RvclRlc3QuYWRkUmVzdWx0KHJlc291cmNlLnVybCk7 Ci0gICAgICAgIFBhZ2VBZ2VudC5zZWFyY2hJblJlc291cmNlKHJlc291cmNlLmZyYW1lSWQsIHJl c291cmNlLnVybCwgdGV4dCwgc3RlcDQpOwotICAgIH0KLQotICAgIGZ1bmN0aW9uIHN0ZXA0KGVy cm9yLCBzZWFyY2hNYXRjaGVzKQotICAgIHsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5kdW1wU2Vh cmNoTWF0Y2hlcyhzZWFyY2hNYXRjaGVzKTsKLSAgICAgICAgdmFyIHJlc291cmNlID0gV2ViSW5z cGVjdG9yLnJlc291cmNlRm9yVVJMKCJodHRwOi8vMTI3LjAuMC4xOjgwMDAvaW5zcGVjdG9yL3Nl YXJjaC9yZXNvdXJjZXMvc2VhcmNoLmh0bWwiKTsKLSAgICAgICAgSW5zcGVjdG9yVGVzdC5hZGRS ZXN1bHQocmVzb3VyY2UudXJsKTsKLSAgICAgICAgUGFnZUFnZW50LnNlYXJjaEluUmVzb3VyY2Uo cmVzb3VyY2UuZnJhbWVJZCwgcmVzb3VyY2UudXJsLCB0ZXh0LCBzdGVwNSk7Ci0gICAgfQotCi0g ICAgZnVuY3Rpb24gc3RlcDUoZXJyb3IsIHNlYXJjaE1hdGNoZXMpCisgICAgZnVuY3Rpb24gc3Rl cDMoc2VhcmNoTWF0Y2hlcykKICAgICB7CiAgICAgICAgIEluc3BlY3RvclRlc3QuZHVtcFNlYXJj aE1hdGNoZXMoc2VhcmNoTWF0Y2hlcyk7CiAgICAgICAgIEluc3BlY3RvclRlc3QuY29tcGxldGVU ZXN0KCk7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rvci9zZWFy Y2gvc2VhcmNoLWluLXJlc291cmNlcy5odG1sIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9pbnNw ZWN0b3Ivc2VhcmNoL3NlYXJjaC1pbi1yZXNvdXJjZXMuaHRtbAppbmRleCAyZTdlN2YzMWI1NDg4 Nzc4ZWE4ZjEwYzc0Nzg1NjZiNjgyYjlkNmU5Li5iOTk5OWVhYThiMDQxYWNmNDU3ODFiZWZkMTNj ZTM3MjQ2YzJhZWFhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2luc3BlY3Rv ci9zZWFyY2gvc2VhcmNoLWluLXJlc291cmNlcy5odG1sCisrKyBiL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvaW5zcGVjdG9yL3NlYXJjaC9zZWFyY2gtaW4tcmVzb3VyY2VzLmh0bWwKQEAgLTEsNyAr MSw2IEBACiA8aHRtbD4KIDxoZWFkPgogPHNjcmlwdCBzcmM9Ii4uL2luc3BlY3Rvci10ZXN0Lmpz Ij48L3NjcmlwdD4KLTxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZS10cmVlL3Jlc291cmNlLXRyZWUt dGVzdC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0IHNyYz0ic2VhcmNoLXRlc3QuanMiPjwvc2NyaXB0 PgogPHNjcmlwdD4KIGZ1bmN0aW9uIHRlc3QoKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC10ZXN0LmpzIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9pbnNwZWN0b3Ivc2VhcmNoL3NlYXJjaC10ZXN0LmpzCmluZGV4IDY1MWI4ZGYxODFj MzFiMzhhNWQ4NmQwOTdhM2ZjNzIzYTY2ZjUwYWMuLmI3OWZkZjMwYjQ4ZDdhOTM3YTkxZDI4OTY1 OWIwMDIzYzdlZWIyNGYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvaW5zcGVj dG9yL3NlYXJjaC9zZWFyY2gtdGVzdC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2lu c3BlY3Rvci9zZWFyY2gvc2VhcmNoLXRlc3QuanMKQEAgLTE2LDQgKzE2LDUwIEBAIEluc3BlY3Rv clRlc3QuZHVtcFNlYXJjaE1hdGNoZXMgPSBmdW5jdGlvbihzZWFyY2hNYXRjaGVzKQogICAgIElu c3BlY3RvclRlc3QuYWRkUmVzdWx0KCIiKTsKIH07CiAKK0luc3BlY3RvclRlc3QucnVuQWZ0ZXJS ZXNvdXJjZXNBcmVDcmVhdGVkID0gZnVuY3Rpb24ocmVzb3VyY2VVUkxzLCBjYWxsYmFjaykKK3sK KyAgICBJbnNwZWN0b3JUZXN0Ll9ydW5BZnRlclJlc291cmNlc0FyZUNyZWF0ZWQocmVzb3VyY2VV UkxzLmtleVNldCgpLCBjYWxsYmFjayk7Cit9CisKK0luc3BlY3RvclRlc3QuX3J1bkFmdGVyUmVz b3VyY2VzQXJlQ3JlYXRlZCA9IGZ1bmN0aW9uKHJlc291cmNlVVJMcywgY2FsbGJhY2spCit7Cisg ICAgZnVuY3Rpb24gY2hlY2tSZXNvdXJjZShyZXNvdXJjZSkKKyAgICB7CisgICAgICAgIGZvciAo dmFyIHVybCBpbiByZXNvdXJjZVVSTHMpIHsKKyAgICAgICAgICAgIGlmIChyZXNvdXJjZS51cmwu aW5kZXhPZih1cmwpICE9PSAtMSkKKyAgICAgICAgICAgICAgICBkZWxldGUgcmVzb3VyY2VVUkxz W3VybF07CisgICAgICAgIH0KKyAgICB9CisKKyAgICBmdW5jdGlvbiBtYXliZUNhbGxiYWNrKCkK KyAgICB7CisgICAgICAgIGlmICghT2JqZWN0LmtleXMocmVzb3VyY2VVUkxzKS5sZW5ndGgpIHsK KyAgICAgICAgICAgIGNhbGxiYWNrKCk7CisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICAg ICAgfQorICAgIH0KKworICAgIGZ1bmN0aW9uIGFkZFNuaWZmZXIocmVzb3VyY2UpCisgICAgewor ICAgICAgICBJbnNwZWN0b3JUZXN0LmFkZFNuaWZmZXIoV2ViSW5zcGVjdG9yLlJlc291cmNlVHJl ZU1vZGVsLnByb3RvdHlwZSwgIl9iaW5kUmVzb3VyY2VVUkwiLCBvblJlc291cmNlQmluZC5iaW5k KHRoaXMpKTsKKyAgICB9CisKKyAgICBmdW5jdGlvbiBvblJlc291cmNlQmluZChyZXNvdXJjZSkK KyAgICB7CisgICAgICAgIGNoZWNrUmVzb3VyY2UocmVzb3VyY2UpOworICAgICAgICBpZiAoIW1h eWJlQ2FsbGJhY2soKSkKKyAgICAgICAgICAgIGFkZFNuaWZmZXIoKTsKKyAgICB9CisKKyAgICBm dW5jdGlvbiB2aXNpdChyZXNvdXJjZSkKKyAgICB7CisgICAgICAgIGNoZWNrUmVzb3VyY2UocmVz b3VyY2UpOworICAgICAgICByZXR1cm4gbWF5YmVDYWxsYmFjaygpOworICAgIH0KKworICAgIHZh ciBzdWNjZWVkZWQgPSBXZWJJbnNwZWN0b3IucmVzb3VyY2VUcmVlTW9kZWwuZm9yQWxsUmVzb3Vy Y2VzKHZpc2l0KTsKKyAgICBpZiAoIXN1Y2NlZWRlZCkKKyAgICAgICAgYWRkU25pZmZlcigpOwor fQorCiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nCmluZGV4IGU2ZWUyMGE4ZjU1NWEwZmZhZGU4NWQ0YjBjNWJmY2QwNzJh ZWM5ODUuLjk5OGY3MGYyZmI3N2ZlODkwNGYyY2Y1YWE2OTc2YzZhYTE4YjVkNzMgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMS0wOS0yOSAgVnNldm9sb2QgVmxhc292ICA8dnNldmlr QGNocm9taXVtLm9yZz4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBNYWtlIHNlYXJjaC1pbi1y ZXNvdXJjZSB0ZXN0IHNpbXBsZXIuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD02OTAyNQorCisgICAgICAgIENoYW5nZWQgc2VhcmNoLWluLXJlc291cmNl IHRlc3QuCisgICAgICAgIFJlbW92ZWQgZXJyb3IgcGFyYW1ldGVyIGZyb20gY29udGVudCBwcm92 aWRlcidzIHNlYXJjaEluQ29udGVudCBjYWxsYmFjay4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yUGFnZUFnZW50OjpzZWFyY2hJblJlc291 cmNlKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvclBhZ2VBZ2VudDo6c2VhcmNoSW5SZXNv dXJjZXMpOgorICAgICAgICAqIGluc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanM6CisgICAg ICAgIChXZWJJbnNwZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlLnNlYXJjaEluQ29udGVudCk6CisK IDIwMTEtMDktMjkgIEhhbnMgV2VubmJvcmcgIDxoYW5zQGNocm9taXVtLm9yZz4KIAogICAgICAg ICBJbmRleGVkREI6IFVzZSBMZXZlbERCIGFsc28gZm9yIGluLW1lbW9yeSBkYXRhYmFzZXMKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0b3JQYWdlQWdlbnQuY3Bw IGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKaW5kZXgg YjY4NDhmMTQyYjQwN2I3N2Y5Y2E0YzY0OWFiMDQ4YmNjZDJiYjgyNy4uNTRiMzJmMmFkMDgxNTJh M2QzNTIxODkyZWZjYjljZjdkMDAwMzcwZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVj dG9yL0luc3BlY3RvclBhZ2VBZ2VudC5jcHAKQEAgLTQ4NCwxOSArNDg0LDE3IEBAIHN0YXRpYyBi b29sIHRleHRDb250ZW50Rm9yQ2FjaGVkUmVzb3VyY2UoQ2FjaGVkUmVzb3VyY2UqIGNhY2hlZFJl c291cmNlLCBTdHJpbmcqCiAgICAgcmV0dXJuIGZhbHNlOwogfQogCi12b2lkIEluc3BlY3RvclBh Z2VBZ2VudDo6c2VhcmNoSW5SZXNvdXJjZShFcnJvclN0cmluZyosIGNvbnN0IFN0cmluZyYgZnJh bWVJZCwgY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFN0cmluZyYgcXVlcnksIFJlZlB0cjxJbnNw ZWN0b3JBcnJheT4qIG9iamVjdCkKK3ZvaWQgSW5zcGVjdG9yUGFnZUFnZW50OjpzZWFyY2hJblJl c291cmNlKEVycm9yU3RyaW5nKiwgY29uc3QgU3RyaW5nJiBmcmFtZUlkLCBjb25zdCBTdHJpbmcm IHVybCwgY29uc3QgU3RyaW5nJiBxdWVyeSwgUmVmUHRyPEluc3BlY3RvckFycmF5PiogcmVzdWx0 cykKIHsKLSAgICBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+IHJlc3VsdCA9IEluc3BlY3RvckFycmF5 OjpjcmVhdGUoKTsKKyAgICAqcmVzdWx0cyA9IEluc3BlY3RvckFycmF5OjpjcmVhdGUoKTsKIAog ICAgIEZyYW1lKiBmcmFtZSA9IGZyYW1lRm9ySWQoZnJhbWVJZCk7CiAgICAgS1VSTCBrdXJsKFBh cnNlZFVSTFN0cmluZywgdXJsKTsKIAogICAgIEZyYW1lTG9hZGVyKiBmcmFtZUxvYWRlciA9IGZy YW1lID8gZnJhbWUtPmxvYWRlcigpIDogMDsKICAgICBEb2N1bWVudExvYWRlciogbG9hZGVyID0g ZnJhbWVMb2FkZXIgPyBmcmFtZUxvYWRlci0+ZG9jdW1lbnRMb2FkZXIoKSA6IDA7Ci0gICAgaWYg KCFsb2FkZXIpIHsKLSAgICAgICAgKm9iamVjdCA9IHJlc3VsdDsKKyAgICBpZiAoIWxvYWRlcikK ICAgICAgICAgcmV0dXJuOwotICAgIH0KIAogICAgIFN0cmluZyBjb250ZW50OwogICAgIGJvb2wg c3VjY2VzcyA9IGZhbHNlOwpAQCAtNTA4LDEzICs1MDYsMTAgQEAgdm9pZCBJbnNwZWN0b3JQYWdl QWdlbnQ6OnNlYXJjaEluUmVzb3VyY2UoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIGZyYW1l SWQsIGMKICAgICAgICAgc3VjY2VzcyA9IHRleHRDb250ZW50Rm9yQ2FjaGVkUmVzb3VyY2UocmVz b3VyY2UsICZjb250ZW50KTsKICAgICB9CiAKLSAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAgICAg Km9iamVjdCA9IHJlc3VsdDsKKyAgICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgIHJldHVybjsKLSAg ICB9CiAKLSAgICByZXN1bHQgPSBDb250ZW50U2VhcmNoVXRpbHM6OnNlYXJjaEluVGV4dEJ5TGlu ZXMocXVlcnksIGNvbnRlbnQpOwotICAgICpvYmplY3QgPSByZXN1bHQ7CisgICAgKnJlc3VsdHMg PSBDb250ZW50U2VhcmNoVXRpbHM6OnNlYXJjaEluVGV4dEJ5TGluZXMocXVlcnksIGNvbnRlbnQp OwogfQogCiBzdGF0aWMgUGFzc1JlZlB0cjxJbnNwZWN0b3JPYmplY3Q+IGJ1aWxkT2JqZWN0Rm9y U2VhcmNoUmVzdWx0KGNvbnN0IFN0cmluZyYgZnJhbWVJZCwgY29uc3QgU3RyaW5nJiB1cmwsIGlu dCBtYXRjaGVzQ291bnQpCkBAIC01MjcsOSArNTIyLDkgQEAgc3RhdGljIFBhc3NSZWZQdHI8SW5z cGVjdG9yT2JqZWN0PiBidWlsZE9iamVjdEZvclNlYXJjaFJlc3VsdChjb25zdCBTdHJpbmcmIGZy YW0KICAgICByZXR1cm4gcmVzdWx0OwogfQogCi12b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6c2Vh cmNoSW5SZXNvdXJjZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbnN0IGJv b2wqIGNvbnN0IG9wdGlvbmFsQ2FzZVNlbnNpdGl2ZSwgY29uc3QgYm9vbCogY29uc3Qgb3B0aW9u YWxJc1JlZ2V4LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiBvYmplY3QpCit2b2lkIEluc3BlY3Rv clBhZ2VBZ2VudDo6c2VhcmNoSW5SZXNvdXJjZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcm IHRleHQsIGNvbnN0IGJvb2wqIGNvbnN0IG9wdGlvbmFsQ2FzZVNlbnNpdGl2ZSwgY29uc3QgYm9v bCogY29uc3Qgb3B0aW9uYWxJc1JlZ2V4LCBSZWZQdHI8SW5zcGVjdG9yQXJyYXk+KiByZXN1bHRz KQogewotICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gcmVzdWx0ID0gSW5zcGVjdG9yQXJyYXk6 OmNyZWF0ZSgpOworICAgIFJlZlB0cjxJbnNwZWN0b3JBcnJheT4gc2VhcmNoUmVzdWx0cyA9IElu c3BlY3RvckFycmF5OjpjcmVhdGUoKTsKIAogICAgIGJvb2wgaXNSZWdleCA9IG9wdGlvbmFsSXNS ZWdleCA/ICpvcHRpb25hbElzUmVnZXggOiBmYWxzZTsKICAgICBib29sIGNhc2VTZW5zaXRpdmUg PSBvcHRpb25hbENhc2VTZW5zaXRpdmUgPyAqb3B0aW9uYWxDYXNlU2Vuc2l0aXZlIDogZmFsc2U7 CkBAIC01NDMsMTcgKzUzOCwxNyBAQCB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6c2VhcmNoSW5S ZXNvdXJjZXMoRXJyb3JTdHJpbmcqLCBjb25zdCBTdHJpbmcmIHRleHQsIGNvbgogICAgICAgICAg ICAgaWYgKHRleHRDb250ZW50Rm9yQ2FjaGVkUmVzb3VyY2UoY2FjaGVkUmVzb3VyY2UsICZjb250 ZW50KSkgewogICAgICAgICAgICAgICAgIGludCBtYXRjaGVzQ291bnQgPSBDb250ZW50U2VhcmNo VXRpbHM6OmNvdW50UmVndWxhckV4cHJlc3Npb25NYXRjaGVzKHJlZ2V4LCBjb250ZW50KTsKICAg ICAgICAgICAgICAgICBpZiAobWF0Y2hlc0NvdW50KQotICAgICAgICAgICAgICAgICAgICByZXN1 bHQtPnB1c2hWYWx1ZShidWlsZE9iamVjdEZvclNlYXJjaFJlc3VsdChmcmFtZUlkKGZyYW1lKSwg Y2FjaGVkUmVzb3VyY2UtPnVybCgpLCBtYXRjaGVzQ291bnQpKTsKKyAgICAgICAgICAgICAgICAg ICAgc2VhcmNoUmVzdWx0cy0+cHVzaFZhbHVlKGJ1aWxkT2JqZWN0Rm9yU2VhcmNoUmVzdWx0KGZy YW1lSWQoZnJhbWUpLCBjYWNoZWRSZXNvdXJjZS0+dXJsKCksIG1hdGNoZXNDb3VudCkpOwogICAg ICAgICAgICAgfQogICAgICAgICB9CiAgICAgICAgIGlmIChtYWluUmVzb3VyY2VDb250ZW50KGZy YW1lLCBmYWxzZSwgJmNvbnRlbnQpKSB7CiAgICAgICAgICAgICBpbnQgbWF0Y2hlc0NvdW50ID0g Q29udGVudFNlYXJjaFV0aWxzOjpjb3VudFJlZ3VsYXJFeHByZXNzaW9uTWF0Y2hlcyhyZWdleCwg Y29udGVudCk7CiAgICAgICAgICAgICBpZiAobWF0Y2hlc0NvdW50KQotICAgICAgICAgICAgICAg IHJlc3VsdC0+cHVzaFZhbHVlKGJ1aWxkT2JqZWN0Rm9yU2VhcmNoUmVzdWx0KGZyYW1lSWQoZnJh bWUpLCBmcmFtZS0+ZG9jdW1lbnQoKS0+dXJsKCksIG1hdGNoZXNDb3VudCkpOworICAgICAgICAg ICAgICAgIHNlYXJjaFJlc3VsdHMtPnB1c2hWYWx1ZShidWlsZE9iamVjdEZvclNlYXJjaFJlc3Vs dChmcmFtZUlkKGZyYW1lKSwgZnJhbWUtPmRvY3VtZW50KCktPnVybCgpLCBtYXRjaGVzQ291bnQp KTsKICAgICAgICAgfQogICAgIH0KIAotICAgICpvYmplY3QgPSByZXN1bHQ7CisgICAgKnJlc3Vs dHMgPSBzZWFyY2hSZXN1bHRzOwogfQogCiB2b2lkIEluc3BlY3RvclBhZ2VBZ2VudDo6ZGlkQ2xl YXJXaW5kb3dPYmplY3RJbldvcmxkKEZyYW1lKiBmcmFtZSwgRE9NV3JhcHBlcldvcmxkKiB3b3Js ZCkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3Vy Y2UuanMgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5kL1Jlc291cmNlLmpzCmlu ZGV4IDQyMmE5Yjc2ODY5Y2MxMjg3N2FkNGI3ZDcyZGUyNzM3MzU5YjUwMGUuLmEyMmIwM2M0ZmI3 MjhmNTIwZmQwODUzMjYyNThmNmI5ZTAzODNlY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2luc3BlY3Rvci9mcm9udC1lbmQvUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkNvcmUvaW5z cGVjdG9yL2Zyb250LWVuZC9SZXNvdXJjZS5qcwpAQCAtODY5LDcgKzg2OSwxMiBAQCBXZWJJbnNw ZWN0b3IuUmVzb3VyY2UucHJvdG90eXBlID0gewogCiAgICAgc2VhcmNoSW5Db250ZW50OiBmdW5j dGlvbihxdWVyeSwgY2FsbGJhY2spCiAgICAgewotICAgICAgICBQYWdlQWdlbnQuc2VhcmNoSW5S ZXNvdXJjZShxdWVyeSwgY2FsbGJhY2spOworICAgICAgICBmdW5jdGlvbiBjYWxsYmFja1dyYXBw ZXIoZXJyb3IsIHNlYXJjaE1hdGNoZXMpCisgICAgICAgIHsKKyAgICAgICAgICAgIGNhbGxiYWNr KHNlYXJjaE1hdGNoZXMgfHwgW10pOworICAgICAgICB9CisKKyAgICAgICAgUGFnZUFnZW50LnNl YXJjaEluUmVzb3VyY2UodGhpcy5mcmFtZUlkLCB0aGlzLnVybCwgcXVlcnksIGNhbGxiYWNrV3Jh cHBlcik7CiAgICAgfSwKIAogICAgIHBvcHVsYXRlSW1hZ2VTb3VyY2U6IGZ1bmN0aW9uKGltYWdl KQo=