166801 2017-01-07 02:44:17 -0800 Add the ability to create empty contentEditable windows in MiniBrowser 2020-04-30 11:46:41 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 211243 1 thorton thorton bdakin enrica mitz simon.fraser wenson_hsieh oldest_to_newest 1264681 0 thorton 2017-01-07 02:44:17 -0800 Add the ability to create empty contentEditable windows in MiniBrowser 1264682 1 298265 thorton 2017-01-07 02:45:03 -0800 Created attachment 298265 Patch 1264683 2 298266 thorton 2017-01-07 03:35:10 -0800 Created attachment 298266 Patch 1264698 3 298274 thorton 2017-01-07 05:12:47 -0800 Created attachment 298274 Patch 1264717 4 298274 wenson_hsieh 2017-01-07 11:49:55 -0800 Comment on attachment 298274 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=298274&action=review > Tools/MiniBrowser/mac/AppDelegate.m:152 > + I don't think the newline here adds much. > Tools/MiniBrowser/mac/BrowserWindowController.h:83 > +@property (nonatomic, assign, getter=isEditable) BOOL editable; Do we need an explicit @synthesize here, or implement -isEditable? It looks like the bots are not happy about it. 1264731 5 298274 thorton 2017-01-07 13:11:20 -0800 Comment on attachment 298274 Patch Clearing flags on attachment: 298274 Committed r210483: <http://trac.webkit.org/changeset/210483> 1264732 6 thorton 2017-01-07 13:11:24 -0800 All reviewed patches have been landed. Closing bug. 1264741 7 thorton 2017-01-07 13:14:26 -0800 Oop, you're right. I will fix it. 1264742 8 thorton 2017-01-07 13:15:09 -0800 (silly 32-bit) 298265 2017-01-07 02:45:03 -0800 2017-01-07 03:35:06 -0800 Patch bug-166801-20170107024332.patch text/plain 10887 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYwYmM2Y2MwYzM4N2Y0NGJjZDU5ZWE4OTQyZDJkN2M4 NTJhOTNmOC4uNjJmMTZmNmIyZWI1ODYxZmUyMGVkZTU4YzE4NjVmNzI4MzdiMWIzMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI4 IEBACiAyMDE3LTAxLTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBjcmVhdGUgZW1wdHkgY29udGVudEVkaXRhYmxl IHdpbmRvd3MgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NjgwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLmg6CisgICAgICAg ICogTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm06CisgICAgICAgICgtW0Jyb3dzZXJBcHBE ZWxlZ2F0ZSBuZXdFZGl0b3JXaW5kb3c6XSk6CisgICAgICAgICgtW0Jyb3dzZXJBcHBEZWxlZ2F0 ZSBfdXBkYXRlTmV3V2luZG93S2V5RXF1aXZhbGVudHNdKToKKyAgICAgICAgKiBNaW5pQnJvd3Nl ci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaDoKKyAgICAgICAgKiBNaW5pQnJvd3Nlci9t YWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAgICAgICAgKC1bQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIgbG9hZEVtcHR5RWRpdGFibGVEb2N1bWVudF0pOgorICAgICAgICAqIE1pbmlCcm93 c2VyL21hYy9NYWluTWVudS54aWI6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dz ZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAgICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9s bGVyIGxvYWRFbXB0eUVkaXRhYmxlRG9jdW1lbnRdKToKKyAgICAgICAgKC1bV0sxQnJvd3Nlcldp bmRvd0NvbnRyb2xsZXIgdXBkYXRlVGl0bGU6XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFj L1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAgICAgICgtW1dLMkJyb3dzZXJXaW5k b3dDb250cm9sbGVyIHVwZGF0ZVRpdGxlOl0pOgorICAgICAgICAoLVtXSzJCcm93c2VyV2luZG93 Q29udHJvbGxlciBsb2FkRW1wdHlFZGl0YWJsZURvY3VtZW50XSk6CisgICAgICAgIE1lcmdlIG1v cmUgZnVuY3Rpb25hbGl0eSBmcm9tIFdlYkVkaXRpbmdUZXN0ZXIuCisKKzIwMTctMDEtMDcgIFRp bSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CisKICAgICAgICAgSW1wbGVtZW50 IGZpbmQtaW4tcGFnZSBpbiBNaW5pQnJvd3NlcgogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY2Nzk5CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93 c2VyL21hYy9BcHBEZWxlZ2F0ZS5oIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRl LmgKaW5kZXggZTczOWRlZGFjZWI3MWFiMjAzMGVmODMzNzk2YWYxYjU2ODA4NjhhOC4uNTY1YmRk OTlhZTRhNzk5MTlkYmNiNzBkYTliY2RmY2Y4NDZkZWNhMyAxMDA2NDQKLS0tIGEvVG9vbHMvTWlu aUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Fw cERlbGVnYXRlLmgKQEAgLTMzLDYgKzMzLDggQEAKIAogICAgIElCT3V0bGV0IE5TTWVudUl0ZW0g Kl9uZXdXZWJLaXQxV2luZG93SXRlbTsKICAgICBJQk91dGxldCBOU01lbnVJdGVtICpfbmV3V2Vi S2l0MldpbmRvd0l0ZW07CisgICAgSUJPdXRsZXQgTlNNZW51SXRlbSAqX25ld1dlYktpdDFFZGl0 b3JJdGVtOworICAgIElCT3V0bGV0IE5TTWVudUl0ZW0gKl9uZXdXZWJLaXQyRWRpdG9ySXRlbTsK IH0KIAogLSAodm9pZClicm93c2VyV2luZG93V2lsbENsb3NlOihOU1dpbmRvdyAqKXdpbmRvdzsK ZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9BcHBEZWxlZ2F0ZS5tIGIvVG9vbHMv TWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KaW5kZXggNzgxMWI3N2M0ZTcxMDc0NjZhNTQy NjkzYWY5ZTllODYwOTVhOTNlYy4uMGY1MDM2MzZhN2RmODY4MjU1NTgwZGRkNDhjNGU0MDBhZDEz MDA5NSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0KQEAgLTQ0LDcgKzQ0LDkgQEAK IAogZW51bSB7CiAgICAgV2ViS2l0MU5ld1dpbmRvd1RhZyA9IDEsCi0gICAgV2ViS2l0Mk5ld1dp bmRvd1RhZyA9IDIKKyAgICBXZWJLaXQyTmV3V2luZG93VGFnID0gMiwKKyAgICBXZWJLaXQxTmV3 RWRpdG9yVGFnID0gMywKKyAgICBXZWJLaXQyTmV3RWRpdG9yVGFnID0gNAogfTsKIAogQGludGVy ZmFjZSBOU0FwcGxpY2F0aW9uIChUb3VjaEJhcikKQEAgLTE2Myw2ICsxNjUsMzIgQEAgLSAoSUJB Y3Rpb24pbmV3UHJpdmF0ZVdpbmRvdzooaWQpc2VuZGVyCiAjZW5kaWYKIH0KIAorLSAoSUJBY3Rp b24pbmV3RWRpdG9yV2luZG93OihpZClzZW5kZXIKK3sKKyAgICBCcm93c2VyV2luZG93Q29udHJv bGxlciAqY29udHJvbGxlciA9IG5pbDsKKworICAgIEJPT0wgdXNlV2ViS2l0MiA9IE5POworCisg ICAgaWYgKCFbc2VuZGVyIHJlc3BvbmRzVG9TZWxlY3RvcjpAc2VsZWN0b3IodGFnKV0pCisgICAg ICAgIHVzZVdlYktpdDIgPSBbU2V0dGluZ3NDb250cm9sbGVyIHNoYXJlZF0udXNlV2ViS2l0MkJ5 RGVmYXVsdDsKKyAgICBlbHNlCisgICAgICAgIHVzZVdlYktpdDIgPSBbc2VuZGVyIHRhZ10gPT0g V2ViS2l0Mk5ld0VkaXRvclRhZzsKKworICAgIGlmICghdXNlV2ViS2l0MikKKyAgICAgICAgY29u dHJvbGxlciA9IFtbV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYWxsb2NdIGluaXRXaXRoV2lu ZG93TmliTmFtZTpAIkJyb3dzZXJXaW5kb3ciXTsKKyNpZiBXS19BUElfRU5BQkxFRAorICAgIGVs c2UKKyAgICAgICAgY29udHJvbGxlciA9IFtbV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYWxs b2NdIGluaXRXaXRoQ29uZmlndXJhdGlvbjpkZWZhdWx0Q29uZmlndXJhdGlvbigpXTsKKyNlbmRp ZgorICAgIGlmICghY29udHJvbGxlcikKKyAgICAgICAgcmV0dXJuOworCisgICAgW1tjb250cm9s bGVyIHdpbmRvd10gbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2VuZGVyXTsKKyAgICBbX2Jyb3dzZXJX aW5kb3dDb250cm9sbGVycyBhZGRPYmplY3Q6Y29udHJvbGxlcl07CisKKyAgICBbY29udHJvbGxl ciBsb2FkRW1wdHlFZGl0YWJsZURvY3VtZW50XTsKK30KKwogLSAodm9pZClicm93c2VyV2luZG93 V2lsbENsb3NlOihOU1dpbmRvdyAqKXdpbmRvdwogewogICAgIFtfYnJvd3NlcldpbmRvd0NvbnRy b2xsZXJzIHJlbW92ZU9iamVjdDp3aW5kb3cud2luZG93Q29udHJvbGxlcl07CkBAIC0yNDQsOSAr MjcyLDEzIEBAIC0gKHZvaWQpX3VwZGF0ZU5ld1dpbmRvd0tleUVxdWl2YWxlbnRzCiAgICAgaWYg KFtbU2V0dGluZ3NDb250cm9sbGVyIHNoYXJlZF0gdXNlV2ViS2l0MkJ5RGVmYXVsdF0pIHsKICAg ICAgICAgW19uZXdXZWJLaXQxV2luZG93SXRlbSBzZXRLZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNr Ok5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kIHwgTlNFdmVudE1vZGlmaWVyRmxhZ09wdGlvbl07 CiAgICAgICAgIFtfbmV3V2ViS2l0MldpbmRvd0l0ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVy TWFzazpOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZF07CisgICAgICAgIFtfbmV3V2ViS2l0MUVk aXRvckl0ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzazpOU0V2ZW50TW9kaWZpZXJGbGFn Q29tbWFuZCB8IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb24gfCBOU0V2ZW50TW9kaWZpZXJGbGFn U2hpZnRdOworICAgICAgICBbX25ld1dlYktpdDJFZGl0b3JJdGVtIHNldEtleUVxdWl2YWxlbnRN b2RpZmllck1hc2s6TlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQgfCBOU0V2ZW50TW9kaWZpZXJG bGFnU2hpZnRdOwogICAgIH0gZWxzZSB7CiAgICAgICAgIFtfbmV3V2ViS2l0MVdpbmRvd0l0ZW0g c2V0S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzazpOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZF07 CiAgICAgICAgIFtfbmV3V2ViS2l0MldpbmRvd0l0ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVy TWFzazpOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZCB8IE5TRXZlbnRNb2RpZmllckZsYWdPcHRp b25dOworICAgICAgICBbX25ld1dlYktpdDFFZGl0b3JJdGVtIHNldEtleUVxdWl2YWxlbnRNb2Rp Zmllck1hc2s6TlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQgfCBOU0V2ZW50TW9kaWZpZXJGbGFn U2hpZnRdOworICAgICAgICBbX25ld1dlYktpdDJFZGl0b3JJdGVtIHNldEtleUVxdWl2YWxlbnRN b2RpZmllck1hc2s6TlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQgfCBOU0V2ZW50TW9kaWZpZXJG bGFnT3B0aW9uIHwgTlNFdmVudE1vZGlmaWVyRmxhZ1NoaWZ0XTsKICAgICB9CiB9CiAKZGlmZiAt LWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5oIGIv VG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLmgKaW5kZXggNWI4 NWNlNDY4NDJjMzViNDUxNWI2NWE1MjJjNWY0MWJlMjg0ZjU0NS4uYjkzMWFjOGJhNDRiZDJiNDhi ZjFmMmQ0ZGY5MWY5MGE4ZThkNDYzYiAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLmgKKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jy b3dzZXJXaW5kb3dDb250cm9sbGVyLmgKQEAgLTQwLDYgKzQwLDcgQEAKIH0KIAogLSAodm9pZCls b2FkVVJMU3RyaW5nOihOU1N0cmluZyAqKXVybFN0cmluZzsKKy0gKHZvaWQpbG9hZEVtcHR5RWRp dGFibGVEb2N1bWVudDsKIC0gKE5TU3RyaW5nICopYWRkUHJvdG9jb2xJZk5lY2Vzc2FyeTooTlNT dHJpbmcgKilhZGRyZXNzOwogCiAtICh2b2lkKWFwcGxpY2F0aW9uVGVybWluYXRpbmc7CmRpZmYg LS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubSBi L1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCmluZGV4IDBj MGY1NDhhMzhmZDZiNjQzYzFkYWNkM2JkN2QxNDZjODFhZTVhNDguLmFmMzViMWQ3OWRmN2NjYzRh ZThiZmQ3NWU0YmFkYTVjMWQ0MDA2MTEgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21h Yy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9C cm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC01OCw2ICs1OCwxMCBAQCAtICh2b2lkKWxvYWRV UkxTdHJpbmc6KE5TU3RyaW5nICopdXJsU3RyaW5nCiB7CiB9CiAKKy0gKHZvaWQpbG9hZEVtcHR5 RWRpdGFibGVEb2N1bWVudAoreworfQorCiAtICh2b2lkKWFwcGxpY2F0aW9uVGVybWluYXRpbmcK IHsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIgYi9U b29scy9NaW5pQnJvd3Nlci9tYWMvTWFpbk1lbnUueGliCmluZGV4IDY3YTk0NWY0ZjliMTMzOTcz YWFiNGY5OWJiMTY1ODMyMDE3MGZmMjMuLmU0YzIxNjk0ZGU1MjI4ZGNlNTNiMDIyZmIzNGUwYzJl ZGJmNDRhNGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIK KysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYgpAQCAtMSw4ICsxLDggQEAK IDw/eG1sIHZlcnNpb249IjEuMCIgZW5jb2Rpbmc9IlVURi04Ij8+Ci08ZG9jdW1lbnQgdHlwZT0i Y29tLmFwcGxlLkludGVyZmFjZUJ1aWxkZXIzLkNvY29hLlhJQiIgdmVyc2lvbj0iMy4wIiB0b29s c1ZlcnNpb249IjExNTIxLjEiIHN5c3RlbVZlcnNpb249IjE2QjI2NDhhIiB0YXJnZXRSdW50aW1l PSJNYWNPU1guQ29jb2EiIHByb3BlcnR5QWNjZXNzQ29udHJvbD0ibm9uZSI+Cis8ZG9jdW1lbnQg dHlwZT0iY29tLmFwcGxlLkludGVyZmFjZUJ1aWxkZXIzLkNvY29hLlhJQiIgdmVyc2lvbj0iMy4w IiB0b29sc1ZlcnNpb249IjExMTkxIiBzeXN0ZW1WZXJzaW9uPSIxNkQxN2EiIHRhcmdldFJ1bnRp bWU9Ik1hY09TWC5Db2NvYSIgcHJvcGVydHlBY2Nlc3NDb250cm9sPSJub25lIj4KICAgICA8ZGVw ZW5kZW5jaWVzPgogICAgICAgICA8ZGVwbG95bWVudCBpZGVudGlmaWVyPSJtYWNvc3giLz4KLSAg ICAgICAgPHBsdWdJbiBpZGVudGlmaWVyPSJjb20uYXBwbGUuSW50ZXJmYWNlQnVpbGRlci5Db2Nv YVBsdWdpbiIgdmVyc2lvbj0iMTE1MjEuMSIvPgorICAgICAgICA8cGx1Z0luIGlkZW50aWZpZXI9 ImNvbS5hcHBsZS5JbnRlcmZhY2VCdWlsZGVyLkNvY29hUGx1Z2luIiB2ZXJzaW9uPSIxMTE5MSIv PgogICAgIDwvZGVwZW5kZW5jaWVzPgogICAgIDxvYmplY3RzPgogICAgICAgICA8Y3VzdG9tT2Jq ZWN0IGlkPSItMiIgdXNlckxhYmVsPSJGaWxlJ3MgT3duZXIiIGN1c3RvbUNsYXNzPSJOU0FwcGxp Y2F0aW9uIj4KQEAgLTg4LDYgKzg4LDE3IEBACiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJuZXdQcml2YXRlV2luZG93OiIgdGFyZ2V0PSItMSIg aWQ9Im1mNS16aS1hNVIiLz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jb25u ZWN0aW9ucz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L21lbnVJdGVtPgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0iTmV3IFdlYktpdDEgRWRpdG9y IiB0YWc9IjMiIGtleUVxdWl2YWxlbnQ9Ik4iIGlkPSJqTlItWjMtWVdpIiB1c2VyTGFiZWw9Ik5l dyBXZWJLaXQxIEVkaXRvciI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjb25u ZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24gc2Vs ZWN0b3I9Im5ld0VkaXRvcldpbmRvdzoiIHRhcmdldD0iLTEiIGlkPSJOdjUtYzAtS1JQIi8+Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8bWVudUl0ZW0gdGl0bGU9Ik5ldyBXZWJLaXQyIEVkaXRvciIgdGFnPSI0IiBrZXlFcXVpdmFs ZW50PSJOIiBpZD0iSWRJLXdiLTFKRCIgdXNlckxhYmVsPSJOZXcgV2ViS2l0MiBFZGl0b3IiPgor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1 aXZhbGVudE1vZGlmaWVyTWFzayIgb3B0aW9uPSJZRVMiIGNvbW1hbmQ9IllFUyIvPgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8Y29ubmVjdGlvbnM+CisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8YWN0aW9uIHNlbGVjdG9yPSJuZXdFZGl0b3JXaW5kb3c6IiB0 YXJnZXQ9Ii0xIiBpZD0ia2s2LVI0LWllYyIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8L2Nvbm5lY3Rpb25zPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvbWVudUl0 ZW0+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1lbnVJdGVtIHRpdGxlPSJPcGVu4oCm IiBrZXlFcXVpdmFsZW50PSJvIiBpZD0iNzIiPgogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8Y29ubmVjdGlvbnM+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 YWN0aW9uIHNlbGVjdG9yPSJvcGVuRG9jdW1lbnQ6IiB0YXJnZXQ9Ii0xIiBpZD0iMzc0Ii8+CkBA IC01NjYsNyArNTc3LDkgQEAKICAgICAgICAgPC9tZW51PgogICAgICAgICA8Y3VzdG9tT2JqZWN0 IGlkPSI0OTQiIGN1c3RvbUNsYXNzPSJCcm93c2VyQXBwRGVsZWdhdGUiPgogICAgICAgICAgICAg PGNvbm5lY3Rpb25zPgorICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9Il9uZXdXZWJL aXQxRWRpdG9ySXRlbSIgZGVzdGluYXRpb249ImpOUi1aMy1ZV2kiIGlkPSI2d0ItQWEtQ0s3Ii8+ CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0iX25ld1dlYktpdDFXaW5kb3dJdGVt IiBkZXN0aW5hdGlvbj0iNTczIiBpZD0iWkNqLXUyLVBVNyIvPgorICAgICAgICAgICAgICAgIDxv dXRsZXQgcHJvcGVydHk9Il9uZXdXZWJLaXQyRWRpdG9ySXRlbSIgZGVzdGluYXRpb249IklkSS13 Yi0xSkQiIGlkPSJESXItcGUtWEk4Ii8+CiAgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0 eT0iX25ld1dlYktpdDJXaW5kb3dJdGVtIiBkZXN0aW5hdGlvbj0iNTcxIiBpZD0iMUd2LW1LLWF1 bCIvPgogICAgICAgICAgICAgPC9jb25uZWN0aW9ucz4KICAgICAgICAgPC9jdXN0b21PYmplY3Q+ CmRpZmYgLS1naXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRy b2xsZXIubSBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxl ci5tCmluZGV4IGJiNDI4YjVjN2Y2YWM0MjExNmZjZjQwNWE3MDU3YTg2ZjBkMDYyNTIuLjE0YjE1 MDBjYjFmMGNiNzhjNWZmZTBmZWUwMmExOGEzZDk4OWEzM2IgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01p bmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01p bmlCcm93c2VyL21hYy9XSzFCcm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC03OSw2ICs3OSwx MiBAQCAtICh2b2lkKWxvYWRVUkxTdHJpbmc6KE5TU3RyaW5nICopdXJsU3RyaW5nCiAgICAgW3Nl bGYgZmV0Y2g6bmlsXTsKIH0KIAorLSAodm9pZClsb2FkRW1wdHlFZGl0YWJsZURvY3VtZW50Cit7 CisgICAgW193ZWJWaWV3Lm1haW5GcmFtZSBsb2FkSFRNTFN0cmluZzpAIjxodG1sPjxib2R5Pjwv Ym9keT48L2h0bWw+IiBiYXNlVVJMOm5pbF07CisgICAgX3dlYlZpZXcuZWRpdGFibGUgPSBZRVM7 Cit9CisKIC0gKElCQWN0aW9uKWZldGNoOihpZClzZW5kZXIKIHsKICAgICBbdXJsVGV4dCBzZXRT dHJpbmdWYWx1ZTpbc2VsZiBhZGRQcm90b2NvbElmTmVjZXNzYXJ5Olt1cmxUZXh0IHN0cmluZ1Zh bHVlXV1dOwpAQCAtMzE3LDggKzMyMyw4IEBAIC0gKHZvaWQpdXBkYXRlVGl0bGU6KE5TU3RyaW5n ICopdGl0bGUKICAgICAgICAgTlNVUkwgKnVybCA9IF93ZWJWaWV3Lm1haW5GcmFtZS5kYXRhU291 cmNlLnJlcXVlc3QuVVJMOwogICAgICAgICB0aXRsZSA9IHVybC5sYXN0UGF0aENvbXBvbmVudCA/ OiB1cmwuX3dlYl91c2VyVmlzaWJsZVN0cmluZzsKICAgICB9Ci0gICAgCi0gICAgW3NlbGYud2lu ZG93IHNldFRpdGxlOlt0aXRsZSBzdHJpbmdCeUFwcGVuZGluZ1N0cmluZzpAIiBbV0sxXSJdXTsK KworICAgIFtzZWxmLndpbmRvdyBzZXRUaXRsZTpbdGl0bGUgc3RyaW5nQnlBcHBlbmRpbmdGb3Jt YXQ6QCIgW1dLMV0lQCIsIF93ZWJWaWV3LmVkaXRhYmxlID8gQCIgW0VkaXRhYmxlXSIgOiBAIiJd XTsKIH0KIAogLSAoV2ViVmlldyAqKXdlYlZpZXc6KFdlYlZpZXcgKilzZW5kZXIgY3JlYXRlV2Vi Vmlld1dpdGhSZXF1ZXN0OihOU1VSTFJlcXVlc3QgKilyZXF1ZXN0CmRpZmYgLS1naXQgYS9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubSBiL1Rvb2xzL01p bmlCcm93c2VyL21hYy9XSzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tCmluZGV4IDE1Mzg0NjMz ZjFkNGJjYjgxNjU2ZmUzOGZjYTU0NmM4YTYwOWU1ZDIuLjZjYWUxMzY5MTljNDZkNmYxMGQ3MzFh ZTg1YjM0OTI2MzU1MGNiOGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJC cm93c2VyV2luZG93Q29udHJvbGxlci5tCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzJC cm93c2VyV2luZG93Q29udHJvbGxlci5tCkBAIC00MTUsNyArNDE1LDcgQEAgLSAodm9pZCl1cGRh dGVUaXRsZTooTlNTdHJpbmcgKil0aXRsZQogICAgICAgICB0aXRsZSA9IHVybC5sYXN0UGF0aENv bXBvbmVudCA/OiB1cmwuX3dlYl91c2VyVmlzaWJsZVN0cmluZzsKICAgICB9CiAKLSAgICBzZWxm LndpbmRvdy50aXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAlQCBbV0syICVk XSIsIF9pc1ByaXZhdGVCcm93c2luZ1dpbmRvdyA/IEAi8J+ZiCAiIDogQCIiLCB0aXRsZSwgX3dl YlZpZXcuX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBzZWxmLndpbmRvdy50aXRsZSA9IFtO U1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAlQCBbV0syICVkXSVAIiwgX2lzUHJpdmF0ZUJy b3dzaW5nV2luZG93ID8gQCLwn5mIICIgOiBAIiIsIHRpdGxlLCBfd2ViVmlldy5fd2ViUHJvY2Vz c0lkZW50aWZpZXIsIF93ZWJWaWV3Ll9lZGl0YWJsZSA/IEAiIFtFZGl0YWJsZV0iIDogQCIiXTsK IH0KIAogLSAodm9pZClvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOihOU1N0cmluZyAqKWtleVBhdGgg b2ZPYmplY3Q6KGlkKW9iamVjdCBjaGFuZ2U6KE5TRGljdGlvbmFyeSAqKWNoYW5nZSBjb250ZXh0 Oih2b2lkICopY29udGV4dApAQCAtNTI1LDYgKzUyNSwxMiBAQCAtICh2b2lkKWxvYWRVUkxTdHJp bmc6KE5TU3RyaW5nICopdXJsU3RyaW5nCiAgICAgW3NlbGYgZmV0Y2g6bmlsXTsKIH0KIAorLSAo dm9pZClsb2FkRW1wdHlFZGl0YWJsZURvY3VtZW50Cit7CisgICAgW193ZWJWaWV3IGxvYWRIVE1M U3RyaW5nOkAiPGh0bWw+PGJvZHk+PC9ib2R5PjwvaHRtbD4iIGJhc2VVUkw6bmlsXTsKKyAgICBf d2ViVmlldy5fZWRpdGFibGUgPSBZRVM7Cit9CisKIHN0YXRpYyBOU1NldCAqZGF0YVR5cGVzKCkK IHsKICAgICByZXR1cm4gW1dLV2Vic2l0ZURhdGFTdG9yZSBhbGxXZWJzaXRlRGF0YVR5cGVzXTsK 298266 2017-01-07 03:35:10 -0800 2017-01-07 05:12:43 -0800 Patch bug-166801-20170107033339.patch text/plain 16315 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYwYmM2Y2MwYzM4N2Y0NGJjZDU5ZWE4OTQyZDJkN2M4 NTJhOTNmOC4uZWEyZDg4NjBlZGI1MWYwMDY0MDUwODVjNTAxNTYyMGNlY2ZlMzZjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQw IEBACiAyMDE3LTAxLTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBjcmVhdGUgZW1wdHkgY29udGVudEVkaXRhYmxl IHdpbmRvd3MgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NjgwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLmg6CisgICAgICAg ICogTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm06CisgICAgICAgICgtW0Jyb3dzZXJBcHBE ZWxlZ2F0ZSBjcmVhdGVCcm93c2VyV2luZG93Q29udHJvbGxlcjpdKToKKyAgICAgICAgKC1bQnJv d3NlckFwcERlbGVnYXRlIG5ld1dpbmRvdzpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVn YXRlIG5ld0VkaXRvcldpbmRvdzpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIG9w ZW5Eb2N1bWVudDpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIF91cGRhdGVOZXdX aW5kb3dLZXlFcXVpdmFsZW50c10pOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2Vy V2luZG93Q29udHJvbGxlci5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2lu ZG93Q29udHJvbGxlci5tOgorICAgICAgICAoLVtCcm93c2VyV2luZG93Q29udHJvbGxlciBsb2Fk SFRNTFN0cmluZzpdKToKKyAgICAgICAgKC1bQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdG9nZ2xl RWRpdGFibGU6XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYjoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAg ICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYXdha2VGcm9tTmliXSk6CisgICAg ICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOl0pOgorICAg ICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciB2YWxpZGF0ZU1lbnVJdGVtOl0pOgor ICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciBzZXRFZGl0YWJsZTpdKToKKyAg ICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdXBkYXRlVGl0bGU6XSk6CisgICAg ICAgICogTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAg ICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGF3YWtlRnJvbU5pYl0pOgorICAgICAg ICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciB2YWxpZGF0ZU1lbnVJdGVtOl0pOgorICAg ICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBzZXRFZGl0YWJsZTpdKToKKyAgICAg ICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdXBkYXRlVGl0bGU6XSk6CisgICAgICAg ICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOl0pOgorICAgICAg ICBNZXJnZSBtb3JlIGZ1bmN0aW9uYWxpdHkgZnJvbSBXZWJFZGl0aW5nVGVzdGVyLgorICAgICAg ICBBZGQgdHdvIG1lbnUgaXRlbXMgZm9yIGNyZWF0aW5nIGVtcHR5IGVkaXRhYmxlIFdlYktpdDEv MiB3aW5kb3dzLgorICAgICAgICBBZGQgYSBtZW51IGl0ZW0gdG8gdGhlIEVkaXQgbWVudSB0byB0 b2dnbGUgZWRpdGFiaWxpdHkgb24gYW55IHdpbmRvdy4KKworMjAxNy0wMS0wNyAgVGltIEhvcnRv biAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAgICBJbXBsZW1lbnQgZmluZC1p bi1wYWdlIGluIE1pbmlCcm93c2VyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjY3OTkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFj L0FwcERlbGVnYXRlLmggYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaAppbmRl eCBlNzM5ZGVkYWNlYjcxYWIyMDMwZWY4MzM3OTZhZjFiNTY4MDg2OGE4Li41NjViZGQ5OWFlNGE3 OTkxOWRiY2I3MGRhOWJjZGZjZjg0NmRlY2EzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci9tYWMvQXBwRGVsZWdhdGUuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdh dGUuaApAQCAtMzMsNiArMzMsOCBAQAogCiAgICAgSUJPdXRsZXQgTlNNZW51SXRlbSAqX25ld1dl YktpdDFXaW5kb3dJdGVtOwogICAgIElCT3V0bGV0IE5TTWVudUl0ZW0gKl9uZXdXZWJLaXQyV2lu ZG93SXRlbTsKKyAgICBJQk91dGxldCBOU01lbnVJdGVtICpfbmV3V2ViS2l0MUVkaXRvckl0ZW07 CisgICAgSUJPdXRsZXQgTlNNZW51SXRlbSAqX25ld1dlYktpdDJFZGl0b3JJdGVtOwogfQogCiAt ICh2b2lkKWJyb3dzZXJXaW5kb3dXaWxsQ2xvc2U6KE5TV2luZG93ICopd2luZG93OwpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0gYi9Ub29scy9NaW5pQnJv d3Nlci9tYWMvQXBwRGVsZWdhdGUubQppbmRleCA3ODExYjc3YzRlNzEwNzQ2NmE1NDI2OTNhZjll OWU4NjA5NWE5M2VjLi4wZGZkZDg2Zjk2N2RjNzA1Mzg5ZGRiNmM3ODljMDE0NGY3NDY5MTk1IDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUubQorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUubQpAQCAtNDQsNyArNDQsOSBAQAogCiBlbnVt IHsKICAgICBXZWJLaXQxTmV3V2luZG93VGFnID0gMSwKLSAgICBXZWJLaXQyTmV3V2luZG93VGFn ID0gMgorICAgIFdlYktpdDJOZXdXaW5kb3dUYWcgPSAyLAorICAgIFdlYktpdDFOZXdFZGl0b3JU YWcgPSAzLAorICAgIFdlYktpdDJOZXdFZGl0b3JUYWcgPSA0CiB9OwogCiBAaW50ZXJmYWNlIE5T QXBwbGljYXRpb24gKFRvdWNoQmFyKQpAQCAtMTIwLDMwICsxMjIsNDQgQEAgLSAodm9pZClhd2Fr ZUZyb21OaWIKIAogI2VuZGlmCiAKLQotLSAoSUJBY3Rpb24pbmV3V2luZG93OihpZClzZW5kZXIK Ky0gKEJyb3dzZXJXaW5kb3dDb250cm9sbGVyICopY3JlYXRlQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXI6KGlkKXNlbmRlcgogewogICAgIEJyb3dzZXJXaW5kb3dDb250cm9sbGVyICpjb250cm9sbGVy ID0gbmlsOwotCiAgICAgQk9PTCB1c2VXZWJLaXQyID0gTk87CisgICAgQk9PTCBtYWtlRWRpdGFi bGUgPSBOTzsKIAogICAgIGlmICghW3NlbmRlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KHRhZyldKQogICAgICAgICB1c2VXZWJLaXQyID0gW1NldHRpbmdzQ29udHJvbGxlciBzaGFyZWRd LnVzZVdlYktpdDJCeURlZmF1bHQ7Ci0gICAgZWxzZQotICAgICAgICB1c2VXZWJLaXQyID0gW3Nl bmRlciB0YWddID09IFdlYktpdDJOZXdXaW5kb3dUYWc7Ci0gICAgCisgICAgZWxzZSB7CisgICAg ICAgIHVzZVdlYktpdDIgPSBbc2VuZGVyIHRhZ10gPT0gV2ViS2l0Mk5ld1dpbmRvd1RhZyB8fCBb c2VuZGVyIHRhZ10gPT0gV2ViS2l0Mk5ld0VkaXRvclRhZzsKKyAgICAgICAgbWFrZUVkaXRhYmxl ID0gW3NlbmRlciB0YWddID09IFdlYktpdDFOZXdFZGl0b3JUYWcgfHwgW3NlbmRlciB0YWddID09 IFdlYktpdDJOZXdFZGl0b3JUYWc7CisgICAgfQorCiAgICAgaWYgKCF1c2VXZWJLaXQyKQogICAg ICAgICBjb250cm9sbGVyID0gW1tXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciBhbGxvY10gaW5p dFdpdGhXaW5kb3dOaWJOYW1lOkAiQnJvd3NlcldpbmRvdyJdOwogI2lmIFdLX0FQSV9FTkFCTEVE CiAgICAgZWxzZQogICAgICAgICBjb250cm9sbGVyID0gW1tXSzJCcm93c2VyV2luZG93Q29udHJv bGxlciBhbGxvY10gaW5pdFdpdGhDb25maWd1cmF0aW9uOmRlZmF1bHRDb25maWd1cmF0aW9uKCld OwogI2VuZGlmCisKKyAgICBpZiAobWFrZUVkaXRhYmxlKQorICAgICAgICBjb250cm9sbGVyLmVk aXRhYmxlID0gWUVTOworCisgICAgaWYgKCFjb250cm9sbGVyKQorICAgICAgICByZXR1cm4gbmls OworCisgICAgW19icm93c2VyV2luZG93Q29udHJvbGxlcnMgYWRkT2JqZWN0OmNvbnRyb2xsZXJd OworCisgICAgcmV0dXJuIGNvbnRyb2xsZXI7Cit9CisKKy0gKElCQWN0aW9uKW5ld1dpbmRvdzoo aWQpc2VuZGVyCit7CisgICAgQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSBb c2VsZiBjcmVhdGVCcm93c2VyV2luZG93Q29udHJvbGxlcjpzZW5kZXJdOwogICAgIGlmICghY29u dHJvbGxlcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgW1tjb250cm9sbGVyIHdpbmRvd10gbWFr ZUtleUFuZE9yZGVyRnJvbnQ6c2VuZGVyXTsKLSAgICBbX2Jyb3dzZXJXaW5kb3dDb250cm9sbGVy cyBhZGRPYmplY3Q6Y29udHJvbGxlcl07Ci0gICAgCiAgICAgW2NvbnRyb2xsZXIgbG9hZFVSTFN0 cmluZzpbU2V0dGluZ3NDb250cm9sbGVyIHNoYXJlZF0uZGVmYXVsdFVSTF07CiB9CiAKQEAgLTE2 Myw2ICsxNzksMTYgQEAgLSAoSUJBY3Rpb24pbmV3UHJpdmF0ZVdpbmRvdzooaWQpc2VuZGVyCiAj ZW5kaWYKIH0KIAorLSAoSUJBY3Rpb24pbmV3RWRpdG9yV2luZG93OihpZClzZW5kZXIKK3sKKyAg ICBCcm93c2VyV2luZG93Q29udHJvbGxlciAqY29udHJvbGxlciA9IFtzZWxmIGNyZWF0ZUJyb3dz ZXJXaW5kb3dDb250cm9sbGVyOnNlbmRlcl07CisgICAgaWYgKCFjb250cm9sbGVyKQorICAgICAg ICByZXR1cm47CisKKyAgICBbW2NvbnRyb2xsZXIgd2luZG93XSBtYWtlS2V5QW5kT3JkZXJGcm9u dDpzZW5kZXJdOworICAgIFtjb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+PGJvZHk+ PC9ib2R5PjwvaHRtbD4iXTsKK30KKwogLSAodm9pZClicm93c2VyV2luZG93V2lsbENsb3NlOihO U1dpbmRvdyAqKXdpbmRvdwogewogICAgIFtfYnJvd3NlcldpbmRvd0NvbnRyb2xsZXJzIHJlbW92 ZU9iamVjdDp3aW5kb3cud2luZG93Q29udHJvbGxlcl07CkBAIC0yMjIsMTEgKzI0OCwxMSBAQCAt IChJQkFjdGlvbilvcGVuRG9jdW1lbnQ6KGlkKXNlbmRlcgogICAgICAgICBpZiAocmVzdWx0ICE9 IE5TRmlsZUhhbmRsaW5nUGFuZWxPS0J1dHRvbikKICAgICAgICAgICAgIHJldHVybjsKIAotICAg ICAgICBCcm93c2VyV2luZG93Q29udHJvbGxlciAqbmV3QnJvd3NlcldpbmRvd0NvbnRyb2xsZXIg PSBbW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFdpbmRvd05pYk5h bWU6QCJCcm93c2VyV2luZG93Il07Ci0gICAgICAgIFtuZXdCcm93c2VyV2luZG93Q29udHJvbGxl ci53aW5kb3cgbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2VsZl07CisgICAgICAgIEJyb3dzZXJXaW5k b3dDb250cm9sbGVyICpjb250cm9sbGVyID0gW3NlbGYgY3JlYXRlQnJvd3NlcldpbmRvd0NvbnRy b2xsZXI6bmlsXTsKKyAgICAgICAgW2NvbnRyb2xsZXIud2luZG93IG1ha2VLZXlBbmRPcmRlckZy b250OnNlbGZdOwogCiAgICAgICAgIE5TVVJMICp1cmwgPSBbb3BlblBhbmVsLlVSTHMgb2JqZWN0 QXRJbmRleDowXTsKLSAgICAgICAgW25ld0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGxvYWRVUkxT dHJpbmc6W3VybCBhYnNvbHV0ZVN0cmluZ11dOworICAgICAgICBbY29udHJvbGxlciBsb2FkVVJM U3RyaW5nOlt1cmwgYWJzb2x1dGVTdHJpbmddXTsKICAgICB9XTsKIH0KIApAQCAtMjQ0LDkgKzI3 MCwxMyBAQCAtICh2b2lkKV91cGRhdGVOZXdXaW5kb3dLZXlFcXVpdmFsZW50cwogICAgIGlmIChb W1NldHRpbmdzQ29udHJvbGxlciBzaGFyZWRdIHVzZVdlYktpdDJCeURlZmF1bHRdKSB7CiAgICAg ICAgIFtfbmV3V2ViS2l0MVdpbmRvd0l0ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzazpO U0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZCB8IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb25dOwog ICAgICAgICBbX25ld1dlYktpdDJXaW5kb3dJdGVtIHNldEtleUVxdWl2YWxlbnRNb2RpZmllck1h c2s6TlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmRdOworICAgICAgICBbX25ld1dlYktpdDFFZGl0 b3JJdGVtIHNldEtleUVxdWl2YWxlbnRNb2RpZmllck1hc2s6TlNFdmVudE1vZGlmaWVyRmxhZ0Nv bW1hbmQgfCBOU0V2ZW50TW9kaWZpZXJGbGFnT3B0aW9uIHwgTlNFdmVudE1vZGlmaWVyRmxhZ1No aWZ0XTsKKyAgICAgICAgW19uZXdXZWJLaXQyRWRpdG9ySXRlbSBzZXRLZXlFcXVpdmFsZW50TW9k aWZpZXJNYXNrOk5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kIHwgTlNFdmVudE1vZGlmaWVyRmxh Z1NoaWZ0XTsKICAgICB9IGVsc2UgewogICAgICAgICBbX25ld1dlYktpdDFXaW5kb3dJdGVtIHNl dEtleUVxdWl2YWxlbnRNb2RpZmllck1hc2s6TlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmRdOwog ICAgICAgICBbX25ld1dlYktpdDJXaW5kb3dJdGVtIHNldEtleUVxdWl2YWxlbnRNb2RpZmllck1h c2s6TlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQgfCBOU0V2ZW50TW9kaWZpZXJGbGFnT3B0aW9u XTsKKyAgICAgICAgW19uZXdXZWJLaXQxRWRpdG9ySXRlbSBzZXRLZXlFcXVpdmFsZW50TW9kaWZp ZXJNYXNrOk5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kIHwgTlNFdmVudE1vZGlmaWVyRmxhZ1No aWZ0XTsKKyAgICAgICAgW19uZXdXZWJLaXQyRWRpdG9ySXRlbSBzZXRLZXlFcXVpdmFsZW50TW9k aWZpZXJNYXNrOk5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kIHwgTlNFdmVudE1vZGlmaWVyRmxh Z09wdGlvbiB8IE5TRXZlbnRNb2RpZmllckZsYWdTaGlmdF07CiAgICAgfQogfQogCmRpZmYgLS1n aXQgYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaCBiL1Rv b2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5oCmluZGV4IDViODVj ZTQ2ODQyYzM1YjQ1MTViNjVhNTIyYzVmNDFiZTI4NGY1NDUuLmI3YWE1Y2Y0MTFlMjIzOWQ3NzE5 MDkxZjg2OGEwNGJjMmQwNGQ1OWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9C cm93c2VyV2luZG93Q29udHJvbGxlci5oCisrKyBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93 c2VyV2luZG93Q29udHJvbGxlci5oCkBAIC00MCw2ICs0MCw3IEBACiB9CiAKIC0gKHZvaWQpbG9h ZFVSTFN0cmluZzooTlNTdHJpbmcgKil1cmxTdHJpbmc7CistICh2b2lkKWxvYWRIVE1MU3RyaW5n OihOU1N0cmluZyAqKUhUTUxTdHJpbmc7CiAtIChOU1N0cmluZyAqKWFkZFByb3RvY29sSWZOZWNl c3Nhcnk6KE5TU3RyaW5nICopYWRkcmVzczsKIAogLSAodm9pZClhcHBsaWNhdGlvblRlcm1pbmF0 aW5nOwpAQCAtNzksNSArODAsOCBAQAogCiAtIChDR0Zsb2F0KXBhZ2VTY2FsZUZvck1lbnVJdGVt VGFnOihOU0ludGVnZXIpdGFnOwogCitAcHJvcGVydHkgKG5vbmF0b21pYywgYXNzaWduLCBnZXR0 ZXI9aXNFZGl0YWJsZSkgQk9PTCBlZGl0YWJsZTsKKy0gKElCQWN0aW9uKXRvZ2dsZUVkaXRhYmxl OihpZClzZW5kZXI7CisKIEBlbmQKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFj L0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3Nl cldpbmRvd0NvbnRyb2xsZXIubQppbmRleCAwYzBmNTQ4YTM4ZmQ2YjY0M2MxZGFjZDNiZDdkMTQ2 YzgxYWU1YTQ4Li5kOTZlYjUxMGZkMGZiZWU4ZTc4YWFiYTIwOWYxODFmM2E4NmE4MTAxIDEwMDY0 NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQor KysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAt NTgsNiArNTgsMTAgQEAgLSAodm9pZClsb2FkVVJMU3RyaW5nOihOU1N0cmluZyAqKXVybFN0cmlu ZwogewogfQogCistICh2b2lkKWxvYWRIVE1MU3RyaW5nOihOU1N0cmluZyAqKUhUTUxTdHJpbmcK K3sKK30KKwogLSAodm9pZClhcHBsaWNhdGlvblRlcm1pbmF0aW5nCiB7CiB9CkBAIC0yMTEsNiAr MjE1LDExIEBAIC0gKE5TVmlldyAqKW1haW5Db250ZW50VmlldwogICAgIHJldHVybiBuaWw7CiB9 CiAKKy0gKElCQWN0aW9uKXRvZ2dsZUVkaXRhYmxlOihpZClzZW5kZXIKK3sKKyAgICBzZWxmLmVk aXRhYmxlID0gIXNlbGYuaXNFZGl0YWJsZTsKK30KKwogI3ByYWdtYSBtYXJrIC0KICNwcmFnbWEg bWFyayBOU1NoYXJpbmdTZXJ2aWNlUGlja2VyRGVsZWdhdGUKIApkaWZmIC0tZ2l0IGEvVG9vbHMv TWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYiBiL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWlu TWVudS54aWIKaW5kZXggNjdhOTQ1ZjRmOWIxMzM5NzNhYWI0Zjk5YmIxNjU4MzIwMTcwZmYyMy4u MWIwOTNkZTI2MzlmOGQ2MzJhMWExNmIyMDA1ZWNkMWU1YWM3Yzk4ZiAxMDA2NDQKLS0tIGEvVG9v bHMvTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYgorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9t YWMvTWFpbk1lbnUueGliCkBAIC04OCw2ICs4OCwxNyBAQAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0ibmV3UHJpdmF0ZVdpbmRvdzoiIHRhcmdl dD0iLTEiIGlkPSJtZjUtemktYTVSIi8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IDwvY29ubmVjdGlvbnM+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bWVudUl0ZW0gdGl0bGU9Ik5ldyBXZWJLaXQx IEVkaXRvciIgdGFnPSIzIiBrZXlFcXVpdmFsZW50PSJOIiBpZD0iak5SLVozLVlXaSIgdXNlckxh YmVsPSJOZXcgV2ViS2l0MSBFZGl0b3IiPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8Y29ubmVjdGlvbnM+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8YWN0 aW9uIHNlbGVjdG9yPSJuZXdFZGl0b3JXaW5kb3c6IiB0YXJnZXQ9Ii0xIiBpZD0iTnY1LWMwLUtS UCIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2Nvbm5lY3Rpb25zPgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDwvbWVudUl0ZW0+CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPG1lbnVJdGVtIHRpdGxlPSJOZXcgV2ViS2l0MiBFZGl0b3IiIHRhZz0iNCIga2V5 RXF1aXZhbGVudD0iTiIgaWQ9IklkSS13Yi0xSkQiIHVzZXJMYWJlbD0iTmV3IFdlYktpdDIgRWRp dG9yIj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1vZGlmaWVyTWFzayBrZXk9 ImtleUVxdWl2YWxlbnRNb2RpZmllck1hc2siIG9wdGlvbj0iWUVTIiBjb21tYW5kPSJZRVMiLz4K KyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0ibmV3RWRpdG9yV2lu ZG93OiIgdGFyZ2V0PSItMSIgaWQ9ImtrNi1SNC1pZWMiLz4KKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPC9jb25uZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8 L21lbnVJdGVtPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0i T3BlbuKApiIga2V5RXF1aXZhbGVudD0ibyIgaWQ9IjcyIj4KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0ib3BlbkRvY3VtZW50OiIgdGFyZ2V0PSItMSIgaWQ9IjM3 NCIvPgpAQCAtMTYwLDYgKzE3MSwxNSBAQAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0icmVkbzoiIHRhcmdldD0iLTEiIGlkPSIyMzEiLz4KICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9jb25uZWN0aW9ucz4KICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8L21lbnVJdGVtPgorICAgICAgICAgICAgICAgICAgICAgICAgICAg IDxtZW51SXRlbSBpc1NlcGFyYXRvckl0ZW09IllFUyIgaWQ9ImZVTC03ay1EcWciPgorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1aXZhbGVu dE1vZGlmaWVyTWFzayIgY29tbWFuZD0iWUVTIi8+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPC9tZW51SXRlbT4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bWVudUl0ZW0gdGl0 bGU9IkVkaXRhYmxlIiBpZD0ia0c0LWhTLUpiWCI+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIDxtb2RpZmllck1hc2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIi8+Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjb25uZWN0aW9ucz4KKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9InRvZ2dsZUVkaXRhYmxl OiIgdGFyZ2V0PSItMSIgaWQ9IjZteS1iMi1lZmYiLz4KKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPC9jb25uZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L21l bnVJdGVtPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSBpc1NlcGFyYXRv ckl0ZW09IllFUyIgaWQ9IjIwNiI+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxt b2RpZmllck1hc2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIiBjb21tYW5kPSJZRVMi Lz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L21lbnVJdGVtPgpAQCAtNTY2LDcgKzU4 Niw5IEBACiAgICAgICAgIDwvbWVudT4KICAgICAgICAgPGN1c3RvbU9iamVjdCBpZD0iNDk0IiBj dXN0b21DbGFzcz0iQnJvd3NlckFwcERlbGVnYXRlIj4KICAgICAgICAgICAgIDxjb25uZWN0aW9u cz4KKyAgICAgICAgICAgICAgICA8b3V0bGV0IHByb3BlcnR5PSJfbmV3V2ViS2l0MUVkaXRvckl0 ZW0iIGRlc3RpbmF0aW9uPSJqTlItWjMtWVdpIiBpZD0iNndCLUFhLUNLNyIvPgogICAgICAgICAg ICAgICAgIDxvdXRsZXQgcHJvcGVydHk9Il9uZXdXZWJLaXQxV2luZG93SXRlbSIgZGVzdGluYXRp b249IjU3MyIgaWQ9IlpDai11Mi1QVTciLz4KKyAgICAgICAgICAgICAgICA8b3V0bGV0IHByb3Bl cnR5PSJfbmV3V2ViS2l0MkVkaXRvckl0ZW0iIGRlc3RpbmF0aW9uPSJJZEktd2ItMUpEIiBpZD0i RElyLXBlLVhJOCIvPgogICAgICAgICAgICAgICAgIDxvdXRsZXQgcHJvcGVydHk9Il9uZXdXZWJL aXQyV2luZG93SXRlbSIgZGVzdGluYXRpb249IjU3MSIgaWQ9IjFHdi1tSy1hdWwiLz4KICAgICAg ICAgICAgIDwvY29ubmVjdGlvbnM+CiAgICAgICAgIDwvY3VzdG9tT2JqZWN0PgpkaWZmIC0tZ2l0 IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0gYi9U b29scy9NaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQppbmRleCBi YjQyOGI1YzdmNmFjNDIxMTZmY2Y0MDVhNzA1N2E4NmYwZDA2MjUyLi5mMjZiNDE5ZTg4ZGNiNWNh MDYwZTcwMDRhZGEwNzY3OTIyNzQyMzFjIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9t YWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9t YWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAtNDQsNiArNDQsOCBAQCAtICh2b2lk KWF3YWtlRnJvbU5pYgogICAgIF93ZWJWaWV3ID0gW1tXZWJWaWV3IGFsbG9jXSBpbml0V2l0aEZy YW1lOltjb250YWluZXJWaWV3IGJvdW5kc10gZnJhbWVOYW1lOm5pbCBncm91cE5hbWU6QCJNaW5p QnJvd3NlciJdOwogICAgIFtfd2ViVmlldyBzZXRBdXRvcmVzaXppbmdNYXNrOihOU1ZpZXdXaWR0 aFNpemFibGUgfCBOU1ZpZXdIZWlnaHRTaXphYmxlKV07CiAKKyAgICBfd2ViVmlldy5lZGl0YWJs ZSA9IHNlbGYuaXNFZGl0YWJsZTsKKwogICAgIFtfd2ViVmlldyBzZXRGcmFtZUxvYWREZWxlZ2F0 ZTpzZWxmXTsKICAgICBbX3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpzZWxmXTsKICAgICBbX3dlYlZp ZXcgc2V0UmVzb3VyY2VMb2FkRGVsZWdhdGU6c2VsZl07CkBAIC03OSw2ICs4MSwxMSBAQCAtICh2 b2lkKWxvYWRVUkxTdHJpbmc6KE5TU3RyaW5nICopdXJsU3RyaW5nCiAgICAgW3NlbGYgZmV0Y2g6 bmlsXTsKIH0KIAorLSAodm9pZClsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilIVE1MU3RyaW5n Cit7CisgICAgW193ZWJWaWV3Lm1haW5GcmFtZSBsb2FkSFRNTFN0cmluZzpIVE1MU3RyaW5nIGJh c2VVUkw6bmlsXTsKK30KKwogLSAoSUJBY3Rpb24pZmV0Y2g6KGlkKXNlbmRlcgogewogICAgIFt1 cmxUZXh0IHNldFN0cmluZ1ZhbHVlOltzZWxmIGFkZFByb3RvY29sSWZOZWNlc3Nhcnk6W3VybFRl eHQgc3RyaW5nVmFsdWVdXV07CkBAIC0xMzksNiArMTQ2LDggQEAgLSAoQk9PTCl2YWxpZGF0ZU1l bnVJdGVtOihOU01lbnVJdGVtICopbWVudUl0ZW0KICAgICAgICAgW21lbnVJdGVtIHNldFRpdGxl Oltfd2ViVmlldyB3aW5kb3ddID8gQCJSZW1vdmUgV2ViIFZpZXciIDogQCJJbnNlcnQgV2ViIFZp ZXciXTsKICAgICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHRvZ2dsZVpvb21Nb2RlOikp CiAgICAgICAgIFttZW51SXRlbSBzZXRTdGF0ZTpfem9vbVRleHRPbmx5ID8gTlNPblN0YXRlIDog TlNPZmZTdGF0ZV07CisgICAgZWxzZSBpZiAoYWN0aW9uID09IEBzZWxlY3Rvcih0b2dnbGVFZGl0 YWJsZTopKQorICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6c2VsZi5pc0VkaXRhYmxlID8gTlNP blN0YXRlIDogTlNPZmZTdGF0ZV07CiAKICAgICBpZiAoYWN0aW9uID09IEBzZWxlY3RvcihzZXRQ YWdlU2NhbGU6KSkKICAgICAgICAgW21lbnVJdGVtIHNldFN0YXRlOmFyZUVzc2VudGlhbGx5RXF1 YWwoW193ZWJWaWV3IF92aWV3U2NhbGVGYWN0b3JdLCBbc2VsZiBwYWdlU2NhbGVGb3JNZW51SXRl bVRhZzpbbWVudUl0ZW0gdGFnXV0pXTsKQEAgLTI0Nyw2ICsyNTYsMTIgQEAgLSAoTlNWaWV3ICop bWFpbkNvbnRlbnRWaWV3CiAgICAgcmV0dXJuIF93ZWJWaWV3OwogfQogCistICh2b2lkKXNldEVk aXRhYmxlOihCT09MKWVkaXRhYmxlCit7CisgICAgW3N1cGVyIHNldEVkaXRhYmxlOmVkaXRhYmxl XTsKKyAgICBfd2ViVmlldy5lZGl0YWJsZSA9IGVkaXRhYmxlOworfQorCiAtICh2b2lkKWRpZENo YW5nZVNldHRpbmdzCiB7CiAgICAgU2V0dGluZ3NDb250cm9sbGVyICpzZXR0aW5ncyA9IFtTZXR0 aW5nc0NvbnRyb2xsZXIgc2hhcmVkXTsKQEAgLTMxNyw4ICszMzIsOCBAQCAtICh2b2lkKXVwZGF0 ZVRpdGxlOihOU1N0cmluZyAqKXRpdGxlCiAgICAgICAgIE5TVVJMICp1cmwgPSBfd2ViVmlldy5t YWluRnJhbWUuZGF0YVNvdXJjZS5yZXF1ZXN0LlVSTDsKICAgICAgICAgdGl0bGUgPSB1cmwubGFz dFBhdGhDb21wb25lbnQgPzogdXJsLl93ZWJfdXNlclZpc2libGVTdHJpbmc7CiAgICAgfQotICAg IAotICAgIFtzZWxmLndpbmRvdyBzZXRUaXRsZTpbdGl0bGUgc3RyaW5nQnlBcHBlbmRpbmdTdHJp bmc6QCIgW1dLMV0iXV07CisKKyAgICBbc2VsZi53aW5kb3cgc2V0VGl0bGU6W3RpdGxlIHN0cmlu Z0J5QXBwZW5kaW5nRm9ybWF0OkAiIFtXSzFdJUAiLCBfd2ViVmlldy5lZGl0YWJsZSA/IEAiIFtF ZGl0YWJsZV0iIDogQCIiXV07CiB9CiAKIC0gKFdlYlZpZXcgKil3ZWJWaWV3OihXZWJWaWV3ICop c2VuZGVyIGNyZWF0ZVdlYlZpZXdXaXRoUmVxdWVzdDooTlNVUkxSZXF1ZXN0ICopcmVxdWVzdApk aWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0gYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIu bQppbmRleCAxNTM4NDYzM2YxZDRiY2I4MTY1NmZlMzhmY2E1NDZjOGE2MDllNWQyLi44ZWRlMjU1 ODk4MzdiZjY2YWE1Yjg2MTMyM2I0ZWNiNjA5NzAxYjJhIDEwMDY0NAotLS0gYS9Ub29scy9NaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQorKysgYi9Ub29scy9NaW5p QnJvd3Nlci9tYWMvV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubQpAQCAtNjksNiArNjksNyBA QCAtICh2b2lkKWF3YWtlRnJvbU5pYgogCiAgICAgX3dlYlZpZXcuYWxsb3dzTWFnbmlmaWNhdGlv biA9IFlFUzsKICAgICBfd2ViVmlldy5hbGxvd3NCYWNrRm9yd2FyZE5hdmlnYXRpb25HZXN0dXJl cyA9IFlFUzsKKyAgICBfd2ViVmlldy5fZWRpdGFibGUgPSBzZWxmLmlzRWRpdGFibGU7CiAKICAg ICBbX3dlYlZpZXcgc2V0QXV0b3Jlc2l6aW5nTWFzazooTlNWaWV3V2lkdGhTaXphYmxlIHwgTlNW aWV3SGVpZ2h0U2l6YWJsZSldOwogICAgIFtjb250YWluZXJWaWV3IGFkZFN1YnZpZXc6X3dlYlZp ZXddOwpAQCAtMjAxLDYgKzIwMiw4IEBAIC0gKEJPT0wpdmFsaWRhdGVNZW51SXRlbTooTlNNZW51 SXRlbSAqKW1lbnVJdGVtCiAgICAgICAgIFttZW51SXRlbSBzZXRUaXRsZTpbX3dlYlZpZXcgd2lu ZG93XSA/IEAiUmVtb3ZlIFdlYiBWaWV3IiA6IEAiSW5zZXJ0IFdlYiBWaWV3Il07CiAgICAgZWxz ZSBpZiAoYWN0aW9uID09IEBzZWxlY3Rvcih0b2dnbGVab29tTW9kZTopKQogICAgICAgICBbbWVu dUl0ZW0gc2V0U3RhdGU6X3pvb21UZXh0T25seSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3RhdGVdOwor ICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlRWRpdGFibGU6KSkKKyAgICAg ICAgW21lbnVJdGVtIHNldFN0YXRlOnNlbGYuaXNFZGl0YWJsZSA/IE5TT25TdGF0ZSA6IE5TT2Zm U3RhdGVdOwogCiAgICAgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3Ioc2V0UGFnZVNjYWxlOikpCiAg ICAgICAgIFttZW51SXRlbSBzZXRTdGF0ZTphcmVFc3NlbnRpYWxseUVxdWFsKFtfd2ViVmlldyBf cGFnZVNjYWxlXSwgW3NlbGYgcGFnZVNjYWxlRm9yTWVudUl0ZW1UYWc6W21lbnVJdGVtIHRhZ11d KV07CkBAIC0yODQsNiArMjg3LDEyIEBAIC0gKE5TVmlldyAqKW1haW5Db250ZW50VmlldwogICAg IHJldHVybiBfd2ViVmlldzsKIH0KIAorLSAodm9pZClzZXRFZGl0YWJsZTooQk9PTCllZGl0YWJs ZQoreworICAgIFtzdXBlciBzZXRFZGl0YWJsZTplZGl0YWJsZV07CisgICAgX3dlYlZpZXcuX2Vk aXRhYmxlID0gZWRpdGFibGU7Cit9CisKIC0gKEJPT0wpdmFsaWRhdGVVc2VySW50ZXJmYWNlSXRl bTooaWQgPE5TVmFsaWRhdGVkVXNlckludGVyZmFjZUl0ZW0+KWl0ZW0KIHsKICAgICBTRUwgYWN0 aW9uID0gaXRlbS5hY3Rpb247CkBAIC00MTUsNyArNDI0LDcgQEAgLSAodm9pZCl1cGRhdGVUaXRs ZTooTlNTdHJpbmcgKil0aXRsZQogICAgICAgICB0aXRsZSA9IHVybC5sYXN0UGF0aENvbXBvbmVu dCA/OiB1cmwuX3dlYl91c2VyVmlzaWJsZVN0cmluZzsKICAgICB9CiAKLSAgICBzZWxmLndpbmRv dy50aXRsZSA9IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAlQCBbV0syICVkXSIsIF9p c1ByaXZhdGVCcm93c2luZ1dpbmRvdyA/IEAi8J+ZiCAiIDogQCIiLCB0aXRsZSwgX3dlYlZpZXcu X3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKyAgICBzZWxmLndpbmRvdy50aXRsZSA9IFtOU1N0cmlu ZyBzdHJpbmdXaXRoRm9ybWF0OkAiJUAlQCBbV0syICVkXSVAIiwgX2lzUHJpdmF0ZUJyb3dzaW5n V2luZG93ID8gQCLwn5mIICIgOiBAIiIsIHRpdGxlLCBfd2ViVmlldy5fd2ViUHJvY2Vzc0lkZW50 aWZpZXIsIF93ZWJWaWV3Ll9lZGl0YWJsZSA/IEAiIFtFZGl0YWJsZV0iIDogQCIiXTsKIH0KIAog LSAodm9pZClvYnNlcnZlVmFsdWVGb3JLZXlQYXRoOihOU1N0cmluZyAqKWtleVBhdGggb2ZPYmpl Y3Q6KGlkKW9iamVjdCBjaGFuZ2U6KE5TRGljdGlvbmFyeSAqKWNoYW5nZSBjb250ZXh0Oih2b2lk ICopY29udGV4dApAQCAtNTI1LDYgKzUzNCwxMSBAQCAtICh2b2lkKWxvYWRVUkxTdHJpbmc6KE5T U3RyaW5nICopdXJsU3RyaW5nCiAgICAgW3NlbGYgZmV0Y2g6bmlsXTsKIH0KIAorLSAodm9pZCls b2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilIVE1MU3RyaW5nCit7CisgICAgW193ZWJWaWV3IGxv YWRIVE1MU3RyaW5nOkhUTUxTdHJpbmcgYmFzZVVSTDpuaWxdOworfQorCiBzdGF0aWMgTlNTZXQg KmRhdGFUeXBlcygpCiB7CiAgICAgcmV0dXJuIFtXS1dlYnNpdGVEYXRhU3RvcmUgYWxsV2Vic2l0 ZURhdGFUeXBlc107Cg== 298274 2017-01-07 05:12:47 -0800 2017-01-07 13:11:20 -0800 Patch bug-166801-20170107051116.patch text/plain 16508 thorton U3VidmVyc2lvbiBSZXZpc2lvbjogMjEwNDc2CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYjYwYmM2Y2MwYzM4N2Y0NGJjZDU5ZWE4OTQyZDJkN2M4 NTJhOTNmOC4uZWEyZDg4NjBlZGI1MWYwMDY0MDUwODVjNTAxNTYyMGNlY2ZlMzZjMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDQw IEBACiAyMDE3LTAxLTA3ICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgog CisgICAgICAgIEFkZCB0aGUgYWJpbGl0eSB0byBjcmVhdGUgZW1wdHkgY29udGVudEVkaXRhYmxl IHdpbmRvd3MgaW4gTWluaUJyb3dzZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE2NjgwMQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLmg6CisgICAgICAg ICogTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm06CisgICAgICAgICgtW0Jyb3dzZXJBcHBE ZWxlZ2F0ZSBjcmVhdGVCcm93c2VyV2luZG93Q29udHJvbGxlcjpdKToKKyAgICAgICAgKC1bQnJv d3NlckFwcERlbGVnYXRlIG5ld1dpbmRvdzpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVn YXRlIG5ld0VkaXRvcldpbmRvdzpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIG9w ZW5Eb2N1bWVudDpdKToKKyAgICAgICAgKC1bQnJvd3NlckFwcERlbGVnYXRlIF91cGRhdGVOZXdX aW5kb3dLZXlFcXVpdmFsZW50c10pOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2Vy V2luZG93Q29udHJvbGxlci5oOgorICAgICAgICAqIE1pbmlCcm93c2VyL21hYy9Ccm93c2VyV2lu ZG93Q29udHJvbGxlci5tOgorICAgICAgICAoLVtCcm93c2VyV2luZG93Q29udHJvbGxlciBsb2Fk SFRNTFN0cmluZzpdKToKKyAgICAgICAgKC1bQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdG9nZ2xl RWRpdGFibGU6XSk6CisgICAgICAgICogTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYjoKKyAg ICAgICAgKiBNaW5pQnJvd3Nlci9tYWMvV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIubToKKyAg ICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgYXdha2VGcm9tTmliXSk6CisgICAg ICAgICgtW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOl0pOgorICAg ICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciB2YWxpZGF0ZU1lbnVJdGVtOl0pOgor ICAgICAgICAoLVtXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciBzZXRFZGl0YWJsZTpdKToKKyAg ICAgICAgKC1bV0sxQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdXBkYXRlVGl0bGU6XSk6CisgICAg ICAgICogTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm06CisgICAg ICAgICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGF3YWtlRnJvbU5pYl0pOgorICAgICAg ICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciB2YWxpZGF0ZU1lbnVJdGVtOl0pOgorICAg ICAgICAoLVtXSzJCcm93c2VyV2luZG93Q29udHJvbGxlciBzZXRFZGl0YWJsZTpdKToKKyAgICAg ICAgKC1bV0syQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgdXBkYXRlVGl0bGU6XSk6CisgICAgICAg ICgtW1dLMkJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOl0pOgorICAgICAg ICBNZXJnZSBtb3JlIGZ1bmN0aW9uYWxpdHkgZnJvbSBXZWJFZGl0aW5nVGVzdGVyLgorICAgICAg ICBBZGQgdHdvIG1lbnUgaXRlbXMgZm9yIGNyZWF0aW5nIGVtcHR5IGVkaXRhYmxlIFdlYktpdDEv MiB3aW5kb3dzLgorICAgICAgICBBZGQgYSBtZW51IGl0ZW0gdG8gdGhlIEVkaXQgbWVudSB0byB0 b2dnbGUgZWRpdGFiaWxpdHkgb24gYW55IHdpbmRvdy4KKworMjAxNy0wMS0wNyAgVGltIEhvcnRv biAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KKwogICAgICAgICBJbXBsZW1lbnQgZmluZC1p bi1wYWdlIGluIE1pbmlCcm93c2VyCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xNjY3OTkKIApkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFj L0FwcERlbGVnYXRlLmggYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUuaAppbmRl eCBlNzM5ZGVkYWNlYjcxYWIyMDMwZWY4MzM3OTZhZjFiNTY4MDg2OGE4Li41NjViZGQ5OWFlNGE3 OTkxOWRiY2I3MGRhOWJjZGZjZjg0NmRlY2EzIDEwMDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nl ci9tYWMvQXBwRGVsZWdhdGUuaAorKysgYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdh dGUuaApAQCAtMzMsNiArMzMsOCBAQAogCiAgICAgSUJPdXRsZXQgTlNNZW51SXRlbSAqX25ld1dl YktpdDFXaW5kb3dJdGVtOwogICAgIElCT3V0bGV0IE5TTWVudUl0ZW0gKl9uZXdXZWJLaXQyV2lu ZG93SXRlbTsKKyAgICBJQk91dGxldCBOU01lbnVJdGVtICpfbmV3V2ViS2l0MUVkaXRvckl0ZW07 CisgICAgSUJPdXRsZXQgTlNNZW51SXRlbSAqX25ld1dlYktpdDJFZGl0b3JJdGVtOwogfQogCiAt ICh2b2lkKWJyb3dzZXJXaW5kb3dXaWxsQ2xvc2U6KE5TV2luZG93ICopd2luZG93OwpkaWZmIC0t Z2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0FwcERlbGVnYXRlLm0gYi9Ub29scy9NaW5pQnJv d3Nlci9tYWMvQXBwRGVsZWdhdGUubQppbmRleCA3ODExYjc3YzRlNzEwNzQ2NmE1NDI2OTNhZjll OWU4NjA5NWE5M2VjLi44NDZhNzZmNGVlMmI1YTc3NTFiMjJlMDkwYWNhYmY3YmUwZjA2M2VmIDEw MDY0NAotLS0gYS9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUubQorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvQXBwRGVsZWdhdGUubQpAQCAtNDQsNyArNDQsOSBAQAogCiBlbnVt IHsKICAgICBXZWJLaXQxTmV3V2luZG93VGFnID0gMSwKLSAgICBXZWJLaXQyTmV3V2luZG93VGFn ID0gMgorICAgIFdlYktpdDJOZXdXaW5kb3dUYWcgPSAyLAorICAgIFdlYktpdDFOZXdFZGl0b3JU YWcgPSAzLAorICAgIFdlYktpdDJOZXdFZGl0b3JUYWcgPSA0CiB9OwogCiBAaW50ZXJmYWNlIE5T QXBwbGljYXRpb24gKFRvdWNoQmFyKQpAQCAtMTIwLDMwICsxMjIsNDQgQEAgLSAodm9pZClhd2Fr ZUZyb21OaWIKIAogI2VuZGlmCiAKLQotLSAoSUJBY3Rpb24pbmV3V2luZG93OihpZClzZW5kZXIK Ky0gKEJyb3dzZXJXaW5kb3dDb250cm9sbGVyICopY3JlYXRlQnJvd3NlcldpbmRvd0NvbnRyb2xs ZXI6KGlkKXNlbmRlcgogewogICAgIEJyb3dzZXJXaW5kb3dDb250cm9sbGVyICpjb250cm9sbGVy ID0gbmlsOwotCiAgICAgQk9PTCB1c2VXZWJLaXQyID0gTk87CisgICAgQk9PTCBtYWtlRWRpdGFi bGUgPSBOTzsKIAogICAgIGlmICghW3NlbmRlciByZXNwb25kc1RvU2VsZWN0b3I6QHNlbGVjdG9y KHRhZyldKQogICAgICAgICB1c2VXZWJLaXQyID0gW1NldHRpbmdzQ29udHJvbGxlciBzaGFyZWRd LnVzZVdlYktpdDJCeURlZmF1bHQ7Ci0gICAgZWxzZQotICAgICAgICB1c2VXZWJLaXQyID0gW3Nl bmRlciB0YWddID09IFdlYktpdDJOZXdXaW5kb3dUYWc7Ci0gICAgCisgICAgZWxzZSB7CisgICAg ICAgIHVzZVdlYktpdDIgPSBbc2VuZGVyIHRhZ10gPT0gV2ViS2l0Mk5ld1dpbmRvd1RhZyB8fCBb c2VuZGVyIHRhZ10gPT0gV2ViS2l0Mk5ld0VkaXRvclRhZzsKKyAgICAgICAgbWFrZUVkaXRhYmxl ID0gW3NlbmRlciB0YWddID09IFdlYktpdDFOZXdFZGl0b3JUYWcgfHwgW3NlbmRlciB0YWddID09 IFdlYktpdDJOZXdFZGl0b3JUYWc7CisgICAgfQorCiAgICAgaWYgKCF1c2VXZWJLaXQyKQogICAg ICAgICBjb250cm9sbGVyID0gW1tXSzFCcm93c2VyV2luZG93Q29udHJvbGxlciBhbGxvY10gaW5p dFdpdGhXaW5kb3dOaWJOYW1lOkAiQnJvd3NlcldpbmRvdyJdOwogI2lmIFdLX0FQSV9FTkFCTEVE CiAgICAgZWxzZQogICAgICAgICBjb250cm9sbGVyID0gW1tXSzJCcm93c2VyV2luZG93Q29udHJv bGxlciBhbGxvY10gaW5pdFdpdGhDb25maWd1cmF0aW9uOmRlZmF1bHRDb25maWd1cmF0aW9uKCld OwogI2VuZGlmCisKKyAgICBpZiAobWFrZUVkaXRhYmxlKQorICAgICAgICBjb250cm9sbGVyLmVk aXRhYmxlID0gWUVTOworCisgICAgaWYgKCFjb250cm9sbGVyKQorICAgICAgICByZXR1cm4gbmls OworCisgICAgW19icm93c2VyV2luZG93Q29udHJvbGxlcnMgYWRkT2JqZWN0OmNvbnRyb2xsZXJd OworCisgICAgcmV0dXJuIGNvbnRyb2xsZXI7Cit9CisKKy0gKElCQWN0aW9uKW5ld1dpbmRvdzoo aWQpc2VuZGVyCit7CisgICAgQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIgKmNvbnRyb2xsZXIgPSBb c2VsZiBjcmVhdGVCcm93c2VyV2luZG93Q29udHJvbGxlcjpzZW5kZXJdOwogICAgIGlmICghY29u dHJvbGxlcikKICAgICAgICAgcmV0dXJuOwogCiAgICAgW1tjb250cm9sbGVyIHdpbmRvd10gbWFr ZUtleUFuZE9yZGVyRnJvbnQ6c2VuZGVyXTsKLSAgICBbX2Jyb3dzZXJXaW5kb3dDb250cm9sbGVy cyBhZGRPYmplY3Q6Y29udHJvbGxlcl07Ci0gICAgCiAgICAgW2NvbnRyb2xsZXIgbG9hZFVSTFN0 cmluZzpbU2V0dGluZ3NDb250cm9sbGVyIHNoYXJlZF0uZGVmYXVsdFVSTF07CiB9CiAKQEAgLTE2 Myw2ICsxNzksMTYgQEAgLSAoSUJBY3Rpb24pbmV3UHJpdmF0ZVdpbmRvdzooaWQpc2VuZGVyCiAj ZW5kaWYKIH0KIAorLSAoSUJBY3Rpb24pbmV3RWRpdG9yV2luZG93OihpZClzZW5kZXIKK3sKKyAg ICBCcm93c2VyV2luZG93Q29udHJvbGxlciAqY29udHJvbGxlciA9IFtzZWxmIGNyZWF0ZUJyb3dz ZXJXaW5kb3dDb250cm9sbGVyOnNlbmRlcl07CisgICAgaWYgKCFjb250cm9sbGVyKQorICAgICAg ICByZXR1cm47CisKKyAgICBbW2NvbnRyb2xsZXIgd2luZG93XSBtYWtlS2V5QW5kT3JkZXJGcm9u dDpzZW5kZXJdOworICAgIFtjb250cm9sbGVyIGxvYWRIVE1MU3RyaW5nOkAiPGh0bWw+PGJvZHk+ PC9ib2R5PjwvaHRtbD4iXTsKK30KKwogLSAodm9pZClicm93c2VyV2luZG93V2lsbENsb3NlOihO U1dpbmRvdyAqKXdpbmRvdwogewogICAgIFtfYnJvd3NlcldpbmRvd0NvbnRyb2xsZXJzIHJlbW92 ZU9iamVjdDp3aW5kb3cud2luZG93Q29udHJvbGxlcl07CkBAIC0yMjIsMTEgKzI0OCwxMSBAQCAt IChJQkFjdGlvbilvcGVuRG9jdW1lbnQ6KGlkKXNlbmRlcgogICAgICAgICBpZiAocmVzdWx0ICE9 IE5TRmlsZUhhbmRsaW5nUGFuZWxPS0J1dHRvbikKICAgICAgICAgICAgIHJldHVybjsKIAotICAg ICAgICBCcm93c2VyV2luZG93Q29udHJvbGxlciAqbmV3QnJvd3NlcldpbmRvd0NvbnRyb2xsZXIg PSBbW1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyIGFsbG9jXSBpbml0V2l0aFdpbmRvd05pYk5h bWU6QCJCcm93c2VyV2luZG93Il07Ci0gICAgICAgIFtuZXdCcm93c2VyV2luZG93Q29udHJvbGxl ci53aW5kb3cgbWFrZUtleUFuZE9yZGVyRnJvbnQ6c2VsZl07CisgICAgICAgIEJyb3dzZXJXaW5k b3dDb250cm9sbGVyICpjb250cm9sbGVyID0gW3NlbGYgY3JlYXRlQnJvd3NlcldpbmRvd0NvbnRy b2xsZXI6bmlsXTsKKyAgICAgICAgW2NvbnRyb2xsZXIud2luZG93IG1ha2VLZXlBbmRPcmRlckZy b250OnNlbGZdOwogCiAgICAgICAgIE5TVVJMICp1cmwgPSBbb3BlblBhbmVsLlVSTHMgb2JqZWN0 QXRJbmRleDowXTsKLSAgICAgICAgW25ld0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyIGxvYWRVUkxT dHJpbmc6W3VybCBhYnNvbHV0ZVN0cmluZ11dOworICAgICAgICBbY29udHJvbGxlciBsb2FkVVJM U3RyaW5nOlt1cmwgYWJzb2x1dGVTdHJpbmddXTsKICAgICB9XTsKIH0KIApAQCAtMjQxLDEzICsy NjcsMTMgQEAgLSAodm9pZClkaWRDaGFuZ2VTZXR0aW5ncwogCiAtICh2b2lkKV91cGRhdGVOZXdX aW5kb3dLZXlFcXVpdmFsZW50cwogewotICAgIGlmIChbW1NldHRpbmdzQ29udHJvbGxlciBzaGFy ZWRdIHVzZVdlYktpdDJCeURlZmF1bHRdKSB7Ci0gICAgICAgIFtfbmV3V2ViS2l0MVdpbmRvd0l0 ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzazpOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFu ZCB8IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb25dOwotICAgICAgICBbX25ld1dlYktpdDJXaW5k b3dJdGVtIHNldEtleUVxdWl2YWxlbnRNb2RpZmllck1hc2s6TlNFdmVudE1vZGlmaWVyRmxhZ0Nv bW1hbmRdOwotICAgIH0gZWxzZSB7Ci0gICAgICAgIFtfbmV3V2ViS2l0MVdpbmRvd0l0ZW0gc2V0 S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzazpOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZF07Ci0g ICAgICAgIFtfbmV3V2ViS2l0MldpbmRvd0l0ZW0gc2V0S2V5RXF1aXZhbGVudE1vZGlmaWVyTWFz azpOU0V2ZW50TW9kaWZpZXJGbGFnQ29tbWFuZCB8IE5TRXZlbnRNb2RpZmllckZsYWdPcHRpb25d OwotICAgIH0KKyAgICBOU0V2ZW50TW9kaWZpZXJGbGFncyB3ZWJLaXQxRmxhZ3MgPSBbU2V0dGlu Z3NDb250cm9sbGVyIHNoYXJlZF0udXNlV2ViS2l0MkJ5RGVmYXVsdCA/IE5TRXZlbnRNb2RpZmll ckZsYWdPcHRpb24gOiAwOworICAgIE5TRXZlbnRNb2RpZmllckZsYWdzIHdlYktpdDJGbGFncyA9 IFtTZXR0aW5nc0NvbnRyb2xsZXIgc2hhcmVkXS51c2VXZWJLaXQyQnlEZWZhdWx0ID8gMCA6IE5T RXZlbnRNb2RpZmllckZsYWdPcHRpb247CisKKyAgICBfbmV3V2ViS2l0MVdpbmRvd0l0ZW0ua2V5 RXF1aXZhbGVudE1vZGlmaWVyTWFzayA9IE5TRXZlbnRNb2RpZmllckZsYWdDb21tYW5kIHwgd2Vi S2l0MUZsYWdzOworICAgIF9uZXdXZWJLaXQyV2luZG93SXRlbS5rZXlFcXVpdmFsZW50TW9kaWZp ZXJNYXNrID0gTlNFdmVudE1vZGlmaWVyRmxhZ0NvbW1hbmQgfCB3ZWJLaXQyRmxhZ3M7CisgICAg X25ld1dlYktpdDFFZGl0b3JJdGVtLmtleUVxdWl2YWxlbnRNb2RpZmllck1hc2sgPSBOU0V2ZW50 TW9kaWZpZXJGbGFnQ29tbWFuZCB8IHdlYktpdDFGbGFnczsKKyAgICBfbmV3V2ViS2l0MkVkaXRv ckl0ZW0ua2V5RXF1aXZhbGVudE1vZGlmaWVyTWFzayA9IE5TRXZlbnRNb2RpZmllckZsYWdDb21t YW5kIHwgd2ViS2l0MkZsYWdzOwogfQogCiAtIChJQkFjdGlvbilzaG93RXh0ZW5zaW9uc01hbmFn ZXI6KGlkKXNlbmRlcgpkaWZmIC0tZ2l0IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJX aW5kb3dDb250cm9sbGVyLmggYi9Ub29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0Nv bnRyb2xsZXIuaAppbmRleCA1Yjg1Y2U0Njg0MmMzNWI0NTE1YjY1YTUyMmM1ZjQxYmUyODRmNTQ1 Li5iN2FhNWNmNDExZTIyMzlkNzcxOTA5MWY4NjhhMDRiYzJkMDRkNTliIDEwMDY0NAotLS0gYS9U b29scy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaAorKysgYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvQnJvd3NlcldpbmRvd0NvbnRyb2xsZXIuaApAQCAtNDAsNiArNDAs NyBAQAogfQogCiAtICh2b2lkKWxvYWRVUkxTdHJpbmc6KE5TU3RyaW5nICopdXJsU3RyaW5nOwor LSAodm9pZClsb2FkSFRNTFN0cmluZzooTlNTdHJpbmcgKilIVE1MU3RyaW5nOwogLSAoTlNTdHJp bmcgKilhZGRQcm90b2NvbElmTmVjZXNzYXJ5OihOU1N0cmluZyAqKWFkZHJlc3M7CiAKIC0gKHZv aWQpYXBwbGljYXRpb25UZXJtaW5hdGluZzsKQEAgLTc5LDUgKzgwLDggQEAKIAogLSAoQ0dGbG9h dClwYWdlU2NhbGVGb3JNZW51SXRlbVRhZzooTlNJbnRlZ2VyKXRhZzsKIAorQHByb3BlcnR5IChu b25hdG9taWMsIGFzc2lnbiwgZ2V0dGVyPWlzRWRpdGFibGUpIEJPT0wgZWRpdGFibGU7CistIChJ QkFjdGlvbil0b2dnbGVFZGl0YWJsZTooaWQpc2VuZGVyOworCiBAZW5kCiAKZGlmZiAtLWdpdCBh L1Rvb2xzL01pbmlCcm93c2VyL21hYy9Ccm93c2VyV2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMv TWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXggMGMwZjU0OGEz OGZkNmI2NDNjMWRhY2QzYmQ3ZDE0NmM4MWFlNWE0OC4uZDk2ZWI1MTBmZDBmYmVlOGU3OGFhYmEy MDlmMTgxZjNhODZhODEwMSAxMDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dz ZXJXaW5kb3dDb250cm9sbGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL0Jyb3dzZXJX aW5kb3dDb250cm9sbGVyLm0KQEAgLTU4LDYgKzU4LDEwIEBAIC0gKHZvaWQpbG9hZFVSTFN0cmlu ZzooTlNTdHJpbmcgKil1cmxTdHJpbmcKIHsKIH0KIAorLSAodm9pZClsb2FkSFRNTFN0cmluZzoo TlNTdHJpbmcgKilIVE1MU3RyaW5nCit7Cit9CisKIC0gKHZvaWQpYXBwbGljYXRpb25UZXJtaW5h dGluZwogewogfQpAQCAtMjExLDYgKzIxNSwxMSBAQCAtIChOU1ZpZXcgKiltYWluQ29udGVudFZp ZXcKICAgICByZXR1cm4gbmlsOwogfQogCistIChJQkFjdGlvbil0b2dnbGVFZGl0YWJsZTooaWQp c2VuZGVyCit7CisgICAgc2VsZi5lZGl0YWJsZSA9ICFzZWxmLmlzRWRpdGFibGU7Cit9CisKICNw cmFnbWEgbWFyayAtCiAjcHJhZ21hIG1hcmsgTlNTaGFyaW5nU2VydmljZVBpY2tlckRlbGVnYXRl CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIgYi9Ub29s cy9NaW5pQnJvd3Nlci9tYWMvTWFpbk1lbnUueGliCmluZGV4IDY3YTk0NWY0ZjliMTMzOTczYWFi NGY5OWJiMTY1ODMyMDE3MGZmMjMuLjFiMDkzZGUyNjM5ZjhkNjMyYTFhMTZiMjAwNWVjZDFlNWFj N2M5OGYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9NYWluTWVudS54aWIKKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL01haW5NZW51LnhpYgpAQCAtODgsNiArODgsMTcgQEAK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9Im5l d1ByaXZhdGVXaW5kb3c6IiB0YXJnZXQ9Ii0xIiBpZD0ibWY1LXppLWE1UiIvPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8L2Nvbm5lY3Rpb25zPgogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDwvbWVudUl0ZW0+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1lbnVJ dGVtIHRpdGxlPSJOZXcgV2ViS2l0MSBFZGl0b3IiIHRhZz0iMyIga2V5RXF1aXZhbGVudD0iTiIg aWQ9ImpOUi1aMy1ZV2kiIHVzZXJMYWJlbD0iTmV3IFdlYktpdDEgRWRpdG9yIj4KKyAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPGNvbm5lY3Rpb25zPgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPGFjdGlvbiBzZWxlY3Rvcj0ibmV3RWRpdG9yV2luZG93OiIgdGFy Z2V0PSItMSIgaWQ9Ik52NS1jMC1LUlAiLz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPC9jb25uZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L21lbnVJdGVt PgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxtZW51SXRlbSB0aXRsZT0iTmV3IFdlYktp dDIgRWRpdG9yIiB0YWc9IjQiIGtleUVxdWl2YWxlbnQ9Ik4iIGlkPSJJZEktd2ItMUpEIiB1c2Vy TGFiZWw9Ik5ldyBXZWJLaXQyIEVkaXRvciI+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIDxtb2RpZmllck1hc2sga2V5PSJrZXlFcXVpdmFsZW50TW9kaWZpZXJNYXNrIiBvcHRpb249 IllFUyIgY29tbWFuZD0iWUVTIi8+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxj b25uZWN0aW9ucz4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24g c2VsZWN0b3I9Im5ld0VkaXRvcldpbmRvdzoiIHRhcmdldD0iLTEiIGlkPSJrazYtUjQtaWVjIi8+ CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CisgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KICAgICAgICAgICAgICAgICAgICAgICAg ICAgICA8bWVudUl0ZW0gdGl0bGU9Ik9wZW7igKYiIGtleUVxdWl2YWxlbnQ9Im8iIGlkPSI3MiI+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxjb25uZWN0aW9ucz4KICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9Im9wZW5Eb2N1bWVu dDoiIHRhcmdldD0iLTEiIGlkPSIzNzQiLz4KQEAgLTE2MCw2ICsxNzEsMTUgQEAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxhY3Rpb24gc2VsZWN0b3I9InJlZG86IiB0YXJn ZXQ9Ii0xIiBpZD0iMjMxIi8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29u bmVjdGlvbnM+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICA8bWVudUl0ZW0gaXNTZXBhcmF0b3JJdGVtPSJZRVMiIGlk PSJmVUwtN2stRHFnIj4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPG1vZGlmaWVy TWFzayBrZXk9ImtleUVxdWl2YWxlbnRNb2RpZmllck1hc2siIGNvbW1hbmQ9IllFUyIvPgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgIDwvbWVudUl0ZW0+CisgICAgICAgICAgICAgICAgICAg ICAgICAgICAgPG1lbnVJdGVtIHRpdGxlPSJFZGl0YWJsZSIgaWQ9ImtHNC1oUy1KYlgiPgorICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1aXZh bGVudE1vZGlmaWVyTWFzayIvPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8Y29u bmVjdGlvbnM+CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8YWN0aW9uIHNl bGVjdG9yPSJ0b2dnbGVFZGl0YWJsZToiIHRhcmdldD0iLTEiIGlkPSI2bXktYjItZWZmIi8+Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDwvY29ubmVjdGlvbnM+CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPC9tZW51SXRlbT4KICAgICAgICAgICAgICAgICAgICAgICAgICAg ICA8bWVudUl0ZW0gaXNTZXBhcmF0b3JJdGVtPSJZRVMiIGlkPSIyMDYiPgogICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICA8bW9kaWZpZXJNYXNrIGtleT0ia2V5RXF1aXZhbGVudE1vZGlm aWVyTWFzayIgY29tbWFuZD0iWUVTIi8+CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9t ZW51SXRlbT4KQEAgLTU2Niw3ICs1ODYsOSBAQAogICAgICAgICA8L21lbnU+CiAgICAgICAgIDxj dXN0b21PYmplY3QgaWQ9IjQ5NCIgY3VzdG9tQ2xhc3M9IkJyb3dzZXJBcHBEZWxlZ2F0ZSI+CiAg ICAgICAgICAgICA8Y29ubmVjdGlvbnM+CisgICAgICAgICAgICAgICAgPG91dGxldCBwcm9wZXJ0 eT0iX25ld1dlYktpdDFFZGl0b3JJdGVtIiBkZXN0aW5hdGlvbj0iak5SLVozLVlXaSIgaWQ9IjZ3 Qi1BYS1DSzciLz4KICAgICAgICAgICAgICAgICA8b3V0bGV0IHByb3BlcnR5PSJfbmV3V2ViS2l0 MVdpbmRvd0l0ZW0iIGRlc3RpbmF0aW9uPSI1NzMiIGlkPSJaQ2otdTItUFU3Ii8+CisgICAgICAg ICAgICAgICAgPG91dGxldCBwcm9wZXJ0eT0iX25ld1dlYktpdDJFZGl0b3JJdGVtIiBkZXN0aW5h dGlvbj0iSWRJLXdiLTFKRCIgaWQ9IkRJci1wZS1YSTgiLz4KICAgICAgICAgICAgICAgICA8b3V0 bGV0IHByb3BlcnR5PSJfbmV3V2ViS2l0MldpbmRvd0l0ZW0iIGRlc3RpbmF0aW9uPSI1NzEiIGlk PSIxR3YtbUstYXVsIi8+CiAgICAgICAgICAgICA8L2Nvbm5lY3Rpb25zPgogICAgICAgICA8L2N1 c3RvbU9iamVjdD4KZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9XSzFCcm93c2Vy V2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5k b3dDb250cm9sbGVyLm0KaW5kZXggYmI0MjhiNWM3ZjZhYzQyMTE2ZmNmNDA1YTcwNTdhODZmMGQw NjI1Mi4uZjI2YjQxOWU4OGRjYjVjYTA2MGU3MDA0YWRhMDc2NzkyMjc0MjMxYyAxMDA2NDQKLS0t IGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KKysr IGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMUJyb3dzZXJXaW5kb3dDb250cm9sbGVyLm0KQEAg LTQ0LDYgKzQ0LDggQEAgLSAodm9pZClhd2FrZUZyb21OaWIKICAgICBfd2ViVmlldyA9IFtbV2Vi VmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpbY29udGFpbmVyVmlldyBib3VuZHNdIGZyYW1lTmFt ZTpuaWwgZ3JvdXBOYW1lOkAiTWluaUJyb3dzZXIiXTsKICAgICBbX3dlYlZpZXcgc2V0QXV0b3Jl c2l6aW5nTWFzazooTlNWaWV3V2lkdGhTaXphYmxlIHwgTlNWaWV3SGVpZ2h0U2l6YWJsZSldOwog CisgICAgX3dlYlZpZXcuZWRpdGFibGUgPSBzZWxmLmlzRWRpdGFibGU7CisKICAgICBbX3dlYlZp ZXcgc2V0RnJhbWVMb2FkRGVsZWdhdGU6c2VsZl07CiAgICAgW193ZWJWaWV3IHNldFVJRGVsZWdh dGU6c2VsZl07CiAgICAgW193ZWJWaWV3IHNldFJlc291cmNlTG9hZERlbGVnYXRlOnNlbGZdOwpA QCAtNzksNiArODEsMTEgQEAgLSAodm9pZClsb2FkVVJMU3RyaW5nOihOU1N0cmluZyAqKXVybFN0 cmluZwogICAgIFtzZWxmIGZldGNoOm5pbF07CiB9CiAKKy0gKHZvaWQpbG9hZEhUTUxTdHJpbmc6 KE5TU3RyaW5nICopSFRNTFN0cmluZworeworICAgIFtfd2ViVmlldy5tYWluRnJhbWUgbG9hZEhU TUxTdHJpbmc6SFRNTFN0cmluZyBiYXNlVVJMOm5pbF07Cit9CisKIC0gKElCQWN0aW9uKWZldGNo OihpZClzZW5kZXIKIHsKICAgICBbdXJsVGV4dCBzZXRTdHJpbmdWYWx1ZTpbc2VsZiBhZGRQcm90 b2NvbElmTmVjZXNzYXJ5Olt1cmxUZXh0IHN0cmluZ1ZhbHVlXV1dOwpAQCAtMTM5LDYgKzE0Niw4 IEBAIC0gKEJPT0wpdmFsaWRhdGVNZW51SXRlbTooTlNNZW51SXRlbSAqKW1lbnVJdGVtCiAgICAg ICAgIFttZW51SXRlbSBzZXRUaXRsZTpbX3dlYlZpZXcgd2luZG93XSA/IEAiUmVtb3ZlIFdlYiBW aWV3IiA6IEAiSW5zZXJ0IFdlYiBWaWV3Il07CiAgICAgZWxzZSBpZiAoYWN0aW9uID09IEBzZWxl Y3Rvcih0b2dnbGVab29tTW9kZTopKQogICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6X3pvb21U ZXh0T25seSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3RhdGVdOworICAgIGVsc2UgaWYgKGFjdGlvbiA9 PSBAc2VsZWN0b3IodG9nZ2xlRWRpdGFibGU6KSkKKyAgICAgICAgW21lbnVJdGVtIHNldFN0YXRl OnNlbGYuaXNFZGl0YWJsZSA/IE5TT25TdGF0ZSA6IE5TT2ZmU3RhdGVdOwogCiAgICAgaWYgKGFj dGlvbiA9PSBAc2VsZWN0b3Ioc2V0UGFnZVNjYWxlOikpCiAgICAgICAgIFttZW51SXRlbSBzZXRT dGF0ZTphcmVFc3NlbnRpYWxseUVxdWFsKFtfd2ViVmlldyBfdmlld1NjYWxlRmFjdG9yXSwgW3Nl bGYgcGFnZVNjYWxlRm9yTWVudUl0ZW1UYWc6W21lbnVJdGVtIHRhZ11dKV07CkBAIC0yNDcsNiAr MjU2LDEyIEBAIC0gKE5TVmlldyAqKW1haW5Db250ZW50VmlldwogICAgIHJldHVybiBfd2ViVmll dzsKIH0KIAorLSAodm9pZClzZXRFZGl0YWJsZTooQk9PTCllZGl0YWJsZQoreworICAgIFtzdXBl ciBzZXRFZGl0YWJsZTplZGl0YWJsZV07CisgICAgX3dlYlZpZXcuZWRpdGFibGUgPSBlZGl0YWJs ZTsKK30KKwogLSAodm9pZClkaWRDaGFuZ2VTZXR0aW5ncwogewogICAgIFNldHRpbmdzQ29udHJv bGxlciAqc2V0dGluZ3MgPSBbU2V0dGluZ3NDb250cm9sbGVyIHNoYXJlZF07CkBAIC0zMTcsOCAr MzMyLDggQEAgLSAodm9pZCl1cGRhdGVUaXRsZTooTlNTdHJpbmcgKil0aXRsZQogICAgICAgICBO U1VSTCAqdXJsID0gX3dlYlZpZXcubWFpbkZyYW1lLmRhdGFTb3VyY2UucmVxdWVzdC5VUkw7CiAg ICAgICAgIHRpdGxlID0gdXJsLmxhc3RQYXRoQ29tcG9uZW50ID86IHVybC5fd2ViX3VzZXJWaXNp YmxlU3RyaW5nOwogICAgIH0KLSAgICAKLSAgICBbc2VsZi53aW5kb3cgc2V0VGl0bGU6W3RpdGxl IHN0cmluZ0J5QXBwZW5kaW5nU3RyaW5nOkAiIFtXSzFdIl1dOworCisgICAgW3NlbGYud2luZG93 IHNldFRpdGxlOlt0aXRsZSBzdHJpbmdCeUFwcGVuZGluZ0Zvcm1hdDpAIiBbV0sxXSVAIiwgX3dl YlZpZXcuZWRpdGFibGUgPyBAIiBbRWRpdGFibGVdIiA6IEAiIl1dOwogfQogCiAtIChXZWJWaWV3 ICopd2ViVmlldzooV2ViVmlldyAqKXNlbmRlciBjcmVhdGVXZWJWaWV3V2l0aFJlcXVlc3Q6KE5T VVJMUmVxdWVzdCAqKXJlcXVlc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL01pbmlCcm93c2VyL21hYy9X SzJCcm93c2VyV2luZG93Q29udHJvbGxlci5tIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJy b3dzZXJXaW5kb3dDb250cm9sbGVyLm0KaW5kZXggMTUzODQ2MzNmMWQ0YmNiODE2NTZmZTM4ZmNh NTQ2YzhhNjA5ZTVkMi4uOGVkZTI1NTg5ODM3YmY2NmFhNWI4NjEzMjNiNGVjYjYwOTcwMWIyYSAx MDA2NDQKLS0tIGEvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0KKysrIGIvVG9vbHMvTWluaUJyb3dzZXIvbWFjL1dLMkJyb3dzZXJXaW5kb3dDb250cm9s bGVyLm0KQEAgLTY5LDYgKzY5LDcgQEAgLSAodm9pZClhd2FrZUZyb21OaWIKIAogICAgIF93ZWJW aWV3LmFsbG93c01hZ25pZmljYXRpb24gPSBZRVM7CiAgICAgX3dlYlZpZXcuYWxsb3dzQmFja0Zv cndhcmROYXZpZ2F0aW9uR2VzdHVyZXMgPSBZRVM7CisgICAgX3dlYlZpZXcuX2VkaXRhYmxlID0g c2VsZi5pc0VkaXRhYmxlOwogCiAgICAgW193ZWJWaWV3IHNldEF1dG9yZXNpemluZ01hc2s6KE5T Vmlld1dpZHRoU2l6YWJsZSB8IE5TVmlld0hlaWdodFNpemFibGUpXTsKICAgICBbY29udGFpbmVy VmlldyBhZGRTdWJ2aWV3Ol93ZWJWaWV3XTsKQEAgLTIwMSw2ICsyMDIsOCBAQCAtIChCT09MKXZh bGlkYXRlTWVudUl0ZW06KE5TTWVudUl0ZW0gKiltZW51SXRlbQogICAgICAgICBbbWVudUl0ZW0g c2V0VGl0bGU6W193ZWJWaWV3IHdpbmRvd10gPyBAIlJlbW92ZSBXZWIgVmlldyIgOiBAIkluc2Vy dCBXZWIgVmlldyJdOwogICAgIGVsc2UgaWYgKGFjdGlvbiA9PSBAc2VsZWN0b3IodG9nZ2xlWm9v bU1vZGU6KSkKICAgICAgICAgW21lbnVJdGVtIHNldFN0YXRlOl96b29tVGV4dE9ubHkgPyBOU09u U3RhdGUgOiBOU09mZlN0YXRlXTsKKyAgICBlbHNlIGlmIChhY3Rpb24gPT0gQHNlbGVjdG9yKHRv Z2dsZUVkaXRhYmxlOikpCisgICAgICAgIFttZW51SXRlbSBzZXRTdGF0ZTpzZWxmLmlzRWRpdGFi bGUgPyBOU09uU3RhdGUgOiBOU09mZlN0YXRlXTsKIAogICAgIGlmIChhY3Rpb24gPT0gQHNlbGVj dG9yKHNldFBhZ2VTY2FsZTopKQogICAgICAgICBbbWVudUl0ZW0gc2V0U3RhdGU6YXJlRXNzZW50 aWFsbHlFcXVhbChbX3dlYlZpZXcgX3BhZ2VTY2FsZV0sIFtzZWxmIHBhZ2VTY2FsZUZvck1lbnVJ dGVtVGFnOlttZW51SXRlbSB0YWddXSldOwpAQCAtMjg0LDYgKzI4NywxMiBAQCAtIChOU1ZpZXcg KiltYWluQ29udGVudFZpZXcKICAgICByZXR1cm4gX3dlYlZpZXc7CiB9CiAKKy0gKHZvaWQpc2V0 RWRpdGFibGU6KEJPT0wpZWRpdGFibGUKK3sKKyAgICBbc3VwZXIgc2V0RWRpdGFibGU6ZWRpdGFi bGVdOworICAgIF93ZWJWaWV3Ll9lZGl0YWJsZSA9IGVkaXRhYmxlOworfQorCiAtIChCT09MKXZh bGlkYXRlVXNlckludGVyZmFjZUl0ZW06KGlkIDxOU1ZhbGlkYXRlZFVzZXJJbnRlcmZhY2VJdGVt PilpdGVtCiB7CiAgICAgU0VMIGFjdGlvbiA9IGl0ZW0uYWN0aW9uOwpAQCAtNDE1LDcgKzQyNCw3 IEBAIC0gKHZvaWQpdXBkYXRlVGl0bGU6KE5TU3RyaW5nICopdGl0bGUKICAgICAgICAgdGl0bGUg PSB1cmwubGFzdFBhdGhDb21wb25lbnQgPzogdXJsLl93ZWJfdXNlclZpc2libGVTdHJpbmc7CiAg ICAgfQogCi0gICAgc2VsZi53aW5kb3cudGl0bGUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1h dDpAIiVAJUAgW1dLMiAlZF0iLCBfaXNQcml2YXRlQnJvd3NpbmdXaW5kb3cgPyBAIvCfmYggIiA6 IEAiIiwgdGl0bGUsIF93ZWJWaWV3Ll93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisgICAgc2VsZi53 aW5kb3cudGl0bGUgPSBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVAJUAgW1dLMiAlZF0l QCIsIF9pc1ByaXZhdGVCcm93c2luZ1dpbmRvdyA/IEAi8J+ZiCAiIDogQCIiLCB0aXRsZSwgX3dl YlZpZXcuX3dlYlByb2Nlc3NJZGVudGlmaWVyLCBfd2ViVmlldy5fZWRpdGFibGUgPyBAIiBbRWRp dGFibGVdIiA6IEAiIl07CiB9CiAKIC0gKHZvaWQpb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDooTlNT dHJpbmcgKilrZXlQYXRoIG9mT2JqZWN0OihpZClvYmplY3QgY2hhbmdlOihOU0RpY3Rpb25hcnkg KiljaGFuZ2UgY29udGV4dDoodm9pZCAqKWNvbnRleHQKQEAgLTUyNSw2ICs1MzQsMTEgQEAgLSAo dm9pZClsb2FkVVJMU3RyaW5nOihOU1N0cmluZyAqKXVybFN0cmluZwogICAgIFtzZWxmIGZldGNo Om5pbF07CiB9CiAKKy0gKHZvaWQpbG9hZEhUTUxTdHJpbmc6KE5TU3RyaW5nICopSFRNTFN0cmlu ZworeworICAgIFtfd2ViVmlldyBsb2FkSFRNTFN0cmluZzpIVE1MU3RyaW5nIGJhc2VVUkw6bmls XTsKK30KKwogc3RhdGljIE5TU2V0ICpkYXRhVHlwZXMoKQogewogICAgIHJldHVybiBbV0tXZWJz aXRlRGF0YVN0b3JlIGFsbFdlYnNpdGVEYXRhVHlwZXNdOwo=