159725 2016-07-13 10:18:09 -0700 WebKit2 shouldn't signal custom protocol clients from the NSURLConnection loader thread. 2016-07-13 13:02:03 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P1 Normal --- 1 cdumez cdumez aestes andersca beidson commit-queue ddkilzer sam webkit-bug-importer oldest_to_newest 1210507 0 cdumez 2016-07-13 10:18:09 -0700 WebKit2 shouldn't signal custom protocol clients from the NSURLConnection loader thread. 1210508 1 cdumez 2016-07-13 10:18:26 -0700 <rdar://problem/27323131> 1210524 2 283543 cdumez 2016-07-13 10:40:17 -0700 Created attachment 283543 Patch 1210525 3 commit-queue 2016-07-13 10:41:37 -0700 Attachment 283543 did not pass style-queue: ERROR: Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:69: Should not have spaces around = in property synthesis. [whitespace/property] [4] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 1210588 4 283543 aestes 2016-07-13 12:31:37 -0700 Comment on attachment 283543 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283543&action=review > Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:60 > + CFRunLoopRef _initializationRunLoop; I'd use a RetainPtr for this. > Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:95 > + _initializationRunLoop = CFRunLoopGetCurrent(); This needs to be retained. 1210595 5 283561 cdumez 2016-07-13 12:47:04 -0700 Created attachment 283561 Patch 1210597 6 283561 aestes 2016-07-13 12:51:17 -0700 Comment on attachment 283561 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=283561&action=review > Source/WebKit2/NetworkProcess/CustomProtocols/Cocoa/CustomProtocolManagerCocoa.mm:197 > - CFRunLoopPerformBlock([NSURLConnection resourceLoaderRunLoop], kCFRunLoopDefaultMode, block); > - CFRunLoopWakeUp([NSURLConnection resourceLoaderRunLoop]); > + CFRunLoopPerformBlock(protocol.initializationRunLoop, kCFRunLoopDefaultMode, block); > + CFRunLoopWakeUp(protocol.initializationRunLoop); Nit: It'd be slightly nicer to store protocol.initializationRunLoop in a local variable. 1210598 7 283561 cdumez 2016-07-13 12:53:19 -0700 Comment on attachment 283561 Patch I'll fix the nit. 1210599 8 283562 cdumez 2016-07-13 12:54:03 -0700 Created attachment 283562 Patch 1210603 9 283562 cdumez 2016-07-13 13:01:58 -0700 Comment on attachment 283562 Patch Clearing flags on attachment: 283562 Committed r203174: <http://trac.webkit.org/changeset/203174> 1210604 10 cdumez 2016-07-13 13:02:03 -0700 All reviewed patches have been landed. Closing bug. 283543 2016-07-13 10:40:17 -0700 2016-07-13 12:47:00 -0700 Patch bug-159725-20160713103932.patch text/plain 5674 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjgyY2I5MTgyMGZiZTA0 MGQ4MDYwZDY3NDU3NTY0OWY0MTI2YWEzOC4uM2Q4MDc2Njc2MDQ0ZDUwMTNlYTQyMjA3N2NjY2Zk ODc2YjdhMDNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA3LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0MiBzaG91bGRuJ3Qg c2lnbmFsIGN1c3RvbSBwcm90b2NvbCBjbGllbnRzIGZyb20gdGhlIE5TVVJMQ29ubmVjdGlvbiBs b2FkZXIgdGhyZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU5NzI1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzMyMzEzMT4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBXZWJLaXQyIHNob3VsZG4n dCBzaWduYWwgY3VzdG9tIHByb3RvY29sIGNsaWVudHMgZnJvbSB0aGUgTlNVUkxDb25uZWN0aW9u CisgICAgICAgIGxvYWRlciB0aHJlYWQuIEluc3RlYWQsIHVzZSB0aGUgUnVuTG9vcCB0aGUgV0tD dXN0b21Qcm90b2NvbCB3YXMgaW5pdGlhbGl6ZWQKKyAgICAgICAgb24uCisKKyAgICAgICAgKiBO ZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvQ29jb2EvQ3VzdG9tUHJvdG9jb2xNYW5hZ2Vy Q29jb2EubW06CisgICAgICAgICgtW1dLQ3VzdG9tUHJvdG9jb2wgaW5pdFdpdGhSZXF1ZXN0OmNh Y2hlZFJlc3BvbnNlOmNsaWVudDpdKToKKyAgICAgICAgKFdlYktpdDo6ZGlzcGF0Y2hPbkluaXRp YWxpemF0aW9uUnVuTG9vcCk6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFuYWdl cjo6ZGlkRmFpbFdpdGhFcnJvcik6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFu YWdlcjo6ZGlkTG9hZERhdGEpOgorICAgICAgICAoV2ViS2l0OjpDdXN0b21Qcm90b2NvbE1hbmFn ZXI6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29s TWFuYWdlcjo6ZGlkRmluaXNoTG9hZGluZyk6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3Rv Y29sTWFuYWdlcjo6d2FzUmVkaXJlY3RlZFRvUmVxdWVzdCk6CisgICAgICAgIChXZWJLaXQ6OmRp c3BhdGNoT25SZXNvdXJjZUxvYWRlclJ1bkxvb3ApOiBEZWxldGVkLgorCiAyMDE2LTA3LTEzICBD YXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbQ29v cmRpbmF0ZWQgR3JhcGhpY3NdIFJlbW92ZSB0b0Nvb3JkaW5hdGVkR3JhcGhpY3NMYXllciBhbmQg dXNlIGRvd25jYXN0IGluc3RlYWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQ cm9jZXNzL0N1c3RvbVByb3RvY29scy9Db2NvYS9DdXN0b21Qcm90b2NvbE1hbmFnZXJDb2NvYS5t bSBiL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9Db2NvYS9D dXN0b21Qcm90b2NvbE1hbmFnZXJDb2NvYS5tbQppbmRleCA5MTFhOGE1YzUxNDFiMmQyZGFiNDZj ZTBjZTY1YmQxOWM4ODEyOGYwLi42NTFlZWU0ZTQ5NWRkY2U2NWJlMWIxYTU5ZDMyODUwYTU5YzIz ODhmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90 b2NvbHMvQ29jb2EvQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyQ29jb2EubW0KKysrIGIvU291cmNlL1dl YktpdDIvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0N1c3RvbVByb3RvY29s TWFuYWdlckNvY29hLm1tCkBAIC01NywxMyArNTcsMTYgQEAgc3RhdGljIHVpbnQ2NF90IGdlbmVy YXRlQ3VzdG9tUHJvdG9jb2xJRCgpCiBAaW50ZXJmYWNlIFdLQ3VzdG9tUHJvdG9jb2wgOiBOU1VS TFByb3RvY29sIHsKIEBwcml2YXRlCiAgICAgdWludDY0X3QgX2N1c3RvbVByb3RvY29sSUQ7Cisg ICAgQ0ZSdW5Mb29wUmVmIF9pbml0aWFsaXphdGlvblJ1bkxvb3A7CiB9CiBAcHJvcGVydHkgKG5v bmF0b21pYywgcmVhZG9ubHkpIHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQ7CitAcHJvcGVydHkg KG5vbmF0b21pYywgcmVhZG9ubHkpIENGUnVuTG9vcFJlZiBpbml0aWFsaXphdGlvblJ1bkxvb3A7 CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXS0N1c3RvbVByb3RvY29sCiAKIEBzeW50aGVzaXpl IGN1c3RvbVByb3RvY29sSUQgPSBfY3VzdG9tUHJvdG9jb2xJRDsKK0BzeW50aGVzaXplIGluaXRp YWxpemF0aW9uUnVuTG9vcCA9IF9pbml0aWFsaXphdGlvblJ1bkxvb3A7CiAKICsgKEJPT0wpY2Fu SW5pdFdpdGhSZXF1ZXN0OihOU1VSTFJlcXVlc3QgKilyZXF1ZXN0CiB7CkBAIC04OSw2ICs5Miw3 IEBAIHN0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZUN1c3RvbVByb3RvY29sSUQoKQogICAgICAgICBy ZXR1cm4gbmlsOwogICAgIAogICAgIF9jdXN0b21Qcm90b2NvbElEID0gZ2VuZXJhdGVDdXN0b21Q cm90b2NvbElEKCk7CisgICAgX2luaXRpYWxpemF0aW9uUnVuTG9vcCA9IENGUnVuTG9vcEdldEN1 cnJlbnQoKTsKICAgICBpZiAoYXV0byogY3VzdG9tUHJvdG9jb2xNYW5hZ2VyID0gTmV0d29ya1By b2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyPigpKQog ICAgICAgICBjdXN0b21Qcm90b2NvbE1hbmFnZXItPmFkZEN1c3RvbVByb3RvY29sKHNlbGYpOwog ICAgIHJldHVybiBzZWxmOwpAQCAtMTgzLDEwICsxODcsMTAgQEAgYm9vbCBDdXN0b21Qcm90b2Nv bE1hbmFnZXI6OnN1cHBvcnRzU2NoZW1lKGNvbnN0IFN0cmluZyYgc2NoZW1lKQogICAgIHJldHVy biBtX3JlZ2lzdGVyZWRTY2hlbWVzLmNvbnRhaW5zKHNjaGVtZSk7CiB9CiAKLXN0YXRpYyBpbmxp bmUgdm9pZCBkaXNwYXRjaE9uUmVzb3VyY2VMb2FkZXJSdW5Mb29wKHZvaWQgKF5ibG9jaykoKSkK K3N0YXRpYyBpbmxpbmUgdm9pZCBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5Mb29wKFdLQ3Vz dG9tUHJvdG9jb2wqIHByb3RvY29sLCB2b2lkICheYmxvY2spKCkpCiB7Ci0gICAgQ0ZSdW5Mb29w UGVyZm9ybUJsb2NrKFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSwga0NG UnVuTG9vcERlZmF1bHRNb2RlLCBibG9jayk7Ci0gICAgQ0ZSdW5Mb29wV2FrZVVwKFtOU1VSTENv bm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSk7CisgICAgQ0ZSdW5Mb29wUGVyZm9ybUJs b2NrKHByb3RvY29sLmluaXRpYWxpemF0aW9uUnVuTG9vcCwga0NGUnVuTG9vcERlZmF1bHRNb2Rl LCBibG9jayk7CisgICAgQ0ZSdW5Mb29wV2FrZVVwKHByb3RvY29sLmluaXRpYWxpemF0aW9uUnVu TG9vcCk7CiB9CiAKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRGYWlsV2l0aEVycm9y KHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJyb3Im IGVycm9yKQpAQCAtMTk3LDcgKzIwMSw3IEBAIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpk aWRGYWlsV2l0aEVycm9yKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IFdlCiAKICAg ICBSZXRhaW5QdHI8TlNFcnJvcj4gbnNFcnJvciA9IGVycm9yLm5zRXJyb3IoKTsKIAotICAgIGRp c3BhdGNoT25SZXNvdXJjZUxvYWRlclJ1bkxvb3AoXiB7CisgICAgZGlzcGF0Y2hPbkluaXRpYWxp emF0aW9uUnVuTG9vcChwcm90b2NvbC5nZXQoKSwgXiB7CiAgICAgICAgIFtbcHJvdG9jb2wgY2xp ZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5nZXQoKSBkaWRGYWlsV2l0aEVycm9yOm5zRXJyb3Iu Z2V0KCldOwogICAgIH0pOwogCkBAIC0yMTIsNyArMjE2LDcgQEAgdm9pZCBDdXN0b21Qcm90b2Nv bE1hbmFnZXI6OmRpZExvYWREYXRhKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IElQ Qzo6RGEKIAogICAgIFJldGFpblB0cjxOU0RhdGE+IG5zRGF0YSA9IGFkb3B0TlMoW1tOU0RhdGEg YWxsb2NdIGluaXRXaXRoQnl0ZXM6ZGF0YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpXSk7CiAK LSAgICBkaXNwYXRjaE9uUmVzb3VyY2VMb2FkZXJSdW5Mb29wKF4geworICAgIGRpc3BhdGNoT25J bml0aWFsaXphdGlvblJ1bkxvb3AocHJvdG9jb2wuZ2V0KCksIF4gewogICAgICAgICBbW3Byb3Rv Y29sIGNsaWVudF0gVVJMUHJvdG9jb2w6cHJvdG9jb2wuZ2V0KCkgZGlkTG9hZERhdGE6bnNEYXRh LmdldCgpXTsKICAgICB9KTsKIH0KQEAgLTIyNSw3ICsyMjksNyBAQCB2b2lkIEN1c3RvbVByb3Rv Y29sTWFuYWdlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQs IGNvbnN0CiAKICAgICBSZXRhaW5QdHI8TlNVUkxSZXNwb25zZT4gbnNSZXNwb25zZSA9IHJlc3Bv bnNlLm5zVVJMUmVzcG9uc2UoKTsKIAotICAgIGRpc3BhdGNoT25SZXNvdXJjZUxvYWRlclJ1bkxv b3AoXiB7CisgICAgZGlzcGF0Y2hPbkluaXRpYWxpemF0aW9uUnVuTG9vcChwcm90b2NvbC5nZXQo KSwgXiB7CiAgICAgICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5n ZXQoKSBkaWRSZWNlaXZlUmVzcG9uc2U6bnNSZXNwb25zZS5nZXQoKSBjYWNoZVN0b3JhZ2VQb2xp Y3k6c3RhdGljX2Nhc3Q8TlNVUkxDYWNoZVN0b3JhZ2VQb2xpY3k+KGNhY2hlU3RvcmFnZVBvbGlj eSldOwogICAgIH0pOwogfQpAQCAtMjM2LDcgKzI0MCw3IEBAIHZvaWQgQ3VzdG9tUHJvdG9jb2xN YW5hZ2VyOjpkaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCiAgICAg aWYgKCFwcm90b2NvbCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGlzcGF0Y2hPblJlc291cmNl TG9hZGVyUnVuTG9vcCheIHsKKyAgICBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5Mb29wKHBy b3RvY29sLmdldCgpLCBeIHsKICAgICAgICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFByb3RvY29s RGlkRmluaXNoTG9hZGluZzpwcm90b2NvbC5nZXQoKV07CiAgICAgfSk7CiAKQEAgLTI1Miw3ICsy NTYsNyBAQCB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6d2FzUmVkaXJlY3RlZFRvUmVxdWVz dCh1aW50NjRfdCBjdXN0b21Qcm90b2NvbElELCBjbwogICAgIFJldGFpblB0cjxOU1VSTFJlcXVl c3Q+IG5zUmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OkRvTm90VXBkYXRl SFRUUEJvZHkpOwogICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBuc1JlZGlyZWN0UmVzcG9u c2UgPSByZWRpcmVjdFJlc3BvbnNlLm5zVVJMUmVzcG9uc2UoKTsKIAotICAgIGRpc3BhdGNoT25S ZXNvdXJjZUxvYWRlclJ1bkxvb3AoW3Byb3RvY29sLCBuc1JlcXVlc3QsIG5zUmVkaXJlY3RSZXNw b25zZV0oKSB7CisgICAgZGlzcGF0Y2hPbkluaXRpYWxpemF0aW9uUnVuTG9vcChwcm90b2NvbC5n ZXQoKSwgW3Byb3RvY29sLCBuc1JlcXVlc3QsIG5zUmVkaXJlY3RSZXNwb25zZV0oKSB7CiAgICAg ICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5nZXQoKSB3YXNSZWRp cmVjdGVkVG9SZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKSByZWRpcmVjdFJlc3BvbnNlOm5zUmVkaXJl Y3RSZXNwb25zZS5nZXQoKV07CiAgICAgfSk7CiB9Cg== 283561 2016-07-13 12:47:04 -0700 2016-07-13 12:54:00 -0700 Patch bug-159725-20160713124619.patch text/plain 5734 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjgyY2I5MTgyMGZiZTA0 MGQ4MDYwZDY3NDU3NTY0OWY0MTI2YWEzOC4uMzBiY2MyYjk2ZWQ3YTJjY2VmYjdmMGYzOTI0MDMx NmExNmVjYzJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA3LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0MiBzaG91bGRuJ3Qg c2lnbmFsIGN1c3RvbSBwcm90b2NvbCBjbGllbnRzIGZyb20gdGhlIE5TVVJMQ29ubmVjdGlvbiBs b2FkZXIgdGhyZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU5NzI1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzMyMzEzMT4KKworICAgICAg ICBSZXZpZXdlZCBieSBBbmR5IEVzdGVzLgorCisgICAgICAgIFdlYktpdDIgc2hvdWxkbid0IHNp Z25hbCBjdXN0b20gcHJvdG9jb2wgY2xpZW50cyBmcm9tIHRoZSBOU1VSTENvbm5lY3Rpb24KKyAg ICAgICAgbG9hZGVyIHRocmVhZC4gSW5zdGVhZCwgdXNlIHRoZSBSdW5Mb29wIHRoZSBXS0N1c3Rv bVByb3RvY29sIHdhcyBpbml0aWFsaXplZAorICAgICAgICBvbi4KKworICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9Db2NvYS9DdXN0b21Qcm90b2NvbE1hbmFnZXJDb2Nv YS5tbToKKyAgICAgICAgKC1bV0tDdXN0b21Qcm90b2NvbCBpbml0V2l0aFJlcXVlc3Q6Y2FjaGVk UmVzcG9uc2U6Y2xpZW50Ol0pOgorICAgICAgICAoV2ViS2l0OjpkaXNwYXRjaE9uSW5pdGlhbGl6 YXRpb25SdW5Mb29wKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpk aWRGYWlsV2l0aEVycm9yKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2Vy OjpkaWRMb2FkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6 ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5h Z2VyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xN YW5hZ2VyOjp3YXNSZWRpcmVjdGVkVG9SZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6ZGlzcGF0 Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCk6IERlbGV0ZWQuCisKIDIwMTYtMDctMTMgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDb29yZGlu YXRlZCBHcmFwaGljc10gUmVtb3ZlIHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyIGFuZCB1c2Ug ZG93bmNhc3QgaW5zdGVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0N1c3RvbVByb3RvY29sTWFuYWdlckNvY29hLm1tIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0N1c3Rv bVByb3RvY29sTWFuYWdlckNvY29hLm1tCmluZGV4IDkxMWE4YTVjNTE0MWIyZDJkYWI0NmNlMGNl NjViZDE5Yzg4MTI4ZjAuLjQxNzYyYWY0MGQ2MTkyZTJiNjg1YmEyMTJmYjRiNWUyZTA3MGEwMDQg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29s cy9Db2NvYS9DdXN0b21Qcm90b2NvbE1hbmFnZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvQ29jb2EvQ3VzdG9tUHJvdG9jb2xNYW5h Z2VyQ29jb2EubW0KQEAgLTU3LDggKzU3LDEwIEBAIHN0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZUN1 c3RvbVByb3RvY29sSUQoKQogQGludGVyZmFjZSBXS0N1c3RvbVByb3RvY29sIDogTlNVUkxQcm90 b2NvbCB7CiBAcHJpdmF0ZQogICAgIHVpbnQ2NF90IF9jdXN0b21Qcm90b2NvbElEOworICAgIFJl dGFpblB0cjxDRlJ1bkxvb3BSZWY+IF9pbml0aWFsaXphdGlvblJ1bkxvb3A7CiB9CiBAcHJvcGVy dHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQ7CitAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENGUnVuTG9vcFJlZiBpbml0aWFsaXphdGlvblJ1 bkxvb3A7CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXS0N1c3RvbVByb3RvY29sCkBAIC04OSwx MSArOTEsMTcgQEAgc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRlQ3VzdG9tUHJvdG9jb2xJRCgpCiAg ICAgICAgIHJldHVybiBuaWw7CiAgICAgCiAgICAgX2N1c3RvbVByb3RvY29sSUQgPSBnZW5lcmF0 ZUN1c3RvbVByb3RvY29sSUQoKTsKKyAgICBfaW5pdGlhbGl6YXRpb25SdW5Mb29wID0gQ0ZSdW5M b29wR2V0Q3VycmVudCgpOwogICAgIGlmIChhdXRvKiBjdXN0b21Qcm90b2NvbE1hbmFnZXIgPSBO ZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuc3VwcGxlbWVudDxDdXN0b21Qcm90b2NvbE1hbmFn ZXI+KCkpCiAgICAgICAgIGN1c3RvbVByb3RvY29sTWFuYWdlci0+YWRkQ3VzdG9tUHJvdG9jb2wo c2VsZik7CiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKKy0gKENGUnVuTG9vcFJlZilpbml0aWFsaXph dGlvblJ1bkxvb3AKK3sKKyAgICByZXR1cm4gX2luaXRpYWxpemF0aW9uUnVuTG9vcC5nZXQoKTsK K30KKwogLSAodm9pZClzdGFydExvYWRpbmcKIHsKICAgICBpZiAoYXV0byogY3VzdG9tUHJvdG9j b2xNYW5hZ2VyID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8Q3VzdG9t UHJvdG9jb2xNYW5hZ2VyPigpKQpAQCAtMTgzLDEwICsxOTEsMTAgQEAgYm9vbCBDdXN0b21Qcm90 b2NvbE1hbmFnZXI6OnN1cHBvcnRzU2NoZW1lKGNvbnN0IFN0cmluZyYgc2NoZW1lKQogICAgIHJl dHVybiBtX3JlZ2lzdGVyZWRTY2hlbWVzLmNvbnRhaW5zKHNjaGVtZSk7CiB9CiAKLXN0YXRpYyBp bmxpbmUgdm9pZCBkaXNwYXRjaE9uUmVzb3VyY2VMb2FkZXJSdW5Mb29wKHZvaWQgKF5ibG9jayko KSkKK3N0YXRpYyBpbmxpbmUgdm9pZCBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5Mb29wKFdL Q3VzdG9tUHJvdG9jb2wqIHByb3RvY29sLCB2b2lkICheYmxvY2spKCkpCiB7Ci0gICAgQ0ZSdW5M b29wUGVyZm9ybUJsb2NrKFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSwg a0NGUnVuTG9vcERlZmF1bHRNb2RlLCBibG9jayk7Ci0gICAgQ0ZSdW5Mb29wV2FrZVVwKFtOU1VS TENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSk7CisgICAgQ0ZSdW5Mb29wUGVyZm9y bUJsb2NrKHByb3RvY29sLmluaXRpYWxpemF0aW9uUnVuTG9vcCwga0NGUnVuTG9vcERlZmF1bHRN b2RlLCBibG9jayk7CisgICAgQ0ZSdW5Mb29wV2FrZVVwKHByb3RvY29sLmluaXRpYWxpemF0aW9u UnVuTG9vcCk7CiB9CiAKIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRGYWlsV2l0aEVy cm9yKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IFdlYkNvcmU6OlJlc291cmNlRXJy b3ImIGVycm9yKQpAQCAtMTk3LDcgKzIwNSw3IEBAIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2Vy OjpkaWRGYWlsV2l0aEVycm9yKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0IFdlCiAK ICAgICBSZXRhaW5QdHI8TlNFcnJvcj4gbnNFcnJvciA9IGVycm9yLm5zRXJyb3IoKTsKIAotICAg IGRpc3BhdGNoT25SZXNvdXJjZUxvYWRlclJ1bkxvb3AoXiB7CisgICAgZGlzcGF0Y2hPbkluaXRp YWxpemF0aW9uUnVuTG9vcChwcm90b2NvbC5nZXQoKSwgXiB7CiAgICAgICAgIFtbcHJvdG9jb2wg Y2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5nZXQoKSBkaWRGYWlsV2l0aEVycm9yOm5zRXJy b3IuZ2V0KCldOwogICAgIH0pOwogCkBAIC0yMTIsNyArMjIwLDcgQEAgdm9pZCBDdXN0b21Qcm90 b2NvbE1hbmFnZXI6OmRpZExvYWREYXRhKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvbnN0 IElQQzo6RGEKIAogICAgIFJldGFpblB0cjxOU0RhdGE+IG5zRGF0YSA9IGFkb3B0TlMoW1tOU0Rh dGEgYWxsb2NdIGluaXRXaXRoQnl0ZXM6ZGF0YS5kYXRhKCkgbGVuZ3RoOmRhdGEuc2l6ZSgpXSk7 CiAKLSAgICBkaXNwYXRjaE9uUmVzb3VyY2VMb2FkZXJSdW5Mb29wKF4geworICAgIGRpc3BhdGNo T25Jbml0aWFsaXphdGlvblJ1bkxvb3AocHJvdG9jb2wuZ2V0KCksIF4gewogICAgICAgICBbW3By b3RvY29sIGNsaWVudF0gVVJMUHJvdG9jb2w6cHJvdG9jb2wuZ2V0KCkgZGlkTG9hZERhdGE6bnNE YXRhLmdldCgpXTsKICAgICB9KTsKIH0KQEAgLTIyNSw3ICsyMzMsNyBAQCB2b2lkIEN1c3RvbVBy b3RvY29sTWFuYWdlcjo6ZGlkUmVjZWl2ZVJlc3BvbnNlKHVpbnQ2NF90IGN1c3RvbVByb3RvY29s SUQsIGNvbnN0CiAKICAgICBSZXRhaW5QdHI8TlNVUkxSZXNwb25zZT4gbnNSZXNwb25zZSA9IHJl c3BvbnNlLm5zVVJMUmVzcG9uc2UoKTsKIAotICAgIGRpc3BhdGNoT25SZXNvdXJjZUxvYWRlclJ1 bkxvb3AoXiB7CisgICAgZGlzcGF0Y2hPbkluaXRpYWxpemF0aW9uUnVuTG9vcChwcm90b2NvbC5n ZXQoKSwgXiB7CiAgICAgICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2Nv bC5nZXQoKSBkaWRSZWNlaXZlUmVzcG9uc2U6bnNSZXNwb25zZS5nZXQoKSBjYWNoZVN0b3JhZ2VQ b2xpY3k6c3RhdGljX2Nhc3Q8TlNVUkxDYWNoZVN0b3JhZ2VQb2xpY3k+KGNhY2hlU3RvcmFnZVBv bGljeSldOwogICAgIH0pOwogfQpAQCAtMjM2LDcgKzI0NCw3IEBAIHZvaWQgQ3VzdG9tUHJvdG9j b2xNYW5hZ2VyOjpkaWRGaW5pc2hMb2FkaW5nKHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQpCiAg ICAgaWYgKCFwcm90b2NvbCkKICAgICAgICAgcmV0dXJuOwogCi0gICAgZGlzcGF0Y2hPblJlc291 cmNlTG9hZGVyUnVuTG9vcCheIHsKKyAgICBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5Mb29w KHByb3RvY29sLmdldCgpLCBeIHsKICAgICAgICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFByb3Rv Y29sRGlkRmluaXNoTG9hZGluZzpwcm90b2NvbC5nZXQoKV07CiAgICAgfSk7CiAKQEAgLTI1Miw3 ICsyNjAsNyBAQCB2b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6d2FzUmVkaXJlY3RlZFRvUmVx dWVzdCh1aW50NjRfdCBjdXN0b21Qcm90b2NvbElELCBjbwogICAgIFJldGFpblB0cjxOU1VSTFJl cXVlc3Q+IG5zUmVxdWVzdCA9IHJlcXVlc3QubnNVUkxSZXF1ZXN0KFdlYkNvcmU6OkRvTm90VXBk YXRlSFRUUEJvZHkpOwogICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBuc1JlZGlyZWN0UmVz cG9uc2UgPSByZWRpcmVjdFJlc3BvbnNlLm5zVVJMUmVzcG9uc2UoKTsKIAotICAgIGRpc3BhdGNo T25SZXNvdXJjZUxvYWRlclJ1bkxvb3AoW3Byb3RvY29sLCBuc1JlcXVlc3QsIG5zUmVkaXJlY3RS ZXNwb25zZV0oKSB7CisgICAgZGlzcGF0Y2hPbkluaXRpYWxpemF0aW9uUnVuTG9vcChwcm90b2Nv bC5nZXQoKSwgW3Byb3RvY29sLCBuc1JlcXVlc3QsIG5zUmVkaXJlY3RSZXNwb25zZV0oKSB7CiAg ICAgICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5nZXQoKSB3YXNS ZWRpcmVjdGVkVG9SZXF1ZXN0Om5zUmVxdWVzdC5nZXQoKSByZWRpcmVjdFJlc3BvbnNlOm5zUmVk aXJlY3RSZXNwb25zZS5nZXQoKV07CiAgICAgfSk7CiB9Cg== 283562 2016-07-13 12:54:03 -0700 2016-07-13 13:01:58 -0700 Patch bug-159725-20160713125318.patch text/plain 5748 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjAzMTY0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggYjgyY2I5MTgyMGZiZTA0 MGQ4MDYwZDY3NDU3NTY0OWY0MTI2YWEzOC4uMzBiY2MyYjk2ZWQ3YTJjY2VmYjdmMGYzOTI0MDMx NmExNmVjYzJjYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE2LTA3LTEzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgV2ViS2l0MiBzaG91bGRuJ3Qg c2lnbmFsIGN1c3RvbSBwcm90b2NvbCBjbGllbnRzIGZyb20gdGhlIE5TVVJMQ29ubmVjdGlvbiBs b2FkZXIgdGhyZWFkLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTU5NzI1CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8yNzMyMzEzMT4KKworICAgICAg ICBSZXZpZXdlZCBieSBBbmR5IEVzdGVzLgorCisgICAgICAgIFdlYktpdDIgc2hvdWxkbid0IHNp Z25hbCBjdXN0b20gcHJvdG9jb2wgY2xpZW50cyBmcm9tIHRoZSBOU1VSTENvbm5lY3Rpb24KKyAg ICAgICAgbG9hZGVyIHRocmVhZC4gSW5zdGVhZCwgdXNlIHRoZSBSdW5Mb29wIHRoZSBXS0N1c3Rv bVByb3RvY29sIHdhcyBpbml0aWFsaXplZAorICAgICAgICBvbi4KKworICAgICAgICAqIE5ldHdv cmtQcm9jZXNzL0N1c3RvbVByb3RvY29scy9Db2NvYS9DdXN0b21Qcm90b2NvbE1hbmFnZXJDb2Nv YS5tbToKKyAgICAgICAgKC1bV0tDdXN0b21Qcm90b2NvbCBpbml0V2l0aFJlcXVlc3Q6Y2FjaGVk UmVzcG9uc2U6Y2xpZW50Ol0pOgorICAgICAgICAoV2ViS2l0OjpkaXNwYXRjaE9uSW5pdGlhbGl6 YXRpb25SdW5Mb29wKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpk aWRGYWlsV2l0aEVycm9yKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5hZ2Vy OjpkaWRMb2FkRGF0YSk6CisgICAgICAgIChXZWJLaXQ6OkN1c3RvbVByb3RvY29sTWFuYWdlcjo6 ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xNYW5h Z2VyOjpkaWRGaW5pc2hMb2FkaW5nKToKKyAgICAgICAgKFdlYktpdDo6Q3VzdG9tUHJvdG9jb2xN YW5hZ2VyOjp3YXNSZWRpcmVjdGVkVG9SZXF1ZXN0KToKKyAgICAgICAgKFdlYktpdDo6ZGlzcGF0 Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCk6IERlbGV0ZWQuCisKIDIwMTYtMDctMTMgIENhcmxv cyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtDb29yZGlu YXRlZCBHcmFwaGljc10gUmVtb3ZlIHRvQ29vcmRpbmF0ZWRHcmFwaGljc0xheWVyIGFuZCB1c2Ug ZG93bmNhc3QgaW5zdGVhZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nl c3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0N1c3RvbVByb3RvY29sTWFuYWdlckNvY29hLm1tIGIv U291cmNlL1dlYktpdDIvTmV0d29ya1Byb2Nlc3MvQ3VzdG9tUHJvdG9jb2xzL0NvY29hL0N1c3Rv bVByb3RvY29sTWFuYWdlckNvY29hLm1tCmluZGV4IDkxMWE4YTVjNTE0MWIyZDJkYWI0NmNlMGNl NjViZDE5Yzg4MTI4ZjAuLjNjOWZjNjgxZTVjZmI5MjExZGU5NDNiYjNjZjg3OGJmZTYxZWUyMzIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL05ldHdvcmtQcm9jZXNzL0N1c3RvbVByb3RvY29s cy9Db2NvYS9DdXN0b21Qcm90b2NvbE1hbmFnZXJDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0 Mi9OZXR3b3JrUHJvY2Vzcy9DdXN0b21Qcm90b2NvbHMvQ29jb2EvQ3VzdG9tUHJvdG9jb2xNYW5h Z2VyQ29jb2EubW0KQEAgLTU3LDggKzU3LDEwIEBAIHN0YXRpYyB1aW50NjRfdCBnZW5lcmF0ZUN1 c3RvbVByb3RvY29sSUQoKQogQGludGVyZmFjZSBXS0N1c3RvbVByb3RvY29sIDogTlNVUkxQcm90 b2NvbCB7CiBAcHJpdmF0ZQogICAgIHVpbnQ2NF90IF9jdXN0b21Qcm90b2NvbElEOworICAgIFJl dGFpblB0cjxDRlJ1bkxvb3BSZWY+IF9pbml0aWFsaXphdGlvblJ1bkxvb3A7CiB9CiBAcHJvcGVy dHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQ7CitAcHJv cGVydHkgKG5vbmF0b21pYywgcmVhZG9ubHkpIENGUnVuTG9vcFJlZiBpbml0aWFsaXphdGlvblJ1 bkxvb3A7CiBAZW5kCiAKIEBpbXBsZW1lbnRhdGlvbiBXS0N1c3RvbVByb3RvY29sCkBAIC04OSwx MSArOTEsMTcgQEAgc3RhdGljIHVpbnQ2NF90IGdlbmVyYXRlQ3VzdG9tUHJvdG9jb2xJRCgpCiAg ICAgICAgIHJldHVybiBuaWw7CiAgICAgCiAgICAgX2N1c3RvbVByb3RvY29sSUQgPSBnZW5lcmF0 ZUN1c3RvbVByb3RvY29sSUQoKTsKKyAgICBfaW5pdGlhbGl6YXRpb25SdW5Mb29wID0gQ0ZSdW5M b29wR2V0Q3VycmVudCgpOwogICAgIGlmIChhdXRvKiBjdXN0b21Qcm90b2NvbE1hbmFnZXIgPSBO ZXR3b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuc3VwcGxlbWVudDxDdXN0b21Qcm90b2NvbE1hbmFn ZXI+KCkpCiAgICAgICAgIGN1c3RvbVByb3RvY29sTWFuYWdlci0+YWRkQ3VzdG9tUHJvdG9jb2wo c2VsZik7CiAgICAgcmV0dXJuIHNlbGY7CiB9CiAKKy0gKENGUnVuTG9vcFJlZilpbml0aWFsaXph dGlvblJ1bkxvb3AKK3sKKyAgICByZXR1cm4gX2luaXRpYWxpemF0aW9uUnVuTG9vcC5nZXQoKTsK K30KKwogLSAodm9pZClzdGFydExvYWRpbmcKIHsKICAgICBpZiAoYXV0byogY3VzdG9tUHJvdG9j b2xNYW5hZ2VyID0gTmV0d29ya1Byb2Nlc3M6OnNpbmdsZXRvbigpLnN1cHBsZW1lbnQ8Q3VzdG9t UHJvdG9jb2xNYW5hZ2VyPigpKQpAQCAtMTgzLDEwICsxOTEsMTEgQEAgYm9vbCBDdXN0b21Qcm90 b2NvbE1hbmFnZXI6OnN1cHBvcnRzU2NoZW1lKGNvbnN0IFN0cmluZyYgc2NoZW1lKQogICAgIHJl dHVybiBtX3JlZ2lzdGVyZWRTY2hlbWVzLmNvbnRhaW5zKHNjaGVtZSk7CiB9CiAKLXN0YXRpYyBp bmxpbmUgdm9pZCBkaXNwYXRjaE9uUmVzb3VyY2VMb2FkZXJSdW5Mb29wKHZvaWQgKF5ibG9jayko KSkKK3N0YXRpYyBpbmxpbmUgdm9pZCBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5Mb29wKFdL Q3VzdG9tUHJvdG9jb2wqIHByb3RvY29sLCB2b2lkICheYmxvY2spKCkpCiB7Ci0gICAgQ0ZSdW5M b29wUGVyZm9ybUJsb2NrKFtOU1VSTENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSwg a0NGUnVuTG9vcERlZmF1bHRNb2RlLCBibG9jayk7Ci0gICAgQ0ZSdW5Mb29wV2FrZVVwKFtOU1VS TENvbm5lY3Rpb24gcmVzb3VyY2VMb2FkZXJSdW5Mb29wXSk7CisgICAgQ0ZSdW5Mb29wUmVmIHJ1 bmxvb3AgPSBwcm90b2NvbC5pbml0aWFsaXphdGlvblJ1bkxvb3A7CisgICAgQ0ZSdW5Mb29wUGVy Zm9ybUJsb2NrKHJ1bmxvb3AsIGtDRlJ1bkxvb3BEZWZhdWx0TW9kZSwgYmxvY2spOworICAgIENG UnVuTG9vcFdha2VVcChydW5sb29wKTsKIH0KIAogdm9pZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6 OmRpZEZhaWxXaXRoRXJyb3IodWludDY0X3QgY3VzdG9tUHJvdG9jb2xJRCwgY29uc3QgV2ViQ29y ZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpCkBAIC0xOTcsNyArMjA2LDcgQEAgdm9pZCBDdXN0b21Q cm90b2NvbE1hbmFnZXI6OmRpZEZhaWxXaXRoRXJyb3IodWludDY0X3QgY3VzdG9tUHJvdG9jb2xJ RCwgY29uc3QgV2UKIAogICAgIFJldGFpblB0cjxOU0Vycm9yPiBuc0Vycm9yID0gZXJyb3IubnNF cnJvcigpOwogCi0gICAgZGlzcGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcCheIHsKKyAgICBk aXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5Mb29wKHByb3RvY29sLmdldCgpLCBeIHsKICAgICAg ICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFByb3RvY29sOnByb3RvY29sLmdldCgpIGRpZEZhaWxX aXRoRXJyb3I6bnNFcnJvci5nZXQoKV07CiAgICAgfSk7CiAKQEAgLTIxMiw3ICsyMjEsNyBAQCB2 b2lkIEN1c3RvbVByb3RvY29sTWFuYWdlcjo6ZGlkTG9hZERhdGEodWludDY0X3QgY3VzdG9tUHJv dG9jb2xJRCwgY29uc3QgSVBDOjpEYQogCiAgICAgUmV0YWluUHRyPE5TRGF0YT4gbnNEYXRhID0g YWRvcHROUyhbW05TRGF0YSBhbGxvY10gaW5pdFdpdGhCeXRlczpkYXRhLmRhdGEoKSBsZW5ndGg6 ZGF0YS5zaXplKCldKTsKIAotICAgIGRpc3BhdGNoT25SZXNvdXJjZUxvYWRlclJ1bkxvb3AoXiB7 CisgICAgZGlzcGF0Y2hPbkluaXRpYWxpemF0aW9uUnVuTG9vcChwcm90b2NvbC5nZXQoKSwgXiB7 CiAgICAgICAgIFtbcHJvdG9jb2wgY2xpZW50XSBVUkxQcm90b2NvbDpwcm90b2NvbC5nZXQoKSBk aWRMb2FkRGF0YTpuc0RhdGEuZ2V0KCldOwogICAgIH0pOwogfQpAQCAtMjI1LDcgKzIzNCw3IEBA IHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjpkaWRSZWNlaXZlUmVzcG9uc2UodWludDY0X3Qg Y3VzdG9tUHJvdG9jb2xJRCwgY29uc3QKIAogICAgIFJldGFpblB0cjxOU1VSTFJlc3BvbnNlPiBu c1Jlc3BvbnNlID0gcmVzcG9uc2UubnNVUkxSZXNwb25zZSgpOwogCi0gICAgZGlzcGF0Y2hPblJl c291cmNlTG9hZGVyUnVuTG9vcCheIHsKKyAgICBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25SdW5M b29wKHByb3RvY29sLmdldCgpLCBeIHsKICAgICAgICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFBy b3RvY29sOnByb3RvY29sLmdldCgpIGRpZFJlY2VpdmVSZXNwb25zZTpuc1Jlc3BvbnNlLmdldCgp IGNhY2hlU3RvcmFnZVBvbGljeTpzdGF0aWNfY2FzdDxOU1VSTENhY2hlU3RvcmFnZVBvbGljeT4o Y2FjaGVTdG9yYWdlUG9saWN5KV07CiAgICAgfSk7CiB9CkBAIC0yMzYsNyArMjQ1LDcgQEAgdm9p ZCBDdXN0b21Qcm90b2NvbE1hbmFnZXI6OmRpZEZpbmlzaExvYWRpbmcodWludDY0X3QgY3VzdG9t UHJvdG9jb2xJRCkKICAgICBpZiAoIXByb3RvY29sKQogICAgICAgICByZXR1cm47CiAKLSAgICBk aXNwYXRjaE9uUmVzb3VyY2VMb2FkZXJSdW5Mb29wKF4geworICAgIGRpc3BhdGNoT25Jbml0aWFs aXphdGlvblJ1bkxvb3AocHJvdG9jb2wuZ2V0KCksIF4gewogICAgICAgICBbW3Byb3RvY29sIGNs aWVudF0gVVJMUHJvdG9jb2xEaWRGaW5pc2hMb2FkaW5nOnByb3RvY29sLmdldCgpXTsKICAgICB9 KTsKIApAQCAtMjUyLDcgKzI2MSw3IEBAIHZvaWQgQ3VzdG9tUHJvdG9jb2xNYW5hZ2VyOjp3YXNS ZWRpcmVjdGVkVG9SZXF1ZXN0KHVpbnQ2NF90IGN1c3RvbVByb3RvY29sSUQsIGNvCiAgICAgUmV0 YWluUHRyPE5TVVJMUmVxdWVzdD4gbnNSZXF1ZXN0ID0gcmVxdWVzdC5uc1VSTFJlcXVlc3QoV2Vi Q29yZTo6RG9Ob3RVcGRhdGVIVFRQQm9keSk7CiAgICAgUmV0YWluUHRyPE5TVVJMUmVzcG9uc2U+ IG5zUmVkaXJlY3RSZXNwb25zZSA9IHJlZGlyZWN0UmVzcG9uc2UubnNVUkxSZXNwb25zZSgpOwog Ci0gICAgZGlzcGF0Y2hPblJlc291cmNlTG9hZGVyUnVuTG9vcChbcHJvdG9jb2wsIG5zUmVxdWVz dCwgbnNSZWRpcmVjdFJlc3BvbnNlXSgpIHsKKyAgICBkaXNwYXRjaE9uSW5pdGlhbGl6YXRpb25S dW5Mb29wKHByb3RvY29sLmdldCgpLCBbcHJvdG9jb2wsIG5zUmVxdWVzdCwgbnNSZWRpcmVjdFJl c3BvbnNlXSgpIHsKICAgICAgICAgW1twcm90b2NvbCBjbGllbnRdIFVSTFByb3RvY29sOnByb3Rv Y29sLmdldCgpIHdhc1JlZGlyZWN0ZWRUb1JlcXVlc3Q6bnNSZXF1ZXN0LmdldCgpIHJlZGlyZWN0 UmVzcG9uc2U6bnNSZWRpcmVjdFJlc3BvbnNlLmdldCgpXTsKICAgICB9KTsKIH0K