48014 2010-10-20 15:27:46 -0700 Using the decidePolicyForMIMEType delegate message in an asynchronous manner does not work 2010-11-17 14:44:40 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED WONTFIX InRadar P2 Normal --- 48176 1 andersca andersca darin ossy oldest_to_newest 297071 0 andersca 2010-10-20 15:27:46 -0700 Using the decidePolicyForMIMEType delegate message in an asynchronous manner does not work 297072 1 andersca 2010-10-20 15:29:05 -0700 <rdar://problem/8202716> 297073 2 71348 andersca 2010-10-20 15:30:39 -0700 Created attachment 71348 Patch 297074 3 71348 abarth 2010-10-20 15:31:57 -0700 Comment on attachment 71348 Patch Can we write a test for this change? 297105 4 71355 andersca 2010-10-20 16:26:55 -0700 Created attachment 71355 Patch 297112 5 71355 darin 2010-10-20 16:30:19 -0700 Comment on attachment 71355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71355&action=review > WebCore/loader/MainResourceLoader.cpp:235 > + setDefersLoading(false); I think this needs a comment indicating where the setDefersLoading(true) is. > WebCore/loader/MainResourceLoader.cpp:379 > + // Defer loading while we're waiting for a response. > + setDefersLoading(true); I think this needs a comment indicating where the setDefersLoading(false) is. Is there a chance that some other code will setDefersLoading(true) and then setDefersLoading(false) somewhere before we get the policy client response? Does this nest properly? > WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp:371 > -void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive) > +void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive, , bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond) I don’t think this will compile with that extra comma. 297113 6 71355 abarth 2010-10-20 16:31:03 -0700 Comment on attachment 71355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=71355&action=review Ok. These kind of patches are indicative of a larger design problem in the loader... > WebKitTools/DumpRenderTree/DumpRenderTree.xcodeproj/project.pbxproj:704 > + developmentRegion = English; > hasScannedForEncodings = 1; > + knownRegions = ( > + English, > + Japanese, > + French, > + German, > + ); Please land without these changes. > WebKitTools/DumpRenderTree/mac/PolicyDelegate.mm:107 > + [(NSObject *)listener performSelector:@selector(ignore) withObject:nil afterDelay:1.0]; It's kind of lame that this is hard-coded to 1 second. I guess its ok. 297469 7 andersca 2010-10-21 09:38:35 -0700 (In reply to comment #5) > (From update of attachment 71355 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=71355&action=review > > > WebCore/loader/MainResourceLoader.cpp:235 > > + setDefersLoading(false); > > I think this needs a comment indicating where the setDefersLoading(true) is. > Good point. > > WebCore/loader/MainResourceLoader.cpp:379 > > + // Defer loading while we're waiting for a response. > > + setDefersLoading(true); > > I think this needs a comment indicating where the setDefersLoading(false) is. Good point. > > Is there a chance that some other code will setDefersLoading(true) and then setDefersLoading(false) somewhere before we get the policy client response? Does this nest properly? It does not nest properly, but I don't think that code can call setDefersLoading(false) this early on. I'll double check and add a counter. > > > WebKitTools/DumpRenderTree/win/LayoutTestControllerWin.cpp:371 > > -void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive) > > +void LayoutTestController::setCustomPolicyDelegate(bool setDelegate, bool permissive, , bool callIgnoreInDecidePolicyForMIMETypeAfterOneSecond) > > I don’t think this will compile with that extra comma. Whoops, good catch! 298263 8 andersca 2010-10-22 16:49:18 -0700 Committed r70367: <http://trac.webkit.org/changeset/70367> 298344 9 ossy 2010-10-23 00:45:36 -0700 (In reply to comment #8) > Committed r70367: <http://trac.webkit.org/changeset/70367> Reopen, because it was rolled out by http://trac.webkit.org/changeset/70385 ( https://bugs.webkit.org/show_bug.cgi?id=48176 ) It made 8-10 tests crash on Qt bot: http://build.webkit.org/results/Qt%20Linux%20Release/r70367%20%2822455%29/results.html 298345 10 71355 ossy 2010-10-23 00:46:18 -0700 Comment on attachment 71355 Patch remove r+ from landed and rolled-out patch 299869 11 ossy 2010-10-26 16:05:55 -0700 It seems crashes caused by buggy Qt 4.6.2 :/ I updated our bot to Qt 4.6.3 and tested https://bugs.webkit.org/attachment.cgi?id=71355 . It works for me without any regression. Sorry for roll-out and thanks for your help in debugging and finding the root of the crashes. 310540 12 andersca 2010-11-17 14:44:40 -0800 We decided not to land this after all, it was handled in http://trac.webkit.org/projects/webkit/changeset/72122 instead. 71348 2010-10-20 15:30:39 -0700 2010-10-20 16:26:52 -0700 Patch bug-48014-20101020153037.patch text/plain 1869 andersca ZGlmZiAtLWdpdCBhL1dlYkNvcmUvQ2hhbmdlTG9nIGIvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXgg OGVlM2I5YzQ0NjBkM2YxODNkZTc5MjE5YmUyYmNmZTk3MmFiM2E1Yi4uNjM0YzZkNDdhZDFkOWY1 MzNmZGRlYWIxZThlZGNjODJmYTVlYzA1MSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9DaGFuZ2VMb2cK KysrIGIvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMC0xMC0yMCAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIHRoZSBkZWNpZGVQb2xpY3lGb3JNSU1F VHlwZSBkZWxlZ2F0ZSBtZXNzYWdlIGluIGFuIGFzeW5jaHJvbm91cyBtYW5uZXIgZG9lcyBub3Qg d29yaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDgw MTQKKworICAgICAgICAqIGxvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwOgorICAgICAgICAo V2ViQ29yZTo6TWFpblJlc291cmNlTG9hZGVyOjpjb250aW51ZUFmdGVyQ29udGVudFBvbGljeSk6 CisgICAgICAgIFJlc3VtZSBsb2FkaW5nLgorCisgICAgICAgIChXZWJDb3JlOjpNYWluUmVzb3Vy Y2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIERlZmVyIGxvYWRpbmcgdW50 aWwgd2UgaGVhciBiYWNrIGZyb20gdGhlIHBvbGljeSBjbGllbnQuCisKIDIwMTAtMTAtMjAgIERh dmlkIEh5YXR0ICA8aHlhdHRAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IFNpbW9u IEZyYXNlci4KZGlmZiAtLWdpdCBhL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5j cHAgYi9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VMb2FkZXIuY3BwCmluZGV4IGFmMzBhMTE5 MTNkYmIwMGJiNDM3MTkxMWUwNTAzMjg0MzlmNDU5YWEuLmU2ZDQ0MTI5ZmIzOGNkYzg2MWRkZjJm MDAxNmY5ZDQwZTI2ZDg5ODkgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJj ZUxvYWRlci5jcHAKKysrIGIvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291cmNlTG9hZGVyLmNwcApA QCAtMjMxLDcgKzIzMSw5IEBAIHZvaWQgTWFpblJlc291cmNlTG9hZGVyOjpjb250aW51ZUFmdGVy Q29udGVudFBvbGljeShQb2xpY3lBY3Rpb24gY29udGVudFBvbGljeSwKIHsKICAgICBLVVJMIHVy bCA9IHJlcXVlc3QoKS51cmwoKTsKICAgICBjb25zdCBTdHJpbmcmIG1pbWVUeXBlID0gci5taW1l VHlwZSgpOwotICAgIAorCisgICAgc2V0RGVmZXJzTG9hZGluZyhmYWxzZSk7CisKICAgICBzd2l0 Y2ggKGNvbnRlbnRQb2xpY3kpIHsKICAgICBjYXNlIFBvbGljeVVzZTogewogICAgICAgICAvLyBQ cmV2ZW50IHJlbW90ZSB3ZWIgYXJjaGl2ZXMgZnJvbSBsb2FkaW5nIGJlY2F1c2UgdGhleSBjYW4g Y2xhaW0gdG8gYmUgZnJvbSBhbnkgZG9tYWluIGFuZCB0aHVzIGF2b2lkIGNyb3NzLWRvbWFpbiBz ZWN1cml0eSBjaGVja3MgKDQxMjAyNTUpLgpAQCAtMzczLDYgKzM3NSw5IEBAIHZvaWQgTWFpblJl c291cmNlTG9hZGVyOjpkaWRSZWNlaXZlUmVzcG9uc2UoY29uc3QgUmVzb3VyY2VSZXNwb25zZSYg cikKICAgICAvLyByZWZlcmVuY2UgdG8gdGhpcyBvYmplY3Q7IG9uZSBleGFtcGxlIG9mIHRoaXMg aXMgMzI2NjIxNi4KICAgICBSZWZQdHI8TWFpblJlc291cmNlTG9hZGVyPiBwcm90ZWN0KHRoaXMp OwogCisgICAgLy8gRGVmZXIgbG9hZGluZyB3aGlsZSB3ZSdyZSB3YWl0aW5nIGZvciBhIHJlc3Bv bnNlLgorICAgIHNldERlZmVyc0xvYWRpbmcodHJ1ZSk7CisgICAgCiAgICAgbV9kb2N1bWVudExv YWRlci0+c2V0UmVzcG9uc2Uocik7CiAKICAgICBtX3Jlc3BvbnNlID0gcjsK 71355 2010-10-20 16:26:55 -0700 2010-10-23 00:46:18 -0700 Patch bug-48014-20101020162654.patch text/plain 19246 andersca ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlZGJiMjhiOTkyODg1ZWRiZTZmZDliMWY4ZGNjNzIxZWE1YTk0ZTFhLi5lZTVlOGQw MzQ5MzRhNzZjZmQ3YjE0YmRkZjhhZmI5Y2YzZTlkNjFmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAK KzIwMTAtMTAtMjAgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2luZyB0aGUgZGVj aWRlUG9saWN5Rm9yTUlNRVR5cGUgZGVsZWdhdGUgbWVzc2FnZSBpbiBhbiBhc3luY2hyb25vdXMg bWFubmVyIGRvZXMgbm90IHdvcmsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTQ4MDE0CisKKyAgICAgICAgQWRkIHRlc3RzIGFuZCB1cGRhdGUgdGhlIHNr aXBwZWQgbGlzdC4KKworICAgICAgICAqIGZhc3QvbG9hZGVyL2RlY2lkZS1wb2xpY3ktZm9yLW1p bWUtdHlwZS1hc3luYy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGZhc3QvbG9hZGVy L2RlY2lkZS1wb2xpY3ktZm9yLW1pbWUtdHlwZS1hc3luYy5odG1sOiBBZGRlZC4KKyAgICAgICAg KiBwbGF0Zm9ybS9ndGsvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMtd2syL1NraXBw ZWQ6CisgICAgICAgICogcGxhdGZvcm0vcXQvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS9x dC13azIvU2tpcHBlZDoKKyAgICAgICAgKiBwbGF0Zm9ybS93aW4vU2tpcHBlZDoKKwogMjAxMC0x MC0yMCAgSmFtZXMgUm9iaW5zb24gIDxqYW1lc3JAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEZv bGxvdy11cCB0byA3MDE1NTogcmVuYW1lIGFuIGV4cGVjdGF0aW9uIHRvIC1leHBlY3RlZC50eHQK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2Zhc3QvbG9hZGVyL2RlY2lkZS1wb2xpY3ktZm9yLW1p bWUtdHlwZS1hc3luYy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9kZWNp ZGUtcG9saWN5LWZvci1taW1lLXR5cGUtYXN5bmMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjJk NmQzZmI1MzlmYTQ3NWY0NTBmNTVhNmU4NWI0YTViYzM5NjYzMTgKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9kZWNpZGUtcG9saWN5LWZvci1taW1lLXR5cGUtYXN5 bmMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorUG9saWN5IGRlbGVnYXRlOiBhdHRlbXB0 IHRvIGxvYWQgZGF0YTp0ZXh0L2h0bWwsSGVsbG8sJTIwSSUyMGFtJTIwYSUyMHN1YmZyYW1lISB3 aXRoIG5hdmlnYXRpb24gdHlwZSAnb3RoZXInCitUZXN0IGZvciBVc2luZyB0aGUgZGVjaWRlUG9s aWN5Rm9yTUlNRVR5cGUgZGVsZWdhdGUgbWVzc2FnZSBpbiBhbiBhc3luY2hyb25vdXMgbWFubmVy IGRvZXMgbm90IHdvcmsuIElmIHRoZSB0ZXN0IHBhc3NlcywgeW91IHNob3VsZCBzZWUgdGhlIHdv cmQgIlBBU1NFRCIgYmVsb3cuCisKK1BBU1NFRAorCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9m YXN0L2xvYWRlci9kZWNpZGUtcG9saWN5LWZvci1taW1lLXR5cGUtYXN5bmMuaHRtbCBiL0xheW91 dFRlc3RzL2Zhc3QvbG9hZGVyL2RlY2lkZS1wb2xpY3ktZm9yLW1pbWUtdHlwZS1hc3luYy5odG1s Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAuLjMxMTE4ZjhkNjg2ZGE3ZjQyMjY5OWZkYTk0ZGJkZTc0MDcxODhiNTQKLS0t IC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9mYXN0L2xvYWRlci9kZWNpZGUtcG9saWN5LWZv ci1taW1lLXR5cGUtYXN5bmMuaHRtbApAQCAtMCwwICsxLDI5IEBACis8IURPQ1RZUEUgaHRtbD4K KzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdD4KKyAgICAgICAgaWYgKHdpbmRvdy5sYXlvdXRU ZXN0Q29udHJvbGxlcikgeworICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuZHVtcEFz VGV4dCgpOworICAgICAgICAgICAgbGF5b3V0VGVzdENvbnRyb2xsZXIuc2V0Q3VzdG9tUG9saWN5 RGVsZWdhdGUodHJ1ZSwgdHJ1ZSwgdHJ1ZSk7CisgICAgICAgIH0KKworICAgICAgICB3aW5kb3cu b25sb2FkID0gZnVuY3Rpb24oKSB7CisgICAgICAgICAgICB2YXIgcmVzdWx0ID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3Jlc3VsdCcpCisgICAgICAgICAgICB2YXIgZnJhbWUgPSBkb2N1bWVu dC5nZXRFbGVtZW50QnlJZCgnZnJhbWUnKQorICAgICAgICAgICAgaWYgKCF3aW5kb3cubGF5b3V0 VGVzdENvbnRyb2xsZXIpIHsKKyAgICAgICAgICAgICAgICByZXN1bHQuaW5uZXJUZXh0ID0gIlRo aXMgdGVzdCBjYW4gb25seSBiZSBydW4gaW4gRHVtcFJlbmRlclRyZWUuIjsKKyAgICAgICAgICAg ICAgICByZXR1cm47CisgICAgICAgICAgICB9CisKKyAgICAgICAgICAgIC8vIFdlIHNob3VsZG4n dCBoYXZlIGFueSB0ZXh0IGluIHRoZSBmcmFtZSBzaW5jZSB0aGUgbG9hZCB3YXMgaWdub3JlZC4K KyAgICAgICAgICAgIGlmICghZnJhbWUuY29udGVudERvY3VtZW50LmRvY3VtZW50RWxlbWVudC5p bm5lclRleHQpCisgICAgICAgICAgICAgICAgcmVzdWx0LmlubmVyVGV4dCA9ICJQQVNTRUQiOwor ICAgICAgICB9CisgICAgPC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAgICA8cD5UZXN0IGZv ciA8YSBocmVmPSJodHRwOi8vd2Via2l0Lm9yZy9iLzQ4MDE0Ij5Vc2luZyB0aGUgZGVjaWRlUG9s aWN5Rm9yTUlNRVR5cGUgZGVsZWdhdGUgbWVzc2FnZSBpbiBhbiBhc3luY2hyb25vdXMgbWFubmVy IGRvZXMgbm90IHdvcms8L2E+LiBJZiB0aGUgdGVzdCBwYXNzZXMsIHlvdSBzaG91bGQgc2VlIHRo ZSB3b3JkICJQQVNTRUQiIGJlbG93LjwvcD4KKyAgICA8ZGl2IGlkPXJlc3VsdD5GQUlMRUQ8L2Rp dj4KKyAgICA8aWZyYW1lIGlkPSJmcmFtZSIgc3JjPSJkYXRhOnRleHQvaHRtbCxIZWxsbywgSSBh bSBhIHN1YmZyYW1lISI+PC9pZnJhbWU+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvU2tpcHBlZCBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0 ay9Ta2lwcGVkCmluZGV4IGVjM2NiNTA4Njk5MjNkOGVhYTMzMjIxNWIwOGVjOWVhYjEzNWIyY2Mu LjMxYjY4ZmRiZjY3NDllZjVkZGI0ODNjNDNlMmMwMDdkNTJiZjc4YTIgMTAwNjQ0Ci0tLSBhL0xh eW91dFRlc3RzL3BsYXRmb3JtL2d0ay9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9Ta2lwcGVkCkBAIC0xMTQ0LDYgKzExNDQsNyBAQCBmYXN0L2Zvcm1zL3RleHRmaWVsZC1v bmNoYW5nZS1kZWxldGlvbi5odG1sCiBmYXN0L2hpc3RvcnkvaGlzdG9yeV9yZWxvYWQuaHRtbAog ZmFzdC9oaXN0b3J5L3dpbmRvdy1vcGVuLmh0bWwKIGZhc3QvaHRtbC90YWItb3JkZXIuaHRtbAor ZmFzdC9sb2FkZXIvZGVjaWRlLXBvbGljeS1mb3ItbWltZS10eXBlLWFzeW5jLmh0bWwKIGZhc3Qv bG9hZGVyL21haW4tZG9jdW1lbnQtdXJsLWZvci1ub24taHR0cC1sb2Fkcy5odG1sCiBmYXN0L2xv YWRlci9vbmxvYWQtcG9saWN5LWlnbm9yZS1mb3ItZnJhbWUuaHRtbAogZmFzdC9sb2FkZXIvcG9s aWN5LWRlbGVnYXRlLWFjdGlvbi1oaXQtdGVzdC16b29tZWQuaHRtbApkaWZmIC0tZ2l0IGEvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v bWFjLXdrMi9Ta2lwcGVkCmluZGV4IGIyNzZiNzM4ZWM5MDRiZWJlY2RmMDY2NTQwNTRlZTRjNThl YWE4NTguLjZkMmQ2YzBlZmNiYzA1MjNiMzFmNGU1NWE1NzZhOTAxNjk0ZWM4MDkgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL3BsYXRmb3JtL21hYy13azIvU2tpcHBlZAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMtd2syL1NraXBwZWQKQEAgLTE1MjMsNiArMTUyMyw3IEBAIGZhc3QvZG9t L0dlb2xvY2F0aW9uL3RpbWVvdXQtemVyby5odG1sCiAKICMgV2ViS2l0VGVzdFJ1bm5lciBuZWVk cyBsYXlvdXRUZXN0Q29udHJvbGxlci5zZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZQogIyA8aHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNTQ2PgorZmFzdC9sb2FkZXIvZGVj aWRlLXBvbGljeS1mb3ItbWltZS10eXBlLWFzeW5jLmh0bWwKIGZhc3QvbG9hZGVyL2phdmFzY3Jp cHQtdXJsLWhpZXJhcmNoaWNhbC1leGVjdXRpb24uaHRtbAogZmFzdC9sb2FkZXIvb25sb2FkLXBv bGljeS1pZ25vcmUtZm9yLWZyYW1lLmh0bWwKIGZhc3QvbG9hZGVyL3JlbG9hZC1wb2xpY3ktZGVs ZWdhdGUuaHRtbApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQtd2syL1NraXBw ZWQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZAppbmRleCAyNWIwMjhjMWM0 MTY0ZWNhM2E4ZmE5YWY5ODNlNDc0MjQ2MTNlMmQyLi5kMzY2MDBlN2M5ZWI3Mjg3Mzg3OGRiNTNi OGQ4NjRiYmMwOGY4NzIwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIv U2tpcHBlZAorKysgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9xdC13azIvU2tpcHBlZApAQCAtMTQ3 Miw2ICsxNDcyLDcgQEAgZmFzdC9kb20vR2VvbG9jYXRpb24vdGltZW91dC16ZXJvLmh0bWwKIAog IyBXZWJLaXRUZXN0UnVubmVyIG5lZWRzIGxheW91dFRlc3RDb250cm9sbGVyLnNldEN1c3RvbVBv bGljeURlbGVnYXRlCiAjIDxodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 NDI1NDY+CitmYXN0L2xvYWRlci9kZWNpZGUtcG9saWN5LWZvci1taW1lLXR5cGUtYXN5bmMuaHRt bAogZmFzdC9sb2FkZXIvamF2YXNjcmlwdC11cmwtaGllcmFyY2hpY2FsLWV4ZWN1dGlvbi5odG1s CiBmYXN0L2xvYWRlci9vbmxvYWQtcG9saWN5LWlnbm9yZS1mb3ItZnJhbWUuaHRtbAogZmFzdC9s b2FkZXIvcmVsb2FkLXBvbGljeS1kZWxlZ2F0ZS5odG1sCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9xdC9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vcXQvU2tpcHBlZApp bmRleCBmZmIxZTM5ODk4YzhmNmI3YTkwN2EyOWQ2YTJkNWFiYWEyYzViNjg4Li4yZmY1N2IwZDY4 YjgzNzgzMGZmOTM1MjgzNjQ3OTFhMWZhNTQ0NDc1IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9w bGF0Zm9ybS9xdC9Ta2lwcGVkCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL3F0L1NraXBwZWQK QEAgLTEwMCw2ICsxMDAsNyBAQCBhY2Nlc3NpYmlsaXR5CiB0cmFuc2Zvcm1zLzNkCiBjb21wb3Np dGluZwogCitmYXN0L2xvYWRlci9kZWNpZGUtcG9saWN5LWZvci1taW1lLXR5cGUtYXN5bmMuaHRt bAogZmFzdC9sb2FkZXIvc3ViZnJhbWUtbmF2aWdhdGUtZHVyaW5nLW1haW4tZnJhbWUtbG9hZC5o dG1sCiAKICMgSHlwaGVuYXRpb24gaXMgbm90IGltcGxlbWVudGVkIHlldC4KZGlmZiAtLWdpdCBh L0xheW91dFRlc3RzL3BsYXRmb3JtL3dpbi9Ta2lwcGVkIGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0v d2luL1NraXBwZWQKaW5kZXggZDkyZmU2NmExODk4MjQyMjRmMDA0ZDdmNDA0YWQ4OTEwZmVhYTUz Ny4uZmJhZTNmZTE0YWQ2ZTBhY2M0NGFmOWI4NzliNDYwNTQ2NjYyOWEwMiAxMDA2NDQKLS0tIGEv TGF5b3V0VGVzdHMvcGxhdGZvcm0vd2luL1NraXBwZWQKKysrIGIvTGF5b3V0VGVzdHMvcGxhdGZv cm0vd2luL1NraXBwZWQKQEAgLTEwNDEsMyArMTA0MSw2IEBAIGZhc3QvZXZlbnRzL2NsaWNrLWZv Y3VzLWNvbnRyb2wuaHRtbAogCiAjIFJlcXVpcmVzIFdlYlAgc3VwcG9ydC4KIGZhc3QvaW1hZ2Vz L3dlYnAtaW1hZ2UtZGVjb2RpbmcuaHRtbAorCisjIE5lZWRzIG92ZWxyb2FkIG9mIHNldEN1c3Rv bVBvbGljeURlbGVnYXRlCitmYXN0L2xvYWRlci9kZWNpZGUtcG9saWN5LWZvci1taW1lLXR5cGUt YXN5bmMuaHRtbApkaWZmIC0tZ2l0IGEvV2ViQ29yZS9DaGFuZ2VMb2cgYi9XZWJDb3JlL0NoYW5n ZUxvZwppbmRleCA4ZWUzYjljNDQ2MGQzZjE4M2RlNzkyMTliZTJiY2ZlOTcyYWIzYTViLi42MzRj NmQ0N2FkMWQ5ZjUzM2ZkZGVhYjFlOGVkY2M4MmZhNWVjMDUxIDEwMDY0NAotLS0gYS9XZWJDb3Jl L0NoYW5nZUxvZworKysgYi9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDEw LTEwLTIwICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXNpbmcgdGhlIGRlY2lkZVBv bGljeUZvck1JTUVUeXBlIGRlbGVnYXRlIG1lc3NhZ2UgaW4gYW4gYXN5bmNocm9ub3VzIG1hbm5l ciBkb2VzIG5vdCB3b3JrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD00ODAxNAorCisgICAgICAgICogbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNYWluUmVzb3VyY2VMb2FkZXI6OmNvbnRpbnVlQWZ0ZXJDb250 ZW50UG9saWN5KToKKyAgICAgICAgUmVzdW1lIGxvYWRpbmcuCisKKyAgICAgICAgKFdlYkNvcmU6 Ok1haW5SZXNvdXJjZUxvYWRlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgRGVmZXIg bG9hZGluZyB1bnRpbCB3ZSBoZWFyIGJhY2sgZnJvbSB0aGUgcG9saWN5IGNsaWVudC4KKwogMjAx MC0xMC0yMCAgRGF2aWQgSHlhdHQgIDxoeWF0dEBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2aWV3 ZWQgYnkgU2ltb24gRnJhc2VyLgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9sb2FkZXIvTWFpblJlc291 cmNlTG9hZGVyLmNwcCBiL1dlYkNvcmUvbG9hZGVyL01haW5SZXNvdXJjZUxvYWRlci5jcHAKaW5k ZXggYWYzMGExMTkxM2RiYjAwYmI0MzcxOTExZTA1MDMyODQzOWY0NTlhYS4uZTZkNDQxMjlmYjM4 Y2RjODYxZGRmMmYwMDE2ZjlkNDBlMjZkODk4OSAxMDA2NDQKLS0tIGEvV2ViQ29yZS9sb2FkZXIv TWFpblJlc291cmNlTG9hZGVyLmNwcAorKysgYi9XZWJDb3JlL2xvYWRlci9NYWluUmVzb3VyY2VM b2FkZXIuY3BwCkBAIC0yMzEsNyArMjMxLDkgQEAgdm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmNv bnRpbnVlQWZ0ZXJDb250ZW50UG9saWN5KFBvbGljeUFjdGlvbiBjb250ZW50UG9saWN5LAogewog ICAgIEtVUkwgdXJsID0gcmVxdWVzdCgpLnVybCgpOwogICAgIGNvbnN0IFN0cmluZyYgbWltZVR5 cGUgPSByLm1pbWVUeXBlKCk7Ci0gICAgCisKKyAgICBzZXREZWZlcnNMb2FkaW5nKGZhbHNlKTsK KwogICAgIHN3aXRjaCAoY29udGVudFBvbGljeSkgewogICAgIGNhc2UgUG9saWN5VXNlOiB7CiAg ICAgICAgIC8vIFByZXZlbnQgcmVtb3RlIHdlYiBhcmNoaXZlcyBmcm9tIGxvYWRpbmcgYmVjYXVz ZSB0aGV5IGNhbiBjbGFpbSB0byBiZSBmcm9tIGFueSBkb21haW4gYW5kIHRodXMgYXZvaWQgY3Jv c3MtZG9tYWluIHNlY3VyaXR5IGNoZWNrcyAoNDEyMDI1NSkuCkBAIC0zNzMsNiArMzc1LDkgQEAg dm9pZCBNYWluUmVzb3VyY2VMb2FkZXI6OmRpZFJlY2VpdmVSZXNwb25zZShjb25zdCBSZXNvdXJj ZVJlc3BvbnNlJiByKQogICAgIC8vIHJlZmVyZW5jZSB0byB0aGlzIG9iamVjdDsgb25lIGV4YW1w bGUgb2YgdGhpcyBpcyAzMjY2MjE2LgogICAgIFJlZlB0cjxNYWluUmVzb3VyY2VMb2FkZXI+IHBy b3RlY3QodGhpcyk7CiAKKyAgICAvLyBEZWZlciBsb2FkaW5nIHdoaWxlIHdlJ3JlIHdhaXRpbmcg Zm9yIGEgcmVzcG9uc2UuCisgICAgc2V0RGVmZXJzTG9hZGluZyh0cnVlKTsKKyAgICAKICAgICBt X2RvY3VtZW50TG9hZGVyLT5zZXRSZXNwb25zZShyKTsKIAogICAgIG1fcmVzcG9uc2UgPSByOwpk aWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvQ2hhbmdlTG9nIGIvV2ViS2l0VG9vbHMvQ2hhbmdlTG9n CmluZGV4IGNjM2FhZjk5NTA1Mjk2MzIyNDAxZjJiMTcyODdiOGU5OTY5M2U1YzQuLjllNjY2MDVi Y2ZkMmI5OWNkMWUwODMxMjc2YTRjOGFhYmUxY2Y2Y2YgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xz L0NoYW5nZUxvZworKysgYi9XZWJLaXRUb29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwzOCBAQAor MjAxMC0xMC0yMCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVzaW5nIHRoZSBkZWNp ZGVQb2xpY3lGb3JNSU1FVHlwZSBkZWxlZ2F0ZSBtZXNzYWdlIGluIGFuIGFzeW5jaHJvbm91cyBt YW5uZXIgZG9lcyBub3Qgd29yaworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NDgwMTQKKyAgICAgICAgCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvTGF5 b3V0VGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoc2V0Q3VzdG9tUG9saWN5RGVsZWdhdGVD YWxsYmFjayk6CisgICAgICAgIEFkZCBjYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlw ZUFmdGVyT25lU2Vjb25kIGFyZ3VtZW50LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvZ3Rr L0xheW91dFRlc3RDb250cm9sbGVyR3RrLmNwcDoKKyAgICAgICAgKExheW91dFRlc3RDb250cm9s bGVyOjpzZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZSk6CisgICAgICAgIEFkZCBjYWxsSWdub3JlSW5E ZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFmdGVyT25lU2Vjb25kIGFyZ3VtZW50LgorCisgICAgICAg ICogRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFjLm1tOgorICAgICAg ICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEN1c3RvbVBvbGljeURlbGVnYXRlKToKKyAgICAg ICAgQWRkIGNhbGxJZ25vcmVJbkRlY2lkZVBvbGljeUZvck1JTUVUeXBlQWZ0ZXJPbmVTZWNvbmQg YXJndW1lbnQuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvUG9saWN5RGVsZWdhdGUu aDoKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9tYWMvUG9saWN5RGVsZWdhdGUubW06CisgICAg ICAgICgtW1BvbGljeURlbGVnYXRlIHdlYlZpZXc6ZGVjaWRlUG9saWN5Rm9yTUlNRVR5cGU6cmVx dWVzdDpmcmFtZTpkZWNpc2lvbkxpc3RlbmVyOl0pOgorICAgICAgICBJZiBfY2FsbElnbm9yZUlu RGVjaWRlUG9saWN5Rm9yTUlNRVR5cGVBZnRlck9uZVNlY29uZCBpcyB0cnVlLCBjYWxsIFtsaXN0 ZW5lciBpZ25vcmVdIGFmdGVyIG9uZSBzZWNvbmQuCisKKyAgICAgICAgKC1bUG9saWN5RGVsZWdh dGUgc2V0Q2FsbElnbm9yZUluRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGVBZnRlck9uZVNlY29uZDpd KToKKyAgICAgICAgVXBkYXRlIF9jYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFm dGVyT25lU2Vjb25kLgorICAgICAgICAKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS93aW4vTGF5 b3V0VGVzdENvbnRyb2xsZXJXaW4uY3BwOgorICAgICAgICAoTGF5b3V0VGVzdENvbnRyb2xsZXI6 OnNldEN1c3RvbVBvbGljeURlbGVnYXRlKToKKyAgICAgICAgQWRkIGNhbGxJZ25vcmVJbkRlY2lk ZVBvbGljeUZvck1JTUVUeXBlQWZ0ZXJPbmVTZWNvbmQgYXJndW1lbnQuCisKKyAgICAgICAgKiBE dW1wUmVuZGVyVHJlZS93eC9MYXlvdXRUZXN0Q29udHJvbGxlcld4LmNwcDoKKyAgICAgICAgKExh eW91dFRlc3RDb250cm9sbGVyOjpzZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZSk6CisgICAgICAgIEFk ZCBjYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFmdGVyT25lU2Vjb25kIGFyZ3Vt ZW50LgorCiAyMDEwLTEwLTIwICBTaGVyaWZmIEJvdCAgPHdlYmtpdC5yZXZpZXcuYm90QGdtYWls LmNvbT4KIAogICAgICAgICBVbnJldmlld2VkLCByb2xsaW5nIG91dCByNzAxNDkuCmRpZmYgLS1n aXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRy ZWUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagppbmRleCBhY2RhYzNkNDZjYTIxZDNmNzI5N2Iy N2MxYThlNzE5OGI3N2Q1MzUwLi40MTE0NTQxMTA1NTY2YmIyYzg5NzI1MjQ5NmExYTJjMTcwZTUz YWM0IDEwMDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJl ZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJU cmVlL0R1bXBSZW5kZXJUcmVlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTY5NCw3ICs2 OTQsMTQgQEAKIAkJCWlzYSA9IFBCWFByb2plY3Q7CiAJCQlidWlsZENvbmZpZ3VyYXRpb25MaXN0 ID0gMTQ5QzI5QzMwODkwMkM2RDAwOEE5RUZDIC8qIEJ1aWxkIGNvbmZpZ3VyYXRpb24gbGlzdCBm b3IgUEJYUHJvamVjdCAiRHVtcFJlbmRlclRyZWUiICovOwogCQkJY29tcGF0aWJpbGl0eVZlcnNp b24gPSAiWGNvZGUgMi40IjsKKwkJCWRldmVsb3BtZW50UmVnaW9uID0gRW5nbGlzaDsKIAkJCWhh c1NjYW5uZWRGb3JFbmNvZGluZ3MgPSAxOworCQkJa25vd25SZWdpb25zID0gKAorCQkJCUVuZ2xp c2gsCisJCQkJSmFwYW5lc2UsCisJCQkJRnJlbmNoLAorCQkJCUdlcm1hbiwKKwkJCSk7CiAJCQlt YWluR3JvdXAgPSAwOEZCNzc5NEZFODQxNTVEQzAyQUFDMDcgLyogRHVtcFJlbmRlclRyZWUgKi87 CiAJCQlwcm9kdWN0UmVmR3JvdXAgPSA5MzQwOTk1NTA4NTQwQ0FGMDA3RjNCQzggLyogUHJvZHVj dHMgKi87CiAJCQlwcm9qZWN0RGlyUGF0aCA9ICIiOwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwIGIvV2ViS2l0VG9vbHMvRHVt cFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCmluZGV4IGI1Y2M4NzQyMTViNDBm NTkwNzU1YTQwNDdlYmRkNWQ5ZjhlZDYyNzkuLjYzZDAwZDlhZGQxMzc2ZmZiNDkwNjk4ZDFiMWVl OTFiMWIzZjk3YTMgMTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91 dFRlc3RDb250cm9sbGVyLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9MYXlv dXRUZXN0Q29udHJvbGxlci5jcHAKQEAgLTk3MSw4ICs5NzEsMTIgQEAgc3RhdGljIEpTVmFsdWVS ZWYgc2V0Q3VzdG9tUG9saWN5RGVsZWdhdGVDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwg SlNPYmplY3QKICAgICBpZiAoYXJndW1lbnRDb3VudCA+PSAyKQogICAgICAgICBwZXJtaXNzaXZl ID0gSlNWYWx1ZVRvQm9vbGVhbihjb250ZXh0LCBhcmd1bWVudHNbMV0pOwogCisgICAgYm9vbCBj YWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFmdGVyT25lU2Vjb25kID0gZmFsc2U7 CisgICAgaWYgKGFyZ3VtZW50Q291bnQgPj0gMykKKyAgICAgICAgY2FsbElnbm9yZUluRGVjaWRl UG9saWN5Rm9yTUlNRVR5cGVBZnRlck9uZVNlY29uZCA9IEpTVmFsdWVUb0Jvb2xlYW4oY29udGV4 dCwgYXJndW1lbnRzWzJdKTsKKyAgICAKICAgICBMYXlvdXRUZXN0Q29udHJvbGxlciogY29udHJv bGxlciA9IHN0YXRpY19jYXN0PExheW91dFRlc3RDb250cm9sbGVyKj4oSlNPYmplY3RHZXRQcml2 YXRlKHRoaXNPYmplY3QpKTsKLSAgICBjb250cm9sbGVyLT5zZXRDdXN0b21Qb2xpY3lEZWxlZ2F0 ZShKU1ZhbHVlVG9Cb29sZWFuKGNvbnRleHQsIGFyZ3VtZW50c1swXSksIHBlcm1pc3NpdmUpOwor ICAgIGNvbnRyb2xsZXItPnNldEN1c3RvbVBvbGljeURlbGVnYXRlKEpTVmFsdWVUb0Jvb2xlYW4o Y29udGV4dCwgYXJndW1lbnRzWzBdKSwgcGVybWlzc2l2ZSwgY2FsbElnbm9yZUluRGVjaWRlUG9s aWN5Rm9yTUlNRVR5cGVBZnRlck9uZVNlY29uZCk7CiAKICAgICByZXR1cm4gSlNWYWx1ZU1ha2VV bmRlZmluZWQoY29udGV4dCk7CiB9CmRpZmYgLS1naXQgYS9XZWJLaXRUb29scy9EdW1wUmVuZGVy VHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUv TGF5b3V0VGVzdENvbnRyb2xsZXIuaAppbmRleCA2ODllMTE0NTc1MDhkZmZlN2Q4ODdiZGUxNjQ4 MjE0MGJhNzViYzFhLi4zOWUzNzVhNjU5NTFjNTA5YjcxNjJlNzcwYmNmZjcwYTAxM2QwMDFjIDEw MDY0NAotLS0gYS9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxl ci5oCisrKyBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVy LmgKQEAgLTg0LDcgKzg0LDcgQEAgcHVibGljOgogICAgIHZvaWQgc2V0QXBwbGljYXRpb25DYWNo ZU9yaWdpblF1b3RhKHVuc2lnbmVkIGxvbmcgbG9uZyBxdW90YSk7CiAgICAgdm9pZCBzZXRBdXRo b3JBbmRVc2VyU3R5bGVzRW5hYmxlZChib29sKTsKICAgICB2b2lkIHNldENhY2hlTW9kZWwoaW50 KTsKLSAgICB2b2lkIHNldEN1c3RvbVBvbGljeURlbGVnYXRlKGJvb2wgc2V0RGVsZWdhdGUsIGJv b2wgcGVybWlzc2l2ZSk7CisgICAgdm9pZCBzZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZShib29sIHNl dERlbGVnYXRlLCBib29sIHBlcm1pc3NpdmUsIGJvb2wgY2FsbElnbm9yZUluRGVjaWRlUG9saWN5 Rm9yTUlNRVR5cGVBZnRlck9uZVNlY29uZCk7CiAgICAgdm9pZCBzZXREYXRhYmFzZVF1b3RhKHVu c2lnbmVkIGxvbmcgbG9uZyBxdW90YSk7CiAgICAgdm9pZCBzZXREb21haW5SZWxheGF0aW9uRm9y YmlkZGVuRm9yVVJMU2NoZW1lKGJvb2wgZm9yYmlkZGVuLCBKU1N0cmluZ1JlZiBzY2hlbWUpOwog ICAgIHZvaWQgc2V0SWNvbkRhdGFiYXNlRW5hYmxlZChib29sIGljb25EYXRhYmFzZUVuYWJsZWQp OwpkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRlc3RD b250cm9sbGVyR3RrLmNwcCBiL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL2d0ay9MYXlvdXRU ZXN0Q29udHJvbGxlckd0ay5jcHAKaW5kZXggMTgxZWY5ZjBiMjljZTYwOThiMThiZDY0MDNlMWVj YWIxOGUwM2I0NC4uMWEzMDY2MzY4NDEwMTBiMWVlZjUzMDBhMWI0YWQ5MmJhMWJkODhmOCAxMDA2 NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvZ3RrL0xheW91dFRlc3RDb250cm9s bGVyR3RrLmNwcAorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9ndGsvTGF5b3V0VGVz dENvbnRyb2xsZXJHdGsuY3BwCkBAIC0yNjgsNyArMjY4LDcgQEAgdm9pZCBMYXlvdXRUZXN0Q29u dHJvbGxlcjo6c2V0QWx3YXlzQWNjZXB0Q29va2llcyhib29sIGFsd2F5c0FjY2VwdENvb2tpZXMp CiAjZW5kaWYKIH0KIAotdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Q3VzdG9tUG9saWN5 RGVsZWdhdGUoYm9vbCBzZXREZWxlZ2F0ZSwgYm9vbCBwZXJtaXNzaXZlKQordm9pZCBMYXlvdXRU ZXN0Q29udHJvbGxlcjo6c2V0Q3VzdG9tUG9saWN5RGVsZWdhdGUoYm9vbCBzZXREZWxlZ2F0ZSwg Ym9vbCBwZXJtaXNzaXZlLCBib29sIGNhbGxJZ25vcmVJbkRlY2lkZVBvbGljeUZvck1JTUVUeXBl QWZ0ZXJPbmVTZWNvbmQpCiB7CiAgICAgLy8gRklYTUU6IGltcGxlbWVudAogfQpkaWZmIC0tZ2l0 IGEvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVyTWFj Lm1tIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL0xheW91dFRlc3RDb250cm9sbGVy TWFjLm1tCmluZGV4IGM1ZDVhOTA2OTU5OWJhNGJjZmMyYWNhMzExYzdhM2E3NjVhYjVlMWQuLmM5 N2E0ZGYwYTFhOGZhZjBiMmVhMjk5YjBmMTNiODJlMDcyOWQxYjcgMTAwNjQ0Ci0tLSBhL1dlYktp dFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9MYXlvdXRUZXN0Q29udHJvbGxlck1hYy5tbQorKysg Yi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvTGF5b3V0VGVzdENvbnRyb2xsZXJNYWMu bW0KQEAgLTMxOSw5ICszMTksMTAgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QXV0 aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQoYm9vbCBmbGFnKQogICAgIFtbW21haW5GcmFtZSB3ZWJW aWV3XSBwcmVmZXJlbmNlc10gc2V0QXV0aG9yQW5kVXNlclN0eWxlc0VuYWJsZWQ6ZmxhZ107CiB9 CiAKLXZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEN1c3RvbVBvbGljeURlbGVnYXRlKGJv b2wgc2V0RGVsZWdhdGUsIGJvb2wgcGVybWlzc2l2ZSkKK3ZvaWQgTGF5b3V0VGVzdENvbnRyb2xs ZXI6OnNldEN1c3RvbVBvbGljeURlbGVnYXRlKGJvb2wgc2V0RGVsZWdhdGUsIGJvb2wgcGVybWlz c2l2ZSwgYm9vbCBjYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFmdGVyT25lU2Vj b25kKQogewogICAgIGlmIChzZXREZWxlZ2F0ZSkgeworICAgICAgICBbcG9saWN5RGVsZWdhdGUg c2V0Q2FsbElnbm9yZUluRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGVBZnRlck9uZVNlY29uZDpjYWxs SWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFmdGVyT25lU2Vjb25kXTsKICAgICAgICAg W3BvbGljeURlbGVnYXRlIHNldFBlcm1pc3NpdmU6cGVybWlzc2l2ZV07CiAgICAgICAgIFtbbWFp bkZyYW1lIHdlYlZpZXddIHNldFBvbGljeURlbGVnYXRlOnBvbGljeURlbGVnYXRlXTsKICAgICB9 IGVsc2UKZGlmZiAtLWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Qb2xpY3lE ZWxlZ2F0ZS5oIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvbWFjL1BvbGljeURlbGVnYXRl LmgKaW5kZXggM2I5NTQ1NTdkNzM2MzJmODBlOTMzMmUxMzhkNGU0OGNjMTdlYmYzMS4uZTc5ZGY5 ZDljM2Q1MzY3OWE0YTI3Nzg0NGZiYjgxMjMyMWNlYmI2ZSAxMDA2NDQKLS0tIGEvV2ViS2l0VG9v bHMvRHVtcFJlbmRlclRyZWUvbWFjL1BvbGljeURlbGVnYXRlLmgKKysrIGIvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvbWFjL1BvbGljeURlbGVnYXRlLmgKQEAgLTMxLDExICszMSwxMyBAQAog Y2xhc3MgTGF5b3V0VGVzdENvbnRyb2xsZXI7CiAKIEBpbnRlcmZhY2UgUG9saWN5RGVsZWdhdGUg OiBOU09iamVjdCB7Ci0gICAgQk9PTCBwZXJtaXNzaXZlRGVsZWdhdGU7Ci0gICAgTGF5b3V0VGVz dENvbnRyb2xsZXIqIGNvbnRyb2xsZXJUb05vdGlmeURvbmU7CisgICAgQk9PTCBfcGVybWlzc2l2 ZURlbGVnYXRlOworICAgIEJPT0wgX2NhbGxJZ25vcmVJbkRlY2lkZVBvbGljeUZvck1JTUVUeXBl QWZ0ZXJPbmVTZWNvbmQ7CisgICAgTGF5b3V0VGVzdENvbnRyb2xsZXIqIF9jb250cm9sbGVyVG9O b3RpZnlEb25lOwogfQogCiAtICh2b2lkKXNldFBlcm1pc3NpdmU6KEJPT0wpcGVybWlzc2l2ZTsK Ky0gKHZvaWQpc2V0Q2FsbElnbm9yZUluRGVjaWRlUG9saWN5Rm9yTUlNRVR5cGVBZnRlck9uZVNl Y29uZDooQk9PTCljYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1FVHlwZUFmdGVyT25lU2Vj b25kOwogLSAodm9pZClzZXRDb250cm9sbGVyVG9Ob3RpZnlEb25lOihMYXlvdXRUZXN0Q29udHJv bGxlciopY29udHJvbGxlcjsKIAogQGVuZApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvbWFjL1BvbGljeURlbGVnYXRlLm1tIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRy ZWUvbWFjL1BvbGljeURlbGVnYXRlLm1tCmluZGV4IDY5MzVlYTcyMTdhZThmMjVmNGNlODM2MTE0 YjJjMzM4NDcyNjM2YjQuLjVlZGU2NWNmNjMwZGY4ZGE1ZWZiMGQ4ZjhjOTE0ZDRkNTBkMmJhNDUg MTAwNjQ0Ci0tLSBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL21hYy9Qb2xpY3lEZWxlZ2F0 ZS5tbQorKysgYi9XZWJLaXRUb29scy9EdW1wUmVuZGVyVHJlZS9tYWMvUG9saWN5RGVsZWdhdGUu bW0KQEAgLTgzLDMxICs4Myw0OSBAQCAtICh2b2lkKXdlYlZpZXc6KFdlYlZpZXcgKil3ZWJWaWV3 IGRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246KE5TRGljdGlvbmFyeQogCiAgICAgcHJp bnRmKCIlc1xuIiwgW21lc3NhZ2UgVVRGOFN0cmluZ10pOwogCi0gICAgaWYgKHBlcm1pc3NpdmVE ZWxlZ2F0ZSkKKyAgICBpZiAoX3Blcm1pc3NpdmVEZWxlZ2F0ZSkKICAgICAgICAgW2xpc3RlbmVy IHVzZV07CiAgICAgZWxzZQogICAgICAgICBbbGlzdGVuZXIgaWdub3JlXTsKIAotICAgIGlmIChj b250cm9sbGVyVG9Ob3RpZnlEb25lKSB7Ci0gICAgICAgIGNvbnRyb2xsZXJUb05vdGlmeURvbmUt Pm5vdGlmeURvbmUoKTsKLSAgICAgICAgY29udHJvbGxlclRvTm90aWZ5RG9uZSA9IDA7CisgICAg aWYgKF9jb250cm9sbGVyVG9Ob3RpZnlEb25lKSB7CisgICAgICAgIF9jb250cm9sbGVyVG9Ob3Rp ZnlEb25lLT5ub3RpZnlEb25lKCk7CisgICAgICAgIF9jb250cm9sbGVyVG9Ob3RpZnlEb25lID0g MDsKICAgICB9CiB9CiAKKy0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgZGVjaWRl UG9saWN5Rm9yTUlNRVR5cGU6KE5TU3RyaW5nICopdHlwZQorICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVx dWVzdAorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICBmcmFtZTooV2ViRnJhbWUgKilmcmFtZQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgZGVjaXNpb25MaXN0ZW5lcjooaWQ8V2ViUG9saWN5RGVjaXNpb25MaXN0ZW5l cj4pbGlzdGVuZXIKK3sKKyAgICBpZiAoIV9jYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JNSU1F VHlwZUFmdGVyT25lU2Vjb25kKSB7CisgICAgICAgIFtsaXN0ZW5lciB1c2VdOworICAgICAgICBy ZXR1cm47CisgICAgfQorCisgICAgWyhOU09iamVjdCAqKWxpc3RlbmVyIHBlcmZvcm1TZWxlY3Rv cjpAc2VsZWN0b3IoaWdub3JlKSB3aXRoT2JqZWN0Om5pbCBhZnRlckRlbGF5OjEuMF07Cit9CisK IC0gKHZvaWQpd2ViVmlldzooV2ViVmlldyAqKXdlYlZpZXcgdW5hYmxlVG9JbXBsZW1lbnRQb2xp Y3lXaXRoRXJyb3I6KE5TRXJyb3IgKillcnJvciBmcmFtZTooV2ViRnJhbWUgKilmcmFtZQogewog ICAgIE5TU3RyaW5nICptZXNzYWdlID0gW05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJQb2xp Y3kgZGVsZWdhdGU6IHVuYWJsZSB0byBpbXBsZW1lbnQgcG9saWN5IHdpdGggZXJyb3IgZG9tYWlu ICclQCcsIGVycm9yIGNvZGUgJWQsIGluIGZyYW1lICclQCciLCBbZXJyb3IgZG9tYWluXSwgW2Vy cm9yIGNvZGVdLCBbZnJhbWUgbmFtZV1dOwogICAgIHByaW50ZigiJXNcbiIsIFttZXNzYWdlIFVU RjhTdHJpbmddKTsKIH0KIAorLSAodm9pZClzZXRDYWxsSWdub3JlSW5EZWNpZGVQb2xpY3lGb3JN SU1FVHlwZUFmdGVyT25lU2Vjb25kOihCT09MKWNhbGxJZ25vcmVJbkRlY2lkZVBvbGljeUZvck1J TUVUeXBlQWZ0ZXJPbmVTZWNvbmQKK3sKKyAgICBfY2FsbElnbm9yZUluRGVjaWRlUG9saWN5Rm9y TUlNRVR5cGVBZnRlck9uZVNlY29uZCA9IGNhbGxJZ25vcmVJbkRlY2lkZVBvbGljeUZvck1JTUVU eXBlQWZ0ZXJPbmVTZWNvbmQ7Cit9CisKIC0gKHZvaWQpc2V0UGVybWlzc2l2ZTooQk9PTClwZXJt aXNzaXZlCiB7Ci0gICAgcGVybWlzc2l2ZURlbGVnYXRlID0gcGVybWlzc2l2ZTsKKyAgICBfcGVy bWlzc2l2ZURlbGVnYXRlID0gcGVybWlzc2l2ZTsKIH0KIAogLSAodm9pZClzZXRDb250cm9sbGVy VG9Ob3RpZnlEb25lOihMYXlvdXRUZXN0Q29udHJvbGxlciopY29udHJvbGxlcgogewotICAgIGNv bnRyb2xsZXJUb05vdGlmeURvbmUgPSBjb250cm9sbGVyOworICAgIF9jb250cm9sbGVyVG9Ob3Rp ZnlEb25lID0gY29udHJvbGxlcjsKIH0KIAogQGVuZApkaWZmIC0tZ2l0IGEvV2ViS2l0VG9vbHMv RHVtcFJlbmRlclRyZWUvd2luL0xheW91dFRlc3RDb250cm9sbGVyV2luLmNwcCBiL1dlYktpdFRv b2xzL0R1bXBSZW5kZXJUcmVlL3dpbi9MYXlvdXRUZXN0Q29udHJvbGxlcldpbi5jcHAKaW5kZXgg ZDIxNDBkMTA1MzJmMjhkNzNmY2JlMTM5MWMyMTM1Mzk0ZWQxODI4ZC4uMWRmYzM2YTYzMTRkMWRj OTg4YjRhNTMzYTBlYmQxNGYyMzMyZTY4MiAxMDA2NDQKLS0tIGEvV2ViS2l0VG9vbHMvRHVtcFJl bmRlclRyZWUvd2luL0xheW91dFRlc3RDb250cm9sbGVyV2luLmNwcAorKysgYi9XZWJLaXRUb29s cy9EdW1wUmVuZGVyVHJlZS93aW4vTGF5b3V0VGVzdENvbnRyb2xsZXJXaW4uY3BwCkBAIC0zNjgs NyArMzY4LDcgQEAgdm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0QXV0aG9yQW5kVXNlclN0 eWxlc0VuYWJsZWQoYm9vbCBmbGFnKQogICAgIHByZWZzUHJpdmF0ZS0+c2V0QXV0aG9yQW5kVXNl clN0eWxlc0VuYWJsZWQoZmxhZyk7CiB9CiAKLXZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNl dEN1c3RvbVBvbGljeURlbGVnYXRlKGJvb2wgc2V0RGVsZWdhdGUsIGJvb2wgcGVybWlzc2l2ZSkK K3ZvaWQgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnNldEN1c3RvbVBvbGljeURlbGVnYXRlKGJvb2wg c2V0RGVsZWdhdGUsIGJvb2wgcGVybWlzc2l2ZSwgLCBib29sIGNhbGxJZ25vcmVJbkRlY2lkZVBv bGljeUZvck1JTUVUeXBlQWZ0ZXJPbmVTZWNvbmQpCiB7CiAgICAgQ09NUHRyPElXZWJWaWV3PiB3 ZWJWaWV3OwogICAgIGlmIChGQUlMRUQoZnJhbWUtPndlYlZpZXcoJndlYlZpZXcpKSkKZGlmZiAt LWdpdCBhL1dlYktpdFRvb2xzL0R1bXBSZW5kZXJUcmVlL3d4L0xheW91dFRlc3RDb250cm9sbGVy V3guY3BwIGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd3gvTGF5b3V0VGVzdENvbnRyb2xs ZXJXeC5jcHAKaW5kZXggZWVmYzU4NzgxZTBhMWVhYmNkMGZkODEzODkzMmNjNDNjNGQ3ODQ3Zi4u MjI1NTRjOTkzYTUwMzJhMzZjYzNlYTUzZjhkNDdkZmFiNGU2ZTQwYSAxMDA2NDQKLS0tIGEvV2Vi S2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd3gvTGF5b3V0VGVzdENvbnRyb2xsZXJXeC5jcHAKKysr IGIvV2ViS2l0VG9vbHMvRHVtcFJlbmRlclRyZWUvd3gvTGF5b3V0VGVzdENvbnRyb2xsZXJXeC5j cHAKQEAgLTEwNyw3ICsxMDcsNyBAQCB2b2lkIExheW91dFRlc3RDb250cm9sbGVyOjpzZXRBbHdh eXNBY2NlcHRDb29raWVzKGJvb2wgYWx3YXlzQWNjZXB0Q29va2llcykKICAgICAvLyBGSVhNRTog SW1wbGVtZW50IHRoaXMgKGFuZCByZXN0b3JlIHRoZSBkZWZhdWx0IHZhbHVlIGJlZm9yZSBydW5u aW5nIGVhY2ggdGVzdCBpbiBEdW1wUmVuZGVyVHJlZS5jcHApLgogfQogCi12b2lkIExheW91dFRl c3RDb250cm9sbGVyOjpzZXRDdXN0b21Qb2xpY3lEZWxlZ2F0ZShib29sLCBib29sKQordm9pZCBM YXlvdXRUZXN0Q29udHJvbGxlcjo6c2V0Q3VzdG9tUG9saWN5RGVsZWdhdGUoYm9vbCwgYm9vbCwg Ym9vbCkKIHsKICAgICAvLyBGSVhNRTogaW1wbGVtZW50CiB9Cg==