187065 2018-06-26 15:16:38 -0700 Deal better with the network process crashing on startup 2018-06-26 19:11:06 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez commit-queue ggaren webkit-bug-importer oldest_to_newest 1436683 0 cdumez 2018-06-26 15:16:38 -0700 When a network process crashes on startup, we would not attempt to relaunch it. If there were web processes waiting for a connection to this network process, we would send them an invalid connection identifier which would cause them to forcefully crash. Instead, we now apply the same policy whether a network process crashes on startup or later: - We attempt to relaunch the network process - If there were pending connections from WebContent processes, we send them the conn 1436684 1 cdumez 2018-06-26 15:17:32 -0700 <rdar://problem/41451622> 1436689 2 343647 cdumez 2018-06-26 15:22:25 -0700 Created attachment 343647 Patch 1436787 3 343647 ggaren 2018-06-26 18:39:29 -0700 Comment on attachment 343647 Patch r=me 1436801 4 343647 commit-queue 2018-06-26 19:11:05 -0700 Comment on attachment 343647 Patch Clearing flags on attachment: 343647 Committed r233240: <https://trac.webkit.org/changeset/233240> 1436802 5 commit-queue 2018-06-26 19:11:06 -0700 All reviewed patches have been landed. Closing bug. 343647 2018-06-26 15:22:25 -0700 2018-06-26 19:11:05 -0700 Patch bug-187065-20180626152225.patch text/plain 14014 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjMzMjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDgyYjlhOWEzOTNhMjE4NTRi YThiMGM5NWJlNGJhYWY1YWRmMmJhN2QuLjgwY2RhODUyN2Y5MGFlNDc5NjgxNjFjZGY5M2RjMWM1 NWIwNWQ2YmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzMgQEAKKzIwMTgtMDYtMjYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBEZWFsIGJldHRlciB3aXRoIHRoZSBu ZXR3b3JrIHByb2Nlc3MgY3Jhc2hpbmcgb24gc3RhcnR1cAorICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg3MDY1CisgICAgICAgIDxyZGFyOi8vcHJvYmxl bS80MTQ1MTYyMj4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICBXaGVuIGEgbmV0d29yayBwcm9jZXNzIGNyYXNoZXMgb24gc3RhcnR1cCwgd2Ugd291bGQg bm90IGF0dGVtcHQgdG8gcmVsYXVuY2ggaXQuIElmIHRoZXJlIHdlcmUgd2ViCisgICAgICAgIHBy b2Nlc3NlcyB3YWl0aW5nIGZvciBhIGNvbm5lY3Rpb24gdG8gdGhpcyBuZXR3b3JrIHByb2Nlc3Ms IHdlIHdvdWxkIHNlbmQgdGhlbSBhbiBpbnZhbGlkIGNvbm5lY3Rpb24KKyAgICAgICAgaWRlbnRp ZmllciB3aGljaCB3b3VsZCBjYXVzZSB0aGVtIHRvIGZvcmNlZnVsbHkgY3Jhc2guCisKKyAgICAg ICAgSW5zdGVhZCwgd2Ugbm93IGFwcGx5IHRoZSBzYW1lIHBvbGljeSB3aGV0aGVyIGEgbmV0d29y ayBwcm9jZXNzIGNyYXNoZXMgb24gc3RhcnR1cCBvciBsYXRlcjoKKyAgICAgICAgLSBXZSBhdHRl bXB0IHRvIHJlbGF1bmNoIHRoZSBuZXR3b3JrIHByb2Nlc3MKKyAgICAgICAgLSBJZiB0aGVyZSB3 ZXJlIHBlbmRpbmcgY29ubmVjdGlvbnMgZnJvbSBXZWJDb250ZW50IHByb2Nlc3Nlcywgd2UgYXNr IHRoZSBuZXcgTmV0d29yayBwcm9jZXNzIGluc3RlYWQuCisKKyAgICAgICAgQXMgYSByZXN1bHQs IFdlYkNvbnRlbnQgcHJvY2Vzc2VzIG5vIGxvbmdlciBjcmFzaCBpbiB0aGlzIGNhc2UuIEluc3Rl YWQsIHRoZXkgd2FpdCBmb3IgYSB2YWxpZAorICAgICAgICBjb25uZWN0aW9uIHRvIHRoZSBuZXR3 b3JrIHByb2Nlc3MuCisKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bv b2wubW06CisgICAgICAgICgtW1dLUHJvY2Vzc1Bvb2wgX21ha2VOZXh0TmV0d29ya1Byb2Nlc3NM YXVuY2hGYWlsRm9yVGVzdGluZ10pOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tQ cm9jZXNzUG9vbFByaXZhdGUuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvTmV0d29yay9OZXR3b3Jr UHJvY2Vzc1Byb3h5LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Byb2Nlc3NQcm94eTo6 Z2V0TGF1bmNoT3B0aW9ucyk6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzUHJveHk6 OmRpZEZpbmlzaExhdW5jaGluZyk6CisgICAgICAgICogVUlQcm9jZXNzL05ldHdvcmsvTmV0d29y a1Byb2Nlc3NQcm94eS5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHA6 CisgICAgICAgIChXZWJLaXQ6OldlYlByb2Nlc3NQb29sOjpuZXR3b3JrUHJvY2Vzc0NyYXNoZWQp OgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorCiAyMDE4LTA2LTI2ICBU aW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25AYXBwbGUuY29tPgogCiAgICAgICAgIFByb21vdGUg c29tZSBleHBlcmltZW50YWwgZmVhdHVyZXMgdG8gdHJhZGl0aW9uYWwgZmVhdHVyZXMKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sLm1t IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0KaW5k ZXggYmFjOWMyNzk1YTc4YmQ4MDg4M2IwYTY5NDY0YjUwNTU2NzEyZDNiNC4uYzQzOTdjZmY2NGZm ZTA4MWM4MmJkOTFiZmZmZTJiNzE2N2QzOGQ0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0KKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2wubW0KQEAgLTQ3Myw2ICs0NzMsMTEgQEAg LSAodm9pZClfbWFrZU5leHRXZWJQcm9jZXNzTGF1bmNoRmFpbEZvclRlc3RpbmcKICAgICBfcHJv Y2Vzc1Bvb2wtPnNldFNob3VsZE1ha2VOZXh0V2ViUHJvY2Vzc0xhdW5jaEZhaWxGb3JUZXN0aW5n KHRydWUpOwogfQogCistICh2b2lkKV9tYWtlTmV4dE5ldHdvcmtQcm9jZXNzTGF1bmNoRmFpbEZv clRlc3RpbmcKK3sKKyAgICBfcHJvY2Vzc1Bvb2wtPnNldFNob3VsZE1ha2VOZXh0TmV0d29ya1By b2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyh0cnVlKTsKK30KKwogLSAoc2l6ZV90KV9wcmV3YXJt ZWRXZWJQcm9jZXNzQ291bnQKIHsKICAgICBzaXplX3QgcmVzdWx0ID0gMDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1Byb2Nlc3NQb29sUHJpdmF0ZS5o IGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2xQcml2YXRl LmgKaW5kZXggZGIwMGMyZmZlNjFlYzFkMWViYjI2YjhkYTc0ZmIxN2YxZTVkOTYxMC4uMGY3ZWJk MjFjMTViMWJmM2I2ZTZiODVjZjYyNDg4NDJiNDZkMjJiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmgKKysrIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29hL1dLUHJvY2Vzc1Bvb2xQcml2YXRlLmgKQEAg LTk3LDYgKzk3LDcgQEAKIC0gKHNpemVfdClfc2VydmljZVdvcmtlclByb2Nlc3NDb3VudCBXS19B UElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIC0gKHZv aWQpX3N5bmNOZXR3b3JrUHJvY2Vzc0Nvb2tpZXMgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goMTAu MTMpLCBpb3MoMTEuMCkpOwogLSAodm9pZClfbWFrZU5leHRXZWJQcm9jZXNzTGF1bmNoRmFpbEZv clRlc3RpbmcgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1Nf VEJBKSk7CistICh2b2lkKV9tYWtlTmV4dE5ldHdvcmtQcm9jZXNzTGF1bmNoRmFpbEZvclRlc3Rp bmcgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7 CiAKIC8vIFRlc3Qgb25seS4gUmV0dXJucyB3ZWIgcHJvY2Vzc2VzIHJ1bm5pbmcgd2ViIHBhZ2Vz IChkb2VzIG5vdCBpbmNsdWRlIHdlYiBwcm9jZXNzZXMgcnVubmluZyBzZXJ2aWNlIHdvcmtlcnMp CiAtIChzaXplX3QpX3dlYlBhZ2VDb250ZW50UHJvY2Vzc0NvdW50IFdLX0FQSV9BVkFJTEFCTEUo bWFjb3N4KDEwLjEzLjQpLCBpb3MoMTEuMykpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvTmV0d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcCBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL05ldHdvcmsvTmV0d29ya1Byb2Nlc3NQcm94eS5jcHAKaW5kZXggZTE4MzhjYjYx MjhjMDAyMTYyMjk3ZGZlZmQ5NTQxNDgyODFlMTZkMi4uZTFkMzU5OTI0ZjNlMTRhYjM3NDM2N2Jl ZWVhMzM2YTdjNzhjYzJkYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0 d29yay9OZXR3b3JrUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJveHkuY3BwCkBAIC0xMDIsNiArMTAyLDExIEBAIHZv aWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6Z2V0TGF1bmNoT3B0aW9ucyhQcm9jZXNzTGF1bmNoZXI6 OkxhdW5jaE9wdGlvbnMmIGxhdW5jCiB7CiAgICAgbGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSA9 IFByb2Nlc3NMYXVuY2hlcjo6UHJvY2Vzc1R5cGU6Ok5ldHdvcms7CiAgICAgQ2hpbGRQcm9jZXNz UHJveHk6OmdldExhdW5jaE9wdGlvbnMobGF1bmNoT3B0aW9ucyk7CisKKyAgICBpZiAocHJvY2Vz c1Bvb2woKS5zaG91bGRNYWtlTmV4dE5ldHdvcmtQcm9jZXNzTGF1bmNoRmFpbEZvclRlc3Rpbmco KSkgeworICAgICAgICBwcm9jZXNzUG9vbCgpLnNldFNob3VsZE1ha2VOZXh0TmV0d29ya1Byb2Nl c3NMYXVuY2hGYWlsRm9yVGVzdGluZyhmYWxzZSk7CisgICAgICAgIGxhdW5jaE9wdGlvbnMuc2hv dWxkTWFrZVByb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyA9IHRydWU7CisgICAgfQogfQogCiB2 b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmNvbm5lY3Rpb25XaWxsT3BlbihJUEM6OkNvbm5lY3Rp b24mIGNvbm5lY3Rpb24pCkBAIC0yMDUsMjUgKzIxMCw2IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3NQ cm94eTo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKCkKICAgICBtX3Byb2Nlc3NQb29sLm5ldHdvcmtQ cm9jZXNzQ3Jhc2hlZCgqdGhpcywgV1RGTW92ZShwZW5kaW5nUmVwbGllcykpOwogfQogCi12b2lk IE5ldHdvcmtQcm9jZXNzUHJveHk6Om5ldHdvcmtQcm9jZXNzRmFpbGVkVG9MYXVuY2goKQotewot ICAgIC8vIFRoZSBuZXR3b3JrIHByb2Nlc3MgbXVzdCBoYXZlIGNyYXNoZWQgb3IgZXhpdGVkLCBz ZW5kIGFueSBwZW5kaW5nIHN5bmMgcmVwbGllcyB3ZSBtaWdodCBoYXZlLgotICAgIHdoaWxlICgh bV9wZW5kaW5nQ29ubmVjdGlvblJlcGxpZXMuaXNFbXB0eSgpKSB7Ci0gICAgICAgIGF1dG8gcmVw bHkgPSBtX3BlbmRpbmdDb25uZWN0aW9uUmVwbGllcy50YWtlRmlyc3QoKTsKLQotI2lmIFVTRShV TklYX0RPTUFJTl9TT0NLRVRTKSB8fCBPUyhXSU5ET1dTKQotICAgICAgICByZXBseShJUEM6OkF0 dGFjaG1lbnQoKSk7Ci0jZWxpZiBPUyhEQVJXSU4pCi0gICAgICAgIHJlcGx5KElQQzo6QXR0YWNo bWVudCgwLCBNQUNIX01TR19UWVBFX01PVkVfU0VORCkpOwotI2Vsc2UKLSAgICAgICAgbm90SW1w bGVtZW50ZWQoKTsKLSNlbmRpZgotICAgIH0KLSAgICBjbGVhckNhbGxiYWNrU3RhdGVzKCk7Ci0g ICAgLy8gVGVsbCB0aGUgbmV0d29yayBwcm9jZXNzIG1hbmFnZXIgdG8gZm9yZ2V0IGFib3V0IHRo aXMgbmV0d29yayBwcm9jZXNzIHByb3h5LiBUaGlzIG1heSBjYXVzZSB1cyB0byBiZSBkZWxldGVk LgotICAgIG1fcHJvY2Vzc1Bvb2wubmV0d29ya1Byb2Nlc3NGYWlsZWRUb0xhdW5jaCgqdGhpcyk7 Ci19Ci0KIHZvaWQgTmV0d29ya1Byb2Nlc3NQcm94eTo6Y2xlYXJDYWxsYmFja1N0YXRlcygpCiB7 CiAgICAgd2hpbGUgKCFtX3BlbmRpbmdGZXRjaFdlYnNpdGVEYXRhQ2FsbGJhY2tzLmlzRW1wdHko KSkKQEAgLTM1OSw3ICszNDUsNyBAQCB2b2lkIE5ldHdvcmtQcm9jZXNzUHJveHk6OmRpZEZpbmlz aExhdW5jaGluZyhQcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBJUEM6OkNvbgogICAgIENoaWxk UHJvY2Vzc1Byb3h5OjpkaWRGaW5pc2hMYXVuY2hpbmcobGF1bmNoZXIsIGNvbm5lY3Rpb25JZGVu dGlmaWVyKTsKIAogICAgIGlmICghSVBDOjpDb25uZWN0aW9uOjppZGVudGlmaWVySXNWYWxpZChj b25uZWN0aW9uSWRlbnRpZmllcikpIHsKLSAgICAgICAgbmV0d29ya1Byb2Nlc3NGYWlsZWRUb0xh dW5jaCgpOworICAgICAgICBuZXR3b3JrUHJvY2Vzc0NyYXNoZWQoKTsKICAgICAgICAgcmV0dXJu OwogICAgIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTmV0d29yay9O ZXR3b3JrUHJvY2Vzc1Byb3h5LmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05l dHdvcmtQcm9jZXNzUHJveHkuaAppbmRleCBmNzA3YzY5MjkxZjY4MTIwNDM3Y2FjOGMzZjIzYjc4 M2Y3ZWI5NzU3Li43MzI3Zjg5ZDg1NDI2MjgyYTQ5MThlMTdhZDFiMWZlMmEyY2JjZTNiIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNzUHJv eHkuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9OZXR3b3JrL05ldHdvcmtQcm9jZXNz UHJveHkuaApAQCAtMTEyLDcgKzExMiw2IEBAIHByaXZhdGU6CiAgICAgdm9pZCBjb25uZWN0aW9u V2lsbE9wZW4oSVBDOjpDb25uZWN0aW9uJikgb3ZlcnJpZGU7CiAgICAgdm9pZCBwcm9jZXNzV2ls bFNodXREb3duKElQQzo6Q29ubmVjdGlvbiYpIG92ZXJyaWRlOwogCi0gICAgdm9pZCBuZXR3b3Jr UHJvY2Vzc0ZhaWxlZFRvTGF1bmNoKCk7CiAgICAgdm9pZCBuZXR3b3JrUHJvY2Vzc0NyYXNoZWQo KTsKICAgICB2b2lkIGNsZWFyQ2FsbGJhY2tTdGF0ZXMoKTsKIApkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCmluZGV4IDcyYTgzZGY4MTBhZjM3Y2NlNDkzN2ZmNWJm NDc4YzY2YzFiMGQ3YWUuLmU4NjFjOWI0MjdmMDk2MWQyYTRmOGM4M2QxZWRiYjQ2OWU4MmEyNWYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAor KysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKQEAgLTU0Mywx NyArNTQzLDYgQEAgTmV0d29ya1Byb2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVuc3VyZU5l dHdvcmtQcm9jZXNzKFdlYnNpdGVEYXRhU3RvcmUqIHdpdGgKIH0KIAogdm9pZCBXZWJQcm9jZXNz UG9vbDo6bmV0d29ya1Byb2Nlc3NDcmFzaGVkKE5ldHdvcmtQcm9jZXNzUHJveHkmIG5ldHdvcmtQ cm9jZXNzUHJveHksIFZlY3RvcjxNZXNzYWdlczo6V2ViUHJvY2Vzc1Byb3h5OjpHZXROZXR3b3Jr UHJvY2Vzc0Nvbm5lY3Rpb246OkRlbGF5ZWRSZXBseT4mJiBwZW5kaW5nUmVwbGllcykKLXsKLSAg ICBuZXR3b3JrUHJvY2Vzc0ZhaWxlZFRvTGF1bmNoKG5ldHdvcmtQcm9jZXNzUHJveHkpOwotICAg IEFTU0VSVCghbV9uZXR3b3JrUHJvY2Vzcyk7Ci0gICAgaWYgKHBlbmRpbmdSZXBsaWVzLmlzRW1w dHkoKSkKLSAgICAgICAgcmV0dXJuOwotICAgIGF1dG8mIG5ld05ldHdvcmtQcm9jZXNzID0gZW5z dXJlTmV0d29ya1Byb2Nlc3MoKTsKLSAgICBmb3IgKGF1dG8mIHJlcGx5IDogcGVuZGluZ1JlcGxp ZXMpCi0gICAgICAgIG5ld05ldHdvcmtQcm9jZXNzLmdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlv bihXVEZNb3ZlKHJlcGx5KSk7Ci19Ci0KLXZvaWQgV2ViUHJvY2Vzc1Bvb2w6Om5ldHdvcmtQcm9j ZXNzRmFpbGVkVG9MYXVuY2goTmV0d29ya1Byb2Nlc3NQcm94eSYgbmV0d29ya1Byb2Nlc3NQcm94 eSkKIHsKICAgICBBU1NFUlQobV9uZXR3b3JrUHJvY2Vzcyk7CiAgICAgQVNTRVJUKCZuZXR3b3Jr UHJvY2Vzc1Byb3h5ID09IG1fbmV0d29ya1Byb2Nlc3MuZ2V0KCkpOwpAQCAtNTY5LDYgKzU1OCwx MyBAQCB2b2lkIFdlYlByb2Nlc3NQb29sOjpuZXR3b3JrUHJvY2Vzc0ZhaWxlZFRvTGF1bmNoKE5l dHdvcmtQcm9jZXNzUHJveHkmIG5ldHdvcmtQcgogCiAgICAgLy8gTGVhdmUgdGhlIHByb2Nlc3Mg cHJveHkgYXJvdW5kIGR1cmluZyBjbGllbnQgY2FsbCwgc28gdGhhdCB0aGUgY2xpZW50IGNvdWxk IHF1ZXJ5IHRoZSBwcm9jZXNzIGlkZW50aWZpZXIuCiAgICAgbV9uZXR3b3JrUHJvY2VzcyA9IG51 bGxwdHI7CisKKyAgICAvLyBBdHRlbXB0IHRvIHJlLWxhdW5jaC4KKyAgICBpZiAocGVuZGluZ1Jl cGxpZXMuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisgICAgYXV0byYgbmV3TmV0d29ya1By b2Nlc3MgPSBlbnN1cmVOZXR3b3JrUHJvY2VzcygpOworICAgIGZvciAoYXV0byYgcmVwbHkgOiBw ZW5kaW5nUmVwbGllcykKKyAgICAgICAgbmV3TmV0d29ya1Byb2Nlc3MuZ2V0TmV0d29ya1Byb2Nl c3NDb25uZWN0aW9uKFdURk1vdmUocmVwbHkpKTsKIH0KIAogdm9pZCBXZWJQcm9jZXNzUG9vbDo6 Z2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uKE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJveHk6Okdl dE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXllZFJlcGx5JiYgcmVwbHkpCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaAppbmRleCA4M2IwNjNlOWU1ZGY1MTZjMGRh ZGZlZmQzYjkyYmM1NDlhMTcyNDRhLi4yOGUwOGM4NmI5OWU1MWY4MzI2ZDFmYzg3ZTJhNzRkYWNm OTUyZTU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9v bC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTI4 MSw2ICsyODEsOCBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHNldFNob3VsZE1ha2VOZXh0V2ViUHJv Y2Vzc0xhdW5jaEZhaWxGb3JUZXN0aW5nKGJvb2wgdmFsdWUpIHsgbV9zaG91bGRNYWtlTmV4dFdl YlByb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyA9IHZhbHVlOyB9CiAgICAgYm9vbCBzaG91bGRN YWtlTmV4dFdlYlByb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZygpIGNvbnN0IHsgcmV0dXJuIG1f c2hvdWxkTWFrZU5leHRXZWJQcm9jZXNzTGF1bmNoRmFpbEZvclRlc3Rpbmc7IH0KKyAgICB2b2lk IHNldFNob3VsZE1ha2VOZXh0TmV0d29ya1Byb2Nlc3NMYXVuY2hGYWlsRm9yVGVzdGluZyhib29s IHZhbHVlKSB7IG1fc2hvdWxkTWFrZU5leHROZXR3b3JrUHJvY2Vzc0xhdW5jaEZhaWxGb3JUZXN0 aW5nID0gdmFsdWU7IH0KKyAgICBib29sIHNob3VsZE1ha2VOZXh0TmV0d29ya1Byb2Nlc3NMYXVu Y2hGYWlsRm9yVGVzdGluZygpIGNvbnN0IHsgcmV0dXJuIG1fc2hvdWxkTWFrZU5leHROZXR3b3Jr UHJvY2Vzc0xhdW5jaEZhaWxGb3JUZXN0aW5nOyB9CiAKICAgICB2b2lkIHJlcG9ydFdlYkNvbnRl bnRDUFVUaW1lKFNlY29uZHMgY3B1VGltZSwgdWludDY0X3QgYWN0aXZpdHlTdGF0ZSk7CiAKQEAg LTMzMiw3ICszMzQsNiBAQCBwdWJsaWM6CiAgICAgTmV0d29ya1Byb2Nlc3NQcm94eSYgZW5zdXJl TmV0d29ya1Byb2Nlc3MoV2Vic2l0ZURhdGFTdG9yZSogd2l0aFdlYnNpdGVEYXRhU3RvcmUgPSBu dWxscHRyKTsKICAgICBOZXR3b3JrUHJvY2Vzc1Byb3h5KiBuZXR3b3JrUHJvY2VzcygpIHsgcmV0 dXJuIG1fbmV0d29ya1Byb2Nlc3MuZ2V0KCk7IH0KICAgICB2b2lkIG5ldHdvcmtQcm9jZXNzQ3Jh c2hlZChOZXR3b3JrUHJvY2Vzc1Byb3h5JiwgVmVjdG9yPE1lc3NhZ2VzOjpXZWJQcm9jZXNzUHJv eHk6OkdldE5ldHdvcmtQcm9jZXNzQ29ubmVjdGlvbjo6RGVsYXllZFJlcGx5PiYmKTsKLSAgICB2 b2lkIG5ldHdvcmtQcm9jZXNzRmFpbGVkVG9MYXVuY2goTmV0d29ya1Byb2Nlc3NQcm94eSYpOwog CiAgICAgdm9pZCBnZXROZXR3b3JrUHJvY2Vzc0Nvbm5lY3Rpb24oTWVzc2FnZXM6OldlYlByb2Nl c3NQcm94eTo6R2V0TmV0d29ya1Byb2Nlc3NDb25uZWN0aW9uOjpEZWxheWVkUmVwbHkmJik7CiAK QEAgLTY0Myw2ICs2NDQsNyBAQCBwcml2YXRlOgogICAgIGJvb2wgbV9hbHdheXNSdW5zQXRCYWNr Z3JvdW5kUHJpb3JpdHk7CiAgICAgYm9vbCBtX3Nob3VsZFRha2VVSUJhY2tncm91bmRBc3NlcnRp b247CiAgICAgYm9vbCBtX3Nob3VsZE1ha2VOZXh0V2ViUHJvY2Vzc0xhdW5jaEZhaWxGb3JUZXN0 aW5nIHsgZmFsc2UgfTsKKyAgICBib29sIG1fc2hvdWxkTWFrZU5leHROZXR3b3JrUHJvY2Vzc0xh dW5jaEZhaWxGb3JUZXN0aW5nIHsgZmFsc2UgfTsKIAogICAgIFVzZXJPYnNlcnZhYmxlUGFnZUNv dW50ZXIgbV91c2VyT2JzZXJ2YWJsZVBhZ2VDb3VudGVyOwogICAgIFByb2Nlc3NTdXBwcmVzc2lv bkRpc2FibGVkQ291bnRlciBtX3Byb2Nlc3NTdXBwcmVzc2lvbkRpc2FibGVkRm9yUGFnZUNvdW50 ZXI7CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXgg ZWQwYzFhODJjNmNlYTg4NDM0ZTcyOTAyNTFlNzMzZWFjZmE3YzBmYy4uNGQxNGJmZTEzZDA4NmE5 ODMxOGU4YzBmNTUzMmI1NTU5Mjg1MzhmNSAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisr KyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE4LTA2LTI2ICBDaHJpcyBE dW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgRGVhbCBiZXR0ZXIgd2l0aCB0aGUg bmV0d29yayBwcm9jZXNzIGNyYXNoaW5nIG9uIHN0YXJ0dXAKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4NzA2NQorICAgICAgICA8cmRhcjovL3Byb2Js ZW0vNDE0NTE2MjI+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgQWRkIGxheW91dCB0ZXN0IGNvdmVyYWdlLgorCisgICAgICAgICogVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXQvTmV0d29ya1Byb2Nlc3NDcmFzaFdpdGhQZW5kaW5nQ29ubmVjdGlvbi5t bToKKyAgICAgICAgKC1bTW9uaXRvcldlYkNvbnRlbnRDcmFzaE5hdmlnYXRpb25EZWxlZ2F0ZSBf d2ViVmlldzp3ZWJDb250ZW50UHJvY2Vzc0RpZFRlcm1pbmF0ZVdpdGhSZWFzb246XSk6CisgICAg ICAgICgtW01vbml0b3JXZWJDb250ZW50Q3Jhc2hOYXZpZ2F0aW9uRGVsZWdhdGUgd2ViVmlldzpk aWRGaW5pc2hOYXZpZ2F0aW9uOl0pOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisK IDIwMTgtMDYtMjYgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgogCiAgICAgICAg IGNvbnRyaWJ1dG9ycy5qc29uIGZhaWxzIHRvIHBhcnNlIGFmdGVyIHIyMzMyMDkKZGlmZiAtLWdp dCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0L05ldHdvcmtQcm9jZXNzQ3Jhc2hX aXRoUGVuZGluZ0Nvbm5lY3Rpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dC9OZXR3b3JrUHJvY2Vzc0NyYXNoV2l0aFBlbmRpbmdDb25uZWN0aW9uLm1tCmluZGV4IGNhNTkz MzMwYjQ0ODVhZWNkM2Y1YzlkMjExMTA3ZTk2NjEwYjU0ODguLjMzNDNkNmFmYmEzMjZkYjM3NDNk NzRhYTc3MWY1MzA0MTllMDk5NWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0L05ldHdvcmtQcm9jZXNzQ3Jhc2hXaXRoUGVuZGluZ0Nvbm5lY3Rpb24ubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQvTmV0d29ya1Byb2Nlc3NDcmFzaFdp dGhQZW5kaW5nQ29ubmVjdGlvbi5tbQpAQCAtMzcsMTIgKzM3LDMxIEBACiAKICNpZiBXS19BUElf RU5BQkxFRAogCi1uYW1lc3BhY2UgVGVzdFdlYktpdEFQSSB7Ci0KIHN0YXRpYyBib29sIGxvYWRl ZE9yQ3Jhc2hlZCA9IGZhbHNlOwogc3RhdGljIGJvb2wgbG9hZGVkID0gZmFsc2U7CiBzdGF0aWMg Ym9vbCB3ZWJQcm9jZXNzQ3Jhc2hlZCA9IGZhbHNlOwogc3RhdGljIGJvb2wgbmV0d29ya1Byb2Nl c3NDcmFzaGVkID0gZmFsc2U7CitzdGF0aWMgcGlkX3QgcGlkOworc3RhdGljIFdLV2ViVmlldyog dGVzdFZpZXc7CisKK0BpbnRlcmZhY2UgTW9uaXRvcldlYkNvbnRlbnRDcmFzaE5hdmlnYXRpb25E ZWxlZ2F0ZSA6IE5TT2JqZWN0IDxXS05hdmlnYXRpb25EZWxlZ2F0ZT4KK0BlbmQKKworQGltcGxl bWVudGF0aW9uIE1vbml0b3JXZWJDb250ZW50Q3Jhc2hOYXZpZ2F0aW9uRGVsZWdhdGUKKworLSAo dm9pZClfd2ViVmlldzooV0tXZWJWaWV3ICopd2ViVmlldyB3ZWJDb250ZW50UHJvY2Vzc0RpZFRl cm1pbmF0ZVdpdGhSZWFzb246KF9XS1Byb2Nlc3NUZXJtaW5hdGlvblJlYXNvbilyZWFzb24KK3sK KyAgICB3ZWJQcm9jZXNzQ3Jhc2hlZCA9IHRydWU7Cit9CisKKy0gKHZvaWQpd2ViVmlldzooV0tX ZWJWaWV3ICopd2ViVmlldyBkaWRGaW5pc2hOYXZpZ2F0aW9uOihXS05hdmlnYXRpb24gKiluYXZp Z2F0aW9uCit7CisgICAgbG9hZGVkID0gdHJ1ZTsKK30KKworQGVuZAorCituYW1lc3BhY2UgVGVz dFdlYktpdEFQSSB7CiAKIFRFU1QoV2ViS2l0LCBOZXR3b3JrUHJvY2Vzc0NyYXNoV2l0aFBlbmRp bmdDb25uZWN0aW9uKQogewpAQCAtMTA3LDYgKzEyNiw0NyBAQCBURVNUKFdlYktpdCwgTmV0d29y a1Byb2Nlc3NDcmFzaFdpdGhQZW5kaW5nQ29ubmVjdGlvbikKICAgICBFWFBFQ1RfRkFMU0Uod2Vi UHJvY2Vzc0NyYXNoZWQpOwogfQogCitURVNUKFdlYktpdCwgTmV0d29ya1Byb2Nlc3NSZWxhdW5j aE9uTGF1bmNoRmFpbHVyZSkKK3sKKyAgICBhdXRvIGNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtb V0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIGF1dG8gcHJvY2Vzc1Bv b2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNzUG9vbCBhbGxvY10gaW5pdF0pOworCisgICAgW2NvbmZp Z3VyYXRpb24gc2V0UHJvY2Vzc1Bvb2w6cHJvY2Vzc1Bvb2wuZ2V0KCldOworCisgICAgd2ViUHJv Y2Vzc0NyYXNoZWQgPSBmYWxzZTsKKyAgICBsb2FkZWQgPSBmYWxzZTsKKyAgICBuZXR3b3JrUHJv Y2Vzc0NyYXNoZWQgPSBmYWxzZTsKKworICAgIFdLQ29udGV4dENsaWVudFYwIGNsaWVudDsKKyAg ICBtZW1zZXQoJmNsaWVudCwgMCwgc2l6ZW9mKGNsaWVudCkpOworICAgIGNsaWVudC5uZXR3b3Jr UHJvY2Vzc0RpZENyYXNoID0gW10oV0tDb250ZXh0UmVmIGNvbnRleHQsIGNvbnN0IHZvaWQqIGNs aWVudEluZm8pIHsKKyAgICAgICAgcGlkID0gW3Rlc3RWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmll cl07CisgICAgICAgIEVYUEVDVF9HVChwaWQsIDApOyAvLyBUaGUgV2ViUHJvY2VzcyBpcyBhbHJl YWR5IGxhdW5jaGVkIHdoZW4gdGhlIG5ldHdvcmsgcHJvY2VzcyBjcmFzaGVzLgorICAgICAgICBu ZXR3b3JrUHJvY2Vzc0NyYXNoZWQgPSB0cnVlOworICAgIH07CisgICAgV0tDb250ZXh0U2V0Q2xp ZW50KHN0YXRpY19jYXN0PFdLQ29udGV4dFJlZj4ocHJvY2Vzc1Bvb2wuZ2V0KCkpLCAmY2xpZW50 LmJhc2UpOworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10g aW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAwKSBjb25maWd1cmF0aW9uOmNv bmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICB0ZXN0VmlldyA9IHdlYlZpZXcuZ2V0KCk7CisKKyAg ICAvLyBDb25zdHVjdGluZyBhIFdlYlZpZXcgc3RhcnRzIGEgbmV0d29yayBwcm9jZXNzIHNvIHRl cm1pbmF0ZSB0aGlzIG9uZS4gVGhlIHBhZ2UgbG9hZCBiZWxvdyB3aWxsIHRoZW4gcmVxdWVzdCBh IG5ldHdvcmsgcHJvY2VzcyBhbmQgd2UKKyAgICAvLyBtYWtlIHRoaXMgbmV3IG5ldHdvcmsgcHJv Y2VzcyBsYXVuY2ggY3Jhc2ggb24gc3RhcnR1cC4KKyAgICBbcHJvY2Vzc1Bvb2wgX3Rlcm1pbmF0 ZU5ldHdvcmtQcm9jZXNzXTsKKyAgICBbcHJvY2Vzc1Bvb2wgX21ha2VOZXh0TmV0d29ya1Byb2Nl c3NMYXVuY2hGYWlsRm9yVGVzdGluZ107CisKKyAgICBhdXRvIGRlbGVnYXRlID0gYWRvcHROUyhb W01vbml0b3JXZWJDb250ZW50Q3Jhc2hOYXZpZ2F0aW9uRGVsZWdhdGUgYWxsb2NdIGluaXRdKTsK KyAgICBbd2ViVmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6ZGVsZWdhdGUuZ2V0KCldOworCisg ICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbW05T QnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2ltcGxlIiB3aXRoRXh0ZW5zaW9u OkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5yZXNvdXJjZXMiXV1dOworICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmbG9hZGVkKTsKKworICAgIEVYUEVDVF9UUlVFKG5l dHdvcmtQcm9jZXNzQ3Jhc2hlZCk7CisgICAgRVhQRUNUX0ZBTFNFKHdlYlByb2Nlc3NDcmFzaGVk KTsKKyAgICBFWFBFQ1RfR1QoW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSwgMCk7Cisg ICAgRVhQRUNUX0VRKHBpZCwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXSk7CisgICAg RVhQRUNUX0dUKFtwcm9jZXNzUG9vbC5nZXQoKSBfbmV0d29ya1Byb2Nlc3NJZGVudGlmaWVyXSwg MCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkKIAogI2VuZGlmCg==