194717 2019-02-15 12:01:33 -0800 Regression(PSON) Navigating quickly back and forth can lead to getting 'about:blank' in the backforward list 2019-02-15 13:04:00 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson commit-queue ggaren webkit-bug-importer oldest_to_newest 1506701 0 cdumez 2019-02-15 12:01:33 -0800 Navigating quickly back and forth can lead to getting 'about:blank' in the backforward list when PSON is enabled. 1506703 1 cdumez 2019-02-15 12:01:50 -0800 <rdar://problem/47884404> 1506709 2 362144 cdumez 2019-02-15 12:18:36 -0800 Created attachment 362144 Patch 1506720 3 362144 commit-queue 2019-02-15 13:03:59 -0800 Comment on attachment 362144 Patch Clearing flags on attachment: 362144 Committed r241606: <https://trac.webkit.org/changeset/241606> 1506721 4 commit-queue 2019-02-15 13:04:00 -0800 All reviewed patches have been landed. Closing bug. 362144 2019-02-15 12:18:36 -0800 2019-02-15 13:03:59 -0800 Patch bug-194717-20190215121835.patch text/plain 13698 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjQxNTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDAwOGY5ZDY1NDQwNTViMDVi YzAxYjQ4MzdiY2NjODk5ODlhYzM3NWMuLmMxNDg4YWQyZjM5NDBjZWQzMjNmZWQ1MzdlODE0OWQz ZDUwNjNkMGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDggQEAKKzIwMTktMDItMTUgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBSZWdyZXNzaW9uKFBTT04pIE5hdmln YXRpbmcgcXVpY2tseSBiYWNrIGFuZCBmb3J0aCBjYW4gbGVhZCB0byBnZXR0aW5nICdhYm91dDpi bGFuaycgaW4gdGhlIGJhY2tmb3J3YXJkIGxpc3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE5NDcxNworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNDc4 ODQ0MDQ+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg V2hlbiB0aGUgY2xpZW50IGRvZXMgYSBoaXN0b3J5IG5hdmlnYXRpb24sIHRoZSBVSVByb2Nlc3Mg c2VuZHMgYSBXZWJQYWdlOjpHb1RvQmFja0ZvcndhcmRJdGVtIElQQyB0byB0aGUKKyAgICAgICAg V2ViUHJvY2VzcyBhbmQgdGhlIFdlYlByb2Nlc3Mgc2VuZHMgYSBXZWJQYWdlUHJveHk6OkJhY2tG b3J3YXJkR29Ub0l0ZW0gSVBDIGJhY2sgdG8gdGhlIFVJUHJvY2VzcyB0bworICAgICAgICB1cGRh dGUgdGhlIGN1cnJlbnQgaXRlbSBpbiB0aGUgQmFja0ZvcndhcmRMaXN0LiBUaGlzIG1lYW5zIHRo YXQgdGhlcmUgaXMgYSBzbGlnaHQgZGVsYXkgYmV0d2VlbiB0aGUKKyAgICAgICAgcG9pbnQgYSBj bGllbnQgcmVxdWVzdHMgYSBoaXN0b3J5IG5hdmlnYXRpb24gYW5kIHRoZSBwb2ludCB3aGVyZSB0 aGUgQmFja0ZvcndhcmRMaXN0J3MgY3VycmVudCBpdGVtIGdldHMKKyAgICAgICAgdXBkYXRlLiBU aGlzIGRlbGF5IGlzIHByZS1leGlzdGluZyBiZWhhdmlvciBhbmQgbm90IG5ldyB0byBQU09OLgor CisgICAgICAgIEhvd2V2ZXIsIHdpdGggUFNPTiBlbmFibGVkLCBpZiB3ZSBkZWNpZGUgdG8gcHJv Y2Vzcy1zd2FwIGZvciB0aGUgaGlzdG9yeSBuYXZpZ2F0aW9uLCB3ZSdsbCB0ZWxsIHRoZQorICAg ICAgICBwcmV2aW91cyAoY29tbWl0dGVkKSBwcm9jZXNzIHRvIGlnbm9yZSB0aGUgbG9hZCBhbmQg d2UgYXNrIGEgbmV3IChwcm92aXNpb25hbCkgcHJvY2VzcyB0byBkbyB0aGUgaGlzdG9yeQorICAg ICAgICBuYXZpZ2F0aW9uLiBXaGVuIHRoZSBwcmV2aW91cyBwcm9jZXNzIHJlY2VpdmVzIHRoZSBy ZXF1ZXN0IHRvIGlnbm9yZSB0aGUgaGlzdG9yeSBuYXZpZ2F0aW9uLCBpdCByZXN0b3JlcworICAg ICAgICB0aGUgSGlzdG9yeSdzIGN1cnJlbnQgaXRlbSB0byB0aGUgb25lIHByZXZpb3VzIHRoZSBu YXZpZ2F0aW9uLCB3aGljaCBzZW5kcyBhIFdlYlBhZ2VQcm94eTo6R29Ub0JhY2tGb3J3YXJkSXRl bQorICAgICAgICBJUEMgdG8gdGhlIFVJUHJvY2VzcyB0byB1cGRhdGUgdGhlIEJhY2tGb3J3YXJk TGlzdCBhcyB3ZWxsLiBJbiBwYXJhbGxlbCwgdGhlIG5ldyBwcm9jZXNzIHN0YXJ0cyB0aGUKKyAg ICAgICAgaGlzdG9yeSBuYXZpZ2F0aW9uIGFuZCBhbHNvIHNlbmRzIGEgV2ViUGFnZVByb3h5OjpH b1RvQmFja0ZvcndhcmRJdGVtIHRvIHVwZGF0ZSB0aGUgQmFja0ZvcndhcmRMaXN0J3MKKyAgICAg ICAgY3VycmVudCBpdGVtIGFzIHdlbGwuIFdlIGVuZCB1cCB3aXRoIGEgcmFjZSBiZXR3ZWVuIHRo ZSAyIEdvVG9CYWNrRm9yd2FyZEl0ZW0gSVBDIG1lc3NhZ2VzIGNvbWluZyBmcm9tCisgICAgICAg IHRoZSBvbGQgYW5kIG5ldyBwcm9jZXNzLiBJZiB0aGUgb2xkIHByb2Nlc3MncyBtZXNzYWdlIGxv c2VzIHRoZSByYWNlLCB3ZSBlbmQgdXAgd2l0aCB0aGUgd3JvbmcgY3VycmVudAorICAgICAgICBo aXN0b3J5IGl0ZW0gZ2V0dGluZyBzZXQgaW4gdGhlIFVJUHJvY2Vzcy4gTGF0ZXIsIHdoZW4gd2Ug Y29tbWl0IHRoZSBwcm92aXNpb25hbCBsb2FkIGFuZCB0cnkgdG8gc3VzcGVuZAorICAgICAgICB0 aGUgcHJldmlvdXMgcGFnZSwgd2Ugd291bGQgc2F2ZSB0aGUgU3VzcGVuZGVkUGFnZSBvbiB0aGUg Kndyb25nKiBCYWNrRm9yd2FyZExpc3QgaXRlbS4gSWYgb25lIHRyaWVzIHRvCisgICAgICAgIGxv YWQgdGhpcyBCYWNrRm9yd2FyZExpc3QgaXRlbSBsYXRlciwgd2UnbGwgdXNlIGl0cyBTdXNwZW5k ZWRQYWdlIGFuZCB0cnkgdG8gdW5zdXNwZW5kIGl0LiBIb3dldmVyLAorICAgICAgICBiZWNhdXNl IHRoZSBQYWdlQ2FjaGUgZW50cnkgaXMgc2F2ZWQgb24gYW5vdGhlciBIaXN0b3J5SXRlbSB0aGFu IHRoZSBvbmUgZ2V0dGluZyBsb2FkZWQgaW4gdGhlIFdlYlByb2Nlc3MKKyAgICAgICAgc2lkZSwg d2UgYXR0ZW1wdCB0byBkbyBhIHJlZ3VsYXIgbG9hZCBpbnN0ZWFkIG9mIGEgUGFnZUNhY2hlIHJl c3RvcmUuIFdlIGVuZCB1cCBmYWlsaW5nIHRoZSBsb2FkIGJlY2F1c2UKKyAgICAgICAgcGFnZXMg Y2Fubm90IHRyaWdnZXIgbmV3IGxvYWRzIHdoaWxlIGluIHBhZ2UgY2FjaGUuIEJlY2F1c2UgdGhl IGxvYWQgZmFpbHMsIHdlIGVuZCB1cCBsb2FkaW5nIHRoZQorICAgICAgICBpbml0aWFsIGVtcHR5 IGRvY3VtZW50IGFuZCB0aGlzIGlzIGhvdyB3ZSBlbmQgdXAgd2l0aCAnYWJvdXQ6YmxhbmsnIGlu IHRoZSBiYWNrIGZvcndhcmQgbGlzdC4KKworICAgICAgICBUbyBhZGRyZXNzIHRoZSBpc3N1ZSwg dXBkYXRlIFdlYlBhZ2VQcm94eTo6YmFja0ZvcndhcmRHb1RvSXRlbSgpIHRvIGlnbm9yZSBtZXNz YWdlcyBmcm9tIHRoZSBvbGQvY29tbWl0dGVkCisgICAgICAgIFdlYlByb2Nlc3Mgd2hlbiB0aGVy ZSBpcyBhIHBlbmRpbmcgcHJvdmlzaW9uYWwgbG9hZC4gSWYgdGhlIGNvbW1pdHRlZCBwcm9jZXNz ZXMgc3RhcnRzIGEgbGVnaXQgbmV3CisgICAgICAgIGxvYWQsIGl0IHdvdWxkIGNsZWFyIGFueSBl eGlzdGluZyBwZW5kaW5nIHByb3Zpc2lvbmFsIGxvYWQgYmVmb3JlIGF0dGVtcHRpbmcgdGhlIGNh bGwgYmFja0ZvcndhcmRHb1RvSXRlbSgpLgorICAgICAgICBBcyBhIHJlc3VsdCwgaWdub3Jpbmcg c3VjaCBtZXNzYWdlcyBmcm9tIHRoZSBvbGQgcHJvY2Vzc2VzIHdoZW4gdGhlcmUgaXMgYSBwZW5k aW5nIHByb3Zpc2lvbmFsIGxvYWQgaXMKKyAgICAgICAgc2FmZS4KKworICAgICAgICBJbiB0aGUg ZnV0dXJlLCB3ZSBzaG91bGQgcHJvYmFibHkgbW92ZSBtb3JlIG9mIHRoZSBoaXN0b3J5IC8gYmFj a0ZvcndhcmRMaXN0IG1hbmFnZW1lbnQgdG8gdGhlIFVJUHJvY2VzcworICAgICAgICB0byBhdm9p ZCB0aGlzIHNvcnQgb2YgaXNzdWVzLiBUaGlzIHdvdWxkIGJlIGEgbXVjaCBsYXJnZXIgcmVmYWN0 b3JpbmcgdGhvdWdoIHNvIEkgYW0gZ29pbmcgd2l0aCB0aGlzCisgICAgICAgIHNpbXBsZXIgZml4 IHRoYXQgaXMgZWFzaWx5IGNoZXJyeS1waWNrYWJsZSBmb3Igbm93LgorCisgICAgICAgICogVUlQ cm9jZXNzL1dlYlBhZ2VQcm94eS5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQcm94eTo6 c3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZSk6CisgICAgICAgIChXZWJLaXQ6OldlYlBhZ2VQ cm94eTo6Y29udGludWVOYXZpZ2F0aW9uSW5OZXdQcm9jZXNzKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZEdvVG9JdGVtKToKKwogMjAxOS0wMi0xNCAgQ2hyaXMg RHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFtQU09OXSBJbnRyb2R1Y2UgYSBX ZWJDb250ZW50IFByb2Nlc3MgY2FjaGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJv eHkuY3BwCmluZGV4IDE3NDUzMWE0MzQ1ZmI4NWJiZGM4MDg5ZDVmZDkzZjdlMzU3ODFmZjkuLmYw YTNkNGM4ZmFmYWExMTEzMzdmODdlMmRkMDU4YzgxMjYwYmFhZGUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApAQCAtMjQ1LDYgKzI0NSw3IEBACiAjZGVmaW5lIE1F U1NBR0VfQ0hFQ0tfVVJMKHByb2Nlc3MsIHVybCkgTUVTU0FHRV9DSEVDS19CQVNFKGNoZWNrVVJM UmVjZWl2ZWRGcm9tQ3VycmVudE9yUHJldmlvdXNXZWJQcm9jZXNzKHByb2Nlc3MsIHVybCksIHBy b2Nlc3MtPmNvbm5lY3Rpb24oKSkKIAogI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGNo YW5uZWwsIGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihpc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQo KSwgY2hhbm5lbCwgIiVwIC0gV2ViUGFnZVByb3h5OjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1Nf XykKKyNkZWZpbmUgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChjaGFubmVsLCBmbXQsIC4u LikgUkVMRUFTRV9MT0dfRVJST1JfSUYoaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIGNoYW5u ZWwsICIlcCAtIFdlYlBhZ2VQcm94eTo6IiBmbXQsIHRoaXMsICMjX19WQV9BUkdTX18pCiAKIC8v IFJlcHJlc2VudHMgdGhlIG51bWJlciBvZiB3aGVlbCBldmVudHMgd2UgY2FuIGhvbGQgaW4gdGhl IHF1ZXVlIGJlZm9yZSB3ZSBzdGFydCBwdXNoaW5nIHRoZW0gcHJlZW1wdGl2ZWx5Lgogc3RhdGlj IGNvbnN0IHVuc2lnbmVkIHdoZWVsRXZlbnRRdWV1ZVNpemVUaHJlc2hvbGQgPSAxMDsKQEAgLTc2 MCwyMyArNzYxLDM2IEBAIGJvb2wgV2ViUGFnZVByb3h5OjpzdXNwZW5kQ3VycmVudFBhZ2VJZlBv c3NpYmxlKEFQSTo6TmF2aWdhdGlvbiYgbmF2aWdhdGlvbiwgT3B0CiAgICAgICAgIHJldHVybiBm YWxzZTsKIAogICAgIC8vIElmIHRoZSBjbGllbnQgZm9yY2VkIGEgc3dhcCB0aGVuIGl0IG1heSBu b3QgYmUgV2ViLWNvbXBhdGlibGUgdG8gc3VzcGVuZCB0aGUgcHJldmlvdXMgcGFnZSBiZWNhdXNl IG90aGVyIHdpbmRvd3MgbWF5IGhhdmUgYW4gb3BlbmVyIGxpbmsgdG8gdGhlIHBhZ2UuCi0gICAg aWYgKHByb2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQgPT0gUHJvY2Vzc1N3YXBSZXF1ZXN0ZWRC eUNsaWVudDo6WWVzKQorICAgIGlmIChwcm9jZXNzU3dhcFJlcXVlc3RlZEJ5Q2xpZW50ID09IFBy b2Nlc3NTd2FwUmVxdWVzdGVkQnlDbGllbnQ6OlllcykgeworICAgICAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKFByb2Nlc3NTd2FwcGluZywgInN1c3BlbmRDdXJyZW50UGFnZUlmUG9zc2libGU6 IE5vdCBzdXNwZW5kaW5nIGN1cnJlbnQgcGFnZSBmb3IgcHJvY2VzcyBwaWQgJWkgYmVjYXVzZSB0 aGUgc3dhcCB3YXMgcmVxdWVzdGVkIGJ5IHRoZSBjbGllbnQiLCBtX3Byb2Nlc3MtPnByb2Nlc3NJ ZGVudGlmaWVyKCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgfQogCi0gICAgaWYgKGlz UGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkpCisgICAgaWYgKGlz UGFnZU9wZW5lZEJ5RE9NU2hvd2luZ0luaXRpYWxFbXB0eURvY3VtZW50KCkpIHsKKyAgICAgICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJzdXNwZW5kQ3VycmVudFBh Z2VJZlBvc3NpYmxlOiBOb3Qgc3VzcGVuZGluZyBjdXJyZW50IHBhZ2UgZm9yIHByb2Nlc3MgcGlk ICVpIGJlY2F1c2UgaXQgaXMgc2hvd2luZyB0aGUgaW5pdGlhbCBlbXB0eSBkb2N1bWVudCIsIG1f cHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKKyAg ICB9CiAKICAgICBhdXRvKiBmcm9tSXRlbSA9IG5hdmlnYXRpb24uZnJvbUl0ZW0oKTsKICAgICBp ZiAoIWZyb21JdGVtKSB7Ci0gICAgICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJXZWJQYWdlUHJv eHkgJSIgUFJJdTY0ICIgdW5hYmxlIHRvIGNyZWF0ZSBzdXNwZW5kZWQgcGFnZSBmb3IgcHJvY2Vz cyBwaWQgJWkgLSBObyBjdXJyZW50IGJhY2svZm9yd2FyZCBpdGVtIiwgcGFnZUlEKCksIG1fcHJv Y2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIoKSk7CisgICAgICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9X RUQoUHJvY2Vzc1N3YXBwaW5nLCAic3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJsZTogTm90IHN1 c3BlbmRpbmcgY3VycmVudCBwYWdlIGZvciBwcm9jZXNzIHBpZCAlaSBiZWNhdXNlIHRoZSBuYXZp Z2F0aW9uIGRvZXMgbm90IGhhdmUgYSBmcm9tSXRlbSIsIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50 aWZpZXIoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKICAgICAvLyBJZiB0aGUg c291cmNlIGFuZCB0aGUgZGVzdGluYXRpb24gYmFjayAvIGZvcndhcmQgbGlzdCBpdGVtcyBhcmUg dGhlIHNhbWUsIHRoZW4gdGhpcyBpcyBhIGNsaWVudC1zaWRlIHJlZGlyZWN0LiBJbiB0aGlzIGNh c2UsCiAgICAgLy8gdGhlcmUgaXMgbm8gbmVlZCB0byBzdXNwZW5kIHRoZSBwcmV2aW91cyBwYWdl IGFzIHRoZXJlIHdpbGwgYmUgbm8gd2F5IHRvIGdldCBiYWNrIHRvIGl0LgotICAgIGlmIChmcm9t SXRlbSA9PSBtX2JhY2tGb3J3YXJkTGlzdC0+Y3VycmVudEl0ZW0oKSkKKyAgICBpZiAoZnJvbUl0 ZW0gPT0gbV9iYWNrRm9yd2FyZExpc3QtPmN1cnJlbnRJdGVtKCkpIHsKKyAgICAgICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRChQcm9jZXNzU3dhcHBpbmcsICJzdXNwZW5kQ3VycmVudFBhZ2VJZlBv c3NpYmxlOiBOb3Qgc3VzcGVuZGluZyBjdXJyZW50IHBhZ2UgZm9yIHByb2Nlc3MgcGlkICVpIGJl Y2F1c2UgdGhpcyBpcyBhIGNsaWVudC1zaWRlIHJlZGlyZWN0IiwgbV9wcm9jZXNzLT5wcm9jZXNz SWRlbnRpZmllcigpKTsKICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KIAorICAgIGlmIChm cm9tSXRlbS0+dXJsKCkgIT0gcGFnZUxvYWRTdGF0ZSgpLnVybCgpKSB7CisgICAgICAgIFJFTEVB U0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAic3VzcGVuZEN1cnJlbnRQ YWdlSWZQb3NzaWJsZTogTm90IHN1c3BlbmRpbmcgY3VycmVudCBwYWdlIGZvciBwcm9jZXNzIHBp ZCAlaSBiZWNhdXNlIGZyb21JdGVtJ3MgVVJMIGRvZXMgbm90IG1hdGNoIHRoZSBwYWdlIFVSTC4i LCBtX3Byb2Nlc3MtPnByb2Nlc3NJZGVudGlmaWVyKCkpOworICAgICAgICBBU1NFUlRfTk9UX1JF QUNIRUQoKTsKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIH0KKworICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoUHJvY2Vzc1N3YXBwaW5nLCAic3VzcGVuZEN1cnJlbnRQYWdlSWZQb3NzaWJs ZTogU3VzcGVuZGluZyBjdXJyZW50IHBhZ2UgZm9yIHByb2Nlc3MgcGlkICVpIiwgbV9wcm9jZXNz LT5wcm9jZXNzSWRlbnRpZmllcigpKTsKICAgICBhdXRvIHN1c3BlbmRlZFBhZ2UgPSBzdGQ6Om1h a2VfdW5pcXVlPFN1c3BlbmRlZFBhZ2VQcm94eT4oKnRoaXMsIG1fcHJvY2Vzcy5jb3B5UmVmKCks ICpmcm9tSXRlbSwgKm1haW5GcmFtZUlEKTsKIAogICAgIExPRyhQcm9jZXNzU3dhcHBpbmcsICJX ZWJQYWdlUHJveHkgJSIgUFJJdTY0ICIgY3JlYXRlZCBzdXNwZW5kZWQgcGFnZSAlcyBmb3IgcHJv Y2VzcyBwaWQgJWksIGJhY2svZm9yd2FyZCBpdGVtICVzIiBQUkl1NjQsIHBhZ2VJRCgpLCBzdXNw ZW5kZWRQYWdlLT5sb2dnaW5nU3RyaW5nKCksIG1fcHJvY2Vzcy0+cHJvY2Vzc0lkZW50aWZpZXIo KSwgZnJvbUl0ZW0tPml0ZW1JRCgpLmxvZ1N0cmluZygpKTsKQEAgLTI4MzYsNiArMjg1MCw3IEBA IHZvaWQgV2ViUGFnZVByb3h5Ojpjb250aW51ZU5hdmlnYXRpb25Jbk5ld1Byb2Nlc3MoQVBJOjpO YXZpZ2F0aW9uJiBuYXZpZ2F0aW9uLCBzCiAgICAgTE9HKExvYWRpbmcsICJDb250aW51aW5nIG5h dmlnYXRpb24gJSIgUFJJdTY0ICIgJyVzJyBpbiBhIG5ldyB3ZWIgcHJvY2VzcyIsIG5hdmlnYXRp b24ubmF2aWdhdGlvbklEKCksIG5hdmlnYXRpb24ubG9nZ2luZ1N0cmluZygpKTsKIAogICAgIGlm IChtX3Byb3Zpc2lvbmFsUGFnZSkgeworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKFBy b2Nlc3NTd2FwcGluZywgImNvbnRpbnVlTmF2aWdhdGlvbkluTmV3UHJvY2VzczogVGhlcmUgaXMg YWxyZWFkeSBhIHBlbmRpbmcgcHJvdmlzaW9uYWwgbG9hZCwgY2FuY2VsbGluZyBpdCAocHJvdmlz b25hbE5hdmlnYXRpb25JRDogJWxsdSwgbmF2aWdhdGlvbklEOiAlbGx1KSIsIG1fcHJvdmlzaW9u YWxQYWdlLT5uYXZpZ2F0aW9uSUQoKSwgbmF2aWdhdGlvbi5uYXZpZ2F0aW9uSUQoKSk7CiAgICAg ICAgIGlmIChtX3Byb3Zpc2lvbmFsUGFnZS0+bmF2aWdhdGlvbklEKCkgIT0gbmF2aWdhdGlvbi5u YXZpZ2F0aW9uSUQoKSkKICAgICAgICAgICAgIG1fcHJvdmlzaW9uYWxQYWdlLT5jYW5jZWwoKTsK ICAgICAgICAgbV9wcm92aXNpb25hbFBhZ2UgPSBudWxscHRyOwpAQCAtNTQ3NSw2ICs1NDkwLDEy IEBAIHZvaWQgV2ViUGFnZVByb3h5OjpiYWNrRm9yd2FyZEFkZEl0ZW0oQmFja0ZvcndhcmRMaXN0 SXRlbVN0YXRlJiYgaXRlbVN0YXRlKQogCiB2b2lkIFdlYlBhZ2VQcm94eTo6YmFja0ZvcndhcmRH b1RvSXRlbShjb25zdCBCYWNrRm9yd2FyZEl0ZW1JZGVudGlmaWVyJiBpdGVtSUQsIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZSYgc2FuZGJveEV4dGVuc2lvbkhhbmRsZSkKIHsKKyAgICAvLyBPbiBw cm9jZXNzIHN3YXAsIHdlIHRlbGwgdGhlIHByZXZpb3VzIHByb2Nlc3MgdG8gaWdub3JlIHRoZSBs b2FkLCB3aGljaCBjYXVzZXMgaXQgc28gcmVzdG9yZSBpdHMgY3VycmVudCBiYWNrIGZvcndhcmQg aXRlbSB0byBpdHMgcHJldmlvdXMKKyAgICAvLyB2YWx1ZS4gU2luY2UgdGhlIGxvYWQgaXMgcmVh bGx5IGdvaW5nIG9uIGluIGEgbmV3IHByb3Zpc2lvbmFsIHByb2Nlc3MsIHdlIHdhbnQgdG8gaWdu b3JlIHN1Y2ggcmVxdWVzdHMgZnJvbSB0aGUgY29tbWl0dGVkIHByb2Nlc3MuCisgICAgLy8gQW55 IHJlYWwgbmV3IGxvYWQgaW4gdGhlIGNvbW1pdHRlZCBwcm9jZXNzIHdvdWxkIGhhdmUgY2xlYXJl ZCBtX3Byb3Zpc2lvbmFsUGFnZS4KKyAgICBpZiAobV9wcm92aXNpb25hbFBhZ2UpCisgICAgICAg IHJldHVybjsKKwogICAgIGJhY2tGb3J3YXJkR29Ub0l0ZW1TaGFyZWQobV9wcm9jZXNzLmNvcHlS ZWYoKSwgaXRlbUlELCBzYW5kYm94RXh0ZW5zaW9uSGFuZGxlKTsKIH0KIApkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQ5NzUwZWU0MmYwMjhiYWE4 MzExMzEyZjQ1YTAyNTk0ZjY0NTMyZDIuLmEzN2IyNDgzMTJiNzNmNDNiZDI0Nzg0MTVkY2RjMmNj Yjk0MWMyZTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNSBAQAorMjAxOS0wMi0xNSAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCisgICAgICAgIFJlZ3Jlc3Npb24oUFNPTikgTmF2aWdhdGluZyBxdWlja2x5IGJh Y2sgYW5kIGZvcnRoIGNhbiBsZWFkIHRvIGdldHRpbmcgJ2Fib3V0OmJsYW5rJyBpbiB0aGUgYmFj a2ZvcndhcmQgbGlzdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTk0NzE3CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS80Nzg4NDQwND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgQVBJIHRlc3QgY292 ZXJhZ2UuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nl c3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorCiAyMDE5LTAyLTE0ICBDaHJpcyBEdW1leiAgPGNkdW1l ekBhcHBsZS5jb20+CiAKICAgICAgICAgW1BTT05dIEludHJvZHVjZSBhIFdlYkNvbnRlbnQgUHJv Y2VzcyBjYWNoZQpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggYzI3Nzg1MDE4 NThkYmU4YjdjNWJjNTljMWJkNDQwYzU3ODNiNjE0ZS4uNTEwZmZiYTViM2U1NGM4ZTlmOGZkNTJm OTAxMWM2NGZiOTQ0ZDNmZSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC0y MDIzLDYgKzIwMjMsODEgQEAgVEVTVChQcm9jZXNzU3dhcCwgTmF2aWdhdGlvbldpdGhMb2NrZWRI aXN0b3J5V2l0aFBTT04pCiAgICAgcnVuTmF2aWdhdGlvbldpdGhMb2NrZWRIaXN0b3J5VGVzdChT aG91bGRFbmFibGVQU09OOjpZZXMpOwogfQogCitzdGF0aWMgdm9pZCBydW5RdWlja0JhY2tGb3J3 YXJkTmF2aWdhdGlvblRlc3QoU2hvdWxkRW5hYmxlUFNPTiBzaG91bGRFbmFibGVQU09OKQorewor ICAgIGF1dG8gcHJvY2Vzc1Bvb2xDb25maWd1cmF0aW9uID0gcHNvblByb2Nlc3NQb29sQ29uZmln dXJhdGlvbigpOworICAgIHByb2Nlc3NQb29sQ29uZmlndXJhdGlvbi5nZXQoKS5wcm9jZXNzU3dh cHNPbk5hdmlnYXRpb24gPSBzaG91bGRFbmFibGVQU09OID09IFNob3VsZEVuYWJsZVBTT046Olll cyA/IFlFUyA6IE5POworICAgIGF1dG8gcHJvY2Vzc1Bvb2wgPSBhZG9wdE5TKFtbV0tQcm9jZXNz UG9vbCBhbGxvY10gX2luaXRXaXRoQ29uZmlndXJhdGlvbjpwcm9jZXNzUG9vbENvbmZpZ3VyYXRp b24uZ2V0KCldKTsKKworICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtb V0tXZWJWaWV3Q29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3Q29uZmln dXJhdGlvbiBzZXRQcm9jZXNzUG9vbDpwcm9jZXNzUG9vbC5nZXQoKV07CisgICAgYXV0byBoYW5k bGVyID0gYWRvcHROUyhbW1BTT05TY2hlbWUgYWxsb2NdIGluaXRdKTsKKyAgICBbd2ViVmlld0Nv bmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZvclVSTFNjaGVt ZTpAInBzb24iXTsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tXS1dlYlZpZXcgYWxs b2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlv bjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVsZWdhdGUgPSBhZG9w dE5TKFtbUFNPTk5hdmlnYXRpb25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworICAgIFt3ZWJWaWV3 IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBbd2ViVmlldyBj b25maWd1cmF0aW9uXS5wcmVmZXJlbmNlcy5zYWZlQnJvd3NpbmdFbmFibGVkID0gTk87CisKKyAg ICBOU1VSTFJlcXVlc3QgKnJlcXVlc3QgPSBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjovL3d3dy53ZWJraXQub3JnL21haW4xLmh0bWwiXV07 CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJ OjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8gd2Via2l0 UElEID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIHJlcXVlc3QgPSBb TlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicHNvbjov L3d3dy53ZWJraXQub3JnL21haW4yLmh0bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6 cmVxdWVzdF07CisKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRv bmUgPSBmYWxzZTsKKworICAgIEVYUEVDVF9FUSh3ZWJraXRQSUQsIFt3ZWJWaWV3IF93ZWJQcm9j ZXNzSWRlbnRpZmllcl0pOworCisgICAgcmVxdWVzdCA9IFtOU1VSTFJlcXVlc3QgcmVxdWVzdFdp dGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWluLmh0 bWwiXV07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6cmVxdWVzdF07CisKKyAgICBUZXN0V2Vi S2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgIGRvbmUgPSBmYWxzZTsKKworICAgIGF1dG8g YXBwbGVQSUQgPSBbd2ViVmlldyBfd2ViUHJvY2Vzc0lkZW50aWZpZXJdOworICAgIGlmIChzaG91 bGRFbmFibGVQU09OID09IFNob3VsZEVuYWJsZVBTT046OlllcykKKyAgICAgICAgRVhQRUNUX05F KHdlYmtpdFBJRCwgYXBwbGVQSUQpOworICAgIGVsc2UKKyAgICAgICAgRVhQRUNUX0VRKHdlYmtp dFBJRCwgYXBwbGVQSUQpOworCisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8IDEwOyArK2kp IHsKKyAgICAgICAgW3dlYlZpZXcgZ29CYWNrXTsKKyAgICAgICAgVGVzdFdlYktpdEFQSTo6VXRp bDo6c2xlZXAoMC4xKTsKKyAgICAgICAgW3dlYlZpZXcgZ29Gb3J3YXJkXTsKKyAgICAgICAgVGVz dFdlYktpdEFQSTo6VXRpbDo6c3BpblJ1bkxvb3AoMC4xKTsKKyAgICB9CisKKyAgICBWZWN0b3I8 U3RyaW5nPiBiYWNrRm9yd2FyZExpc3RVUkxzOworICAgIGF1dG8qIGJhY2tGb3J3YXJkTGlzdCA9 IFt3ZWJWaWV3IGJhY2tGb3J3YXJkTGlzdF07CisgICAgZm9yICh1bnNpZ25lZCBpID0gMDsgaSA8 IGJhY2tGb3J3YXJkTGlzdC5iYWNrTGlzdC5jb3VudDsgKytpKQorICAgICAgICBiYWNrRm9yd2Fy ZExpc3RVUkxzLmFwcGVuZChbYmFja0ZvcndhcmRMaXN0LmJhY2tMaXN0W2ldLlVSTCBhYnNvbHV0 ZVN0cmluZ10pOworICAgIGJhY2tGb3J3YXJkTGlzdFVSTHMuYXBwZW5kKFtiYWNrRm9yd2FyZExp c3QuY3VycmVudEl0ZW0uVVJMIGFic29sdXRlU3RyaW5nXSk7CisgICAgZm9yICh1bnNpZ25lZCBp ID0gMDsgaSA8IGJhY2tGb3J3YXJkTGlzdC5mb3J3YXJkTGlzdC5jb3VudDsgKytpKQorICAgICAg ICBiYWNrRm9yd2FyZExpc3RVUkxzLmFwcGVuZChbYmFja0ZvcndhcmRMaXN0LmZvcndhcmRMaXN0 W2ldLlVSTCBhYnNvbHV0ZVN0cmluZ10pOworICAgIEVYUEVDVF9FUSgzdSwgYmFja0ZvcndhcmRM aXN0VVJMcy5zaXplKCkpOworICAgIEVYUEVDVF9XS19TVFJFUSgicHNvbjovL3d3dy53ZWJraXQu b3JnL21haW4xLmh0bWwiLCBiYWNrRm9yd2FyZExpc3RVUkxzWzBdKTsKKyAgICBFWFBFQ1RfV0tf U1RSRVEoInBzb246Ly93d3cud2Via2l0Lm9yZy9tYWluMi5odG1sIiwgYmFja0ZvcndhcmRMaXN0 VVJMc1sxXSk7CisgICAgRVhQRUNUX1dLX1NUUkVRKCJwc29uOi8vd3d3LmFwcGxlLmNvbS9tYWlu Lmh0bWwiLCBiYWNrRm9yd2FyZExpc3RVUkxzWzJdKTsKK30KKworVEVTVChQcm9jZXNzU3dhcCwg UXVpY2tCYWNrRm9yd2FyZE5hdmlnYXRpb25XaXRob3V0UFNPTikKK3sKKyAgICBydW5RdWlja0Jh Y2tGb3J3YXJkTmF2aWdhdGlvblRlc3QoU2hvdWxkRW5hYmxlUFNPTjo6Tm8pOworfQorCitURVNU KFByb2Nlc3NTd2FwLCBRdWlja0JhY2tGb3J3YXJkTmF2aWdhdGlvbldpdGhQU09OKQoreworICAg IHJ1blF1aWNrQmFja0ZvcndhcmROYXZpZ2F0aW9uVGVzdChTaG91bGRFbmFibGVQU09OOjpZZXMp OworfQorCiBURVNUKFByb2Nlc3NTd2FwLCBOYXZpZ2F0aW9uV2l0aExvY2tlZEhpc3RvcnlXaXRo b3V0UFNPTikKIHsKICAgICBydW5OYXZpZ2F0aW9uV2l0aExvY2tlZEhpc3RvcnlUZXN0KFNob3Vs ZEVuYWJsZVBTT046Ok5vKTsK