127657 2014-01-26 13:05:57 -0800 Move lastVisitWasHTTPNonGet out to WebHistoryItem 2014-01-26 13:17:10 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 972243 0 andersca 2014-01-26 13:05:57 -0800 Move lastVisitWasHTTPNonGet out to WebHistoryItem 972244 1 222283 andersca 2014-01-26 13:08:59 -0800 Created attachment 222283 Patch 972245 2 andersca 2014-01-26 13:17:10 -0800 Committed r162806: <http://trac.webkit.org/changeset/162806> 222283 2014-01-26 13:08:59 -0800 2014-01-26 13:13:04 -0800 Patch bug-127657-20140126130900.patch text/plain 12585 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyODA0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWY0MjAyNmJkNmI2NGVl OTYyZDAwODJhYWYyZGYxMzkwZjNiMDc2OS4uY2Q5Nzg1MjMzODBjMGM5ZDIyNGM1Nzg3MTlmNGI2 YTdmZGY1ZGNjNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAxLTI2ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CisKKyAgICAgICAgTW92ZSBsYXN0Vmlz aXRXYXNIVFRQTm9uR2V0IG91dCB0byBXZWJIaXN0b3J5SXRlbQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NjU3CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIG1fbGFzdFZpc2l0V2FzSFRUUE5v bkdldCwgaXQncyBvbmx5IHVzZWQgYnkgV2ViS2l0LgorCisgICAgICAgICogaGlzdG9yeS9IaXN0 b3J5SXRlbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIaXN0b3J5SXRlbTo6SGlzdG9yeUl0ZW0p OgorICAgICAgICAoV2ViQ29yZTo6SGlzdG9yeUl0ZW06OnJlc2V0KToKKyAgICAgICAgKiBoaXN0 b3J5L0hpc3RvcnlJdGVtLmg6CisKIDIwMTQtMDEtMjYgIFphbGFuIEJ1anRhcyAgPHphbGFuQGFw cGxlLmNvbT4KIAogICAgICAgICBTdWJwaXhlbCBMYXlvdXQ6IEFsaWduIDxpbnB1dCB0eXBlPSJi dXR0b24iLCBzdWJtaXQgZXRjIChQdXNoQnV0dG9uUGFydCkgdG9wIGFuZCBib3R0b20gcGFkZGlu Z3Mgd2l0aCA8YnV0dG9uPgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9n IGIvU291cmNlL1dlYktpdC9tYWMvQ2hhbmdlTG9nCmluZGV4IDVjYjAzMTE0ZGE0NzNhZmY1Mzc3 YTBlNTkxMTU2MmE4N2Q4NDFkZGYuLjBkODJhNDVlY2M1MmQwNGEyZWRhOTZhOTdmOWY0ZDY0YTBl NzQ4M2YgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViS2l0L21hYy9DaGFuZ2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAxNC0wMS0yNiAgQW5k ZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgogCisgICAgICAgIE1vdmUgbGFzdFZp c2l0V2FzSFRUUE5vbkdldCBvdXQgdG8gV2ViSGlzdG9yeUl0ZW0KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyNzY1NworCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEtlZXAgdHJhY2sgb2YgX2xhc3RWaXNpdFdh c0hUVFBOb25HZXQgaW5zaWRlIFdlYkhpc3RvcnlJdGVtLgorCisgICAgICAgICogSGlzdG9yeS9X ZWJIaXN0b3J5Lm1tOgorICAgICAgICAoLVtXZWJIaXN0b3J5IF92aXNpdGVkVVJMOndpdGhUaXRs ZTptZXRob2Q6d2FzRmFpbHVyZTppbmNyZWFzZVZpc2l0Q291bnQ6XSk6CisgICAgICAgIFNldCBl bnRyeS0+X3ByaXZhdGUtPl9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0LgorCisgICAgICAgICogSGlz dG9yeS9XZWJIaXN0b3J5SXRlbS5oOgorICAgICAgICBDaGFuZ2UgQHByaXZhdGUgdG8gQHBhY2th Z2Ugc28gd2UgY2FuIGdldCBhdCBXZWJIaXN0b3J5SXRlbVByaXZhdGUgZnJvbSBXZWJIaXN0b3J5 LgorCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5tbToKKyAgICAgICAgKC1bV2Vi SGlzdG9yeUl0ZW0gY29weVdpdGhab25lOl0pOgorICAgICAgICBBc3NpZ24gX3ByaXZhdGUtPl9s YXN0VmlzaXRXYXNIVFRQTm9uR2V0LgorCisgICAgICAgICgtW1dlYkhpc3RvcnlJdGVtIGluaXRG cm9tRGljdGlvbmFyeVJlcHJlc2VudGF0aW9uOl0pOgorICAgICAgICBTZXQgX3ByaXZhdGUtPl9s YXN0VmlzaXRXYXNIVFRQTm9uR2V0LgorCisgICAgICAgICogSGlzdG9yeS9XZWJIaXN0b3J5SXRl bUludGVybmFsLmg6CisgICAgICAgIE1vdmUgV2ViSGlzdG9yeUl0ZW1Qcml2YXRlIGludGVyZmFj ZSBoZXJlLgorCisyMDE0LTAxLTI2ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5j b20+CisKICAgICAgICAgVHVybiBXZWJIaXN0b3J5SXRlbVByaXZhdGUgYmFjayBpbnRvIGEgcmVh bCBPYmplY3RpdmUtQyBjbGFzcwogICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MTI3NjUzCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5n ZUxvZyBiL1NvdXJjZS9XZWJLaXQvd2luL0NoYW5nZUxvZwppbmRleCBlMGM2ODQ2MDE3YzQzOGM2 NzA5MTVhYzhiYmYwMmZmMzQ0MGFhNDg1Li40NWNiMGUxOTE2MDg3OWY3YjU2ZmUyOWFkNjUyYTUw ZTQzMjI5NzlmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L3dpbi9DaGFuZ2VMb2cKKysrIGIv U291cmNlL1dlYktpdC93aW4vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAKKzIwMTQtMDEtMjYg IEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKworICAgICAgICBNb3ZlIGxh c3RWaXNpdFdhc0hUVFBOb25HZXQgb3V0IHRvIFdlYkhpc3RvcnlJdGVtCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc2NTcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgdXNlcyBvZiBsYXN0Vmlz aXRXYXNIVFRQTm9uR2V0LgorCisgICAgICAgICogV2ViSGlzdG9yeS5jcHA6CisgICAgICAgIChX ZWJIaXN0b3J5Ojp2aXNpdGVkVVJMKToKKyAgICAgICAgKiBXZWJIaXN0b3J5SXRlbS5jcHA6Cisg ICAgICAgIChXZWJIaXN0b3J5SXRlbTo6aW5pdEZyb21EaWN0aW9uYXJ5UmVwcmVzZW50YXRpb24p OgorICAgICAgICAoV2ViSGlzdG9yeUl0ZW06Omxhc3RWaXNpdFdhc0hUVFBOb25HZXQpOgorICAg ICAgICAoV2ViSGlzdG9yeUl0ZW06OnNldExhc3RWaXNpdFdhc0hUVFBOb25HZXQpOgorCiAyMDE0 LTAxLTI1ICBBbmRlcnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKICAgICAgICAg UmVtb3ZlIGFuIHVudXNlZCBGcmFtZUxvYWRlckNsaWVudCBmdW5jdGlvbgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5SXRlbS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0hpc3RvcnlJdGVtLmNwcAppbmRleCA1YjQ3MDAyN2MyYjVlYTZjZGMwYTlkOGVlODk0 NTZmODJjYWFkNmNlLi4xODczZjM1Yzc0NzM2ZDM4ODllZjNmOGQxODYwYmQ4NWE5ZWM3NWRmIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcAorKysgYi9T b3VyY2UvV2ViQ29yZS9oaXN0b3J5L0hpc3RvcnlJdGVtLmNwcApAQCAtNjEsNyArNjEsNiBAQCB2 b2lkICgqbm90aWZ5SGlzdG9yeUl0ZW1DaGFuZ2VkKShIaXN0b3J5SXRlbSopID0gZGVmYXVsdE5v dGlmeUhpc3RvcnlJdGVtQ2hhbmdlZAogCiBIaXN0b3J5SXRlbTo6SGlzdG9yeUl0ZW0oKQogICAg IDogbV9sYXN0VmlzaXRlZFRpbWUoMCkKLSAgICAsIG1fbGFzdFZpc2l0V2FzSFRUUE5vbkdldChm YWxzZSkKICAgICAsIG1fcGFnZVNjYWxlRmFjdG9yKDApCiAgICAgLCBtX2xhc3RWaXNpdFdhc0Zh aWx1cmUoZmFsc2UpCiAgICAgLCBtX2lzVGFyZ2V0SXRlbShmYWxzZSkKQEAgLTgzLDcgKzgyLDYg QEAgSGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25z dCBTdHJpbmcmIHRpdGxlLCBkb3VibGUgdGkKICAgICAsIG1fb3JpZ2luYWxVUkxTdHJpbmcodXJs U3RyaW5nKQogICAgICwgbV90aXRsZSh0aXRsZSkKICAgICAsIG1fbGFzdFZpc2l0ZWRUaW1lKHRp bWUpCi0gICAgLCBtX2xhc3RWaXNpdFdhc0hUVFBOb25HZXQoZmFsc2UpCiAgICAgLCBtX3BhZ2VT Y2FsZUZhY3RvcigwKQogICAgICwgbV9sYXN0VmlzaXRXYXNGYWlsdXJlKGZhbHNlKQogICAgICwg bV9pc1RhcmdldEl0ZW0oZmFsc2UpCkBAIC0xMDcsNyArMTA1LDYgQEAgSGlzdG9yeUl0ZW06Okhp c3RvcnlJdGVtKGNvbnN0IFN0cmluZyYgdXJsU3RyaW5nLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBj b25zdCBTdHIKICAgICAsIG1fdGl0bGUodGl0bGUpCiAgICAgLCBtX2Rpc3BsYXlUaXRsZShhbHRl cm5hdGVUaXRsZSkKICAgICAsIG1fbGFzdFZpc2l0ZWRUaW1lKHRpbWUpCi0gICAgLCBtX2xhc3RW aXNpdFdhc0hUVFBOb25HZXQoZmFsc2UpCiAgICAgLCBtX3BhZ2VTY2FsZUZhY3RvcigwKQogICAg ICwgbV9sYXN0VmlzaXRXYXNGYWlsdXJlKGZhbHNlKQogICAgICwgbV9pc1RhcmdldEl0ZW0oZmFs c2UpCkBAIC0xMzIsNyArMTI5LDYgQEAgSGlzdG9yeUl0ZW06Okhpc3RvcnlJdGVtKGNvbnN0IFVS TCYgdXJsLCBjb25zdCBTdHJpbmcmIHRhcmdldCwgY29uc3QgU3RyaW5nJiBwYXIKICAgICAsIG1f cGFyZW50KHBhcmVudCkKICAgICAsIG1fdGl0bGUodGl0bGUpCiAgICAgLCBtX2xhc3RWaXNpdGVk VGltZSgwKQotICAgICwgbV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0KGZhbHNlKQogICAgICwgbV9w YWdlU2NhbGVGYWN0b3IoMCkKICAgICAsIG1fbGFzdFZpc2l0V2FzRmFpbHVyZShmYWxzZSkKICAg ICAsIG1faXNUYXJnZXRJdGVtKGZhbHNlKQpAQCAtMTY2LDcgKzE2Miw2IEBAIGlubGluZSBIaXN0 b3J5SXRlbTo6SGlzdG9yeUl0ZW0oY29uc3QgSGlzdG9yeUl0ZW0mIGl0ZW0pCiAgICAgLCBtX3Rp dGxlKGl0ZW0ubV90aXRsZSkKICAgICAsIG1fZGlzcGxheVRpdGxlKGl0ZW0ubV9kaXNwbGF5VGl0 bGUpCiAgICAgLCBtX2xhc3RWaXNpdGVkVGltZShpdGVtLm1fbGFzdFZpc2l0ZWRUaW1lKQotICAg ICwgbV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0KGl0ZW0ubV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0 KQogICAgICwgbV9zY3JvbGxQb2ludChpdGVtLm1fc2Nyb2xsUG9pbnQpCiAgICAgLCBtX3BhZ2VT Y2FsZUZhY3RvcihpdGVtLm1fcGFnZVNjYWxlRmFjdG9yKQogICAgICwgbV9sYXN0VmlzaXRXYXNG YWlsdXJlKGl0ZW0ubV9sYXN0VmlzaXRXYXNGYWlsdXJlKQpAQCAtMjE0LDcgKzIwOSw2IEBAIHZv aWQgSGlzdG9yeUl0ZW06OnJlc2V0KCkKICAgICBtX2Rpc3BsYXlUaXRsZSA9IFN0cmluZygpOwog CiAgICAgbV9sYXN0VmlzaXRlZFRpbWUgPSAwOwotICAgIG1fbGFzdFZpc2l0V2FzSFRUUE5vbkdl dCA9IGZhbHNlOwogCiAgICAgbV9sYXN0VmlzaXRXYXNGYWlsdXJlID0gZmFsc2U7CiAgICAgbV9p c1RhcmdldEl0ZW0gPSBmYWxzZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2hpc3Rvcnkv SGlzdG9yeUl0ZW0uaCBiL1NvdXJjZS9XZWJDb3JlL2hpc3RvcnkvSGlzdG9yeUl0ZW0uaAppbmRl eCBhNmRhNmJmZGU5Y2U2MGMwNmIxZGUwNDYxODI5NzI2M2ZiNDBlYjQ0Li5kYTliMDRhMzdmNjRl ZWUyY2NlZWEzZDUyZTM1ZjBhMWQyYzNhMzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9o aXN0b3J5L0hpc3RvcnlJdGVtLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaGlzdG9yeS9IaXN0b3J5 SXRlbS5oCkBAIC0xMTcsNyArMTE3LDYgQEAgcHVibGljOgogICAgIAogICAgIGludCB2aXNpdENv dW50KCkgY29uc3Q7CiAgICAgYm9vbCBsYXN0VmlzaXRXYXNGYWlsdXJlKCkgY29uc3QgeyByZXR1 cm4gbV9sYXN0VmlzaXRXYXNGYWlsdXJlOyB9Ci0gICAgYm9vbCBsYXN0VmlzaXRXYXNIVFRQTm9u R2V0KCkgY29uc3QgeyByZXR1cm4gbV9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0OyB9CiAKICAgICB2 b2lkIG1lcmdlQXV0b0NvbXBsZXRlSGludHMoSGlzdG9yeUl0ZW0qIG90aGVySXRlbSk7CiAgICAg CkBAIC0xNTgsNyArMTU3LDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBzZXRWaXNpdENvdW50KGlu dCk7CiAgICAgdm9pZCBzZXRMYXN0VmlzaXRXYXNGYWlsdXJlKGJvb2wgd2FzRmFpbHVyZSkgeyBt X2xhc3RWaXNpdFdhc0ZhaWx1cmUgPSB3YXNGYWlsdXJlOyB9Ci0gICAgdm9pZCBzZXRMYXN0Vmlz aXRXYXNIVFRQTm9uR2V0KGJvb2wgd2FzTm90R2V0KSB7IG1fbGFzdFZpc2l0V2FzSFRUUE5vbkdl dCA9IHdhc05vdEdldDsgfQogCiAgICAgdm9pZCBhZGRDaGlsZEl0ZW0oUGFzc1JlZlB0cjxIaXN0 b3J5SXRlbT4pOwogICAgIHZvaWQgc2V0Q2hpbGRJdGVtKFBhc3NSZWZQdHI8SGlzdG9yeUl0ZW0+ KTsKQEAgLTI0OSw3ICsyNDcsNiBAQCBwcml2YXRlOgogICAgIFN0cmluZyBtX2Rpc3BsYXlUaXRs ZTsKICAgICAKICAgICBkb3VibGUgbV9sYXN0VmlzaXRlZFRpbWU7Ci0gICAgYm9vbCBtX2xhc3RW aXNpdFdhc0hUVFBOb25HZXQ7CiAKICAgICBJbnRQb2ludCBtX3Njcm9sbFBvaW50OwogICAgIGZs b2F0IG1fcGFnZVNjYWxlRmFjdG9yOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9tYWMvSGlz dG9yeS9XZWJIaXN0b3J5Lm1tIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5 Lm1tCmluZGV4IDMwZDBmNWNmYzRlMTkzYTU2MzM2MzE1N2MzZWUzZTE0NzFjOWVlYTQuLjU3ZjEx Mzg2MGE4ZDM4MjdiMzY5N2NlZjVlMTU4NWYxNzc0NjdjNTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L21hYy9I aXN0b3J5L1dlYkhpc3RvcnkubW0KQEAgLTkzOCw3ICs5MzgsNyBAQCBzdGF0aWMgaW5saW5lIFdl Ykhpc3RvcnlEYXRlS2V5IGRhdGVLZXkoTlNUaW1lSW50ZXJ2YWwgZGF0ZSkKICAgICBpdGVtLT5z ZXRMYXN0VmlzaXRXYXNGYWlsdXJlKHdhc0ZhaWx1cmUpOwogCiAgICAgaWYgKFttZXRob2QgbGVu Z3RoXSkKLSAgICAgICAgaXRlbS0+c2V0TGFzdFZpc2l0V2FzSFRUUE5vbkdldChbbWV0aG9kIGNh c2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJHRVQiXSAmJiAoIVtbdXJsIHNjaGVtZV0gY2FzZUluc2Vu c2l0aXZlQ29tcGFyZTpAImh0dHAiXSB8fCAhW1t1cmwgc2NoZW1lXSBjYXNlSW5zZW5zaXRpdmVD b21wYXJlOkAiaHR0cHMiXSkpOworICAgICAgICBlbnRyeS0+X3ByaXZhdGUtPl9sYXN0VmlzaXRX YXNIVFRQTm9uR2V0ID0gW21ldGhvZCBjYXNlSW5zZW5zaXRpdmVDb21wYXJlOkAiR0VUIl0gJiYg KCFbW3VybCBzY2hlbWVdIGNhc2VJbnNlbnNpdGl2ZUNvbXBhcmU6QCJodHRwIl0gfHwgIVtbdXJs IHNjaGVtZV0gY2FzZUluc2Vuc2l0aXZlQ29tcGFyZTpAImh0dHBzIl0pOwogCiAgICAgaXRlbS0+ c2V0UmVkaXJlY3RVUkxzKG51bGxwdHIpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21h Yy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLmggYi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dl Ykhpc3RvcnlJdGVtLmgKaW5kZXggMmU2NWE3MWVjYTY2NTkwYzE1ZGIzNWU3NDgwMjdmNTgwNTRi YzlkYy4uYWE4ZDZkZDMxMzU4MWE4ZWM4YjFiMjZhODlkNTc4ZDIwMDFkMWQ4MCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJIaXN0b3J5SXRlbS5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0uaApAQCAtNTIsNyArNTIsNyBAQCBl eHRlcm4gTlNTdHJpbmcgKldlYkhpc3RvcnlJdGVtQ2hhbmdlZE5vdGlmaWNhdGlvbjsKICovCiBA aW50ZXJmYWNlIFdlYkhpc3RvcnlJdGVtIDogTlNPYmplY3QgPE5TQ29weWluZz4KIHsKLUBwcml2 YXRlCitAcGFja2FnZQogICAgIFdlYkhpc3RvcnlJdGVtUHJpdmF0ZSAqX3ByaXZhdGU7CiB9CiAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW0ubW0g Yi9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0b3J5L1dlYkhpc3RvcnlJdGVtLm1tCmluZGV4IDA3NGU4 OGRmZDM4MDkzYmRmYWI1NTk1MDMzYmEwYTlkMjNjZDI5ZjQuLjU0MmQwMDk3NGMyYTg2Y2QyZDNh MjMzMGExMjFkOTFjNmViMDZhNmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rv cnkvV2ViSGlzdG9yeUl0ZW0ubW0KKysrIGIvU291cmNlL1dlYktpdC9tYWMvSGlzdG9yeS9XZWJI aXN0b3J5SXRlbS5tbQpAQCAtOTQsMTIgKzk0LDYgQEAgTlNTdHJpbmcgKldlYkhpc3RvcnlJdGVt Q2hhbmdlZE5vdGlmaWNhdGlvbiA9IEAiV2ViSGlzdG9yeUl0ZW1DaGFuZ2VkTm90aWZpY2F0aW8K IAogdXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKLUBpbnRlcmZhY2UgV2ViSGlzdG9yeUl0ZW1Q cml2YXRlIDogTlNPYmplY3QgewotQHBhY2thZ2UKLSAgICBSZWZQdHI8SGlzdG9yeUl0ZW0+IF9o aXN0b3J5SXRlbTsKLX0KLUBlbmQKLQogQGltcGxlbWVudGF0aW9uIFdlYkhpc3RvcnlJdGVtUHJp dmF0ZQogCiBAZW5kCkBAIC0xNzcsNiArMTcxLDkgQEAgdm9pZCBXS05vdGlmeUhpc3RvcnlJdGVt Q2hhbmdlZChIaXN0b3J5SXRlbSopCiB7CiAgICAgV2ViQ29yZVRocmVhZFZpb2xhdGlvbkNoZWNr Um91bmRPbmUoKTsKICAgICBXZWJIaXN0b3J5SXRlbSAqY29weSA9IFtbW3NlbGYgY2xhc3NdIGFs bG9jXSBpbml0V2l0aFdlYkNvcmVIaXN0b3J5SXRlbTpjb3JlKF9wcml2YXRlKS0+Y29weSgpXTsK KworICAgIGNvcHktPl9wcml2YXRlLT5fbGFzdFZpc2l0V2FzSFRUUE5vbkdldCA9IF9wcml2YXRl LT5fbGFzdFZpc2l0V2FzSFRUUE5vbkdldDsKKwogICAgIGhpc3RvcnlJdGVtV3JhcHBlcnMoKS5z ZXQoY29yZShjb3B5LT5fcHJpdmF0ZSksIGNvcHkpOwogCiAgICAgcmV0dXJuIGNvcHk7CkBAIC0z OTUsNyArMzkyLDcgQEAgV2ViSGlzdG9yeUl0ZW0gKmtpdChIaXN0b3J5SXRlbSogaXRlbSkKICAg ICBCT09MIGxhc3RWaXNpdFdhc0hUVFBOb25HZXQgPSBbZGljdCBfd2Via2l0X2Jvb2xGb3JLZXk6 bGFzdFZpc2l0V2FzSFRUUE5vbkdldEtleV07CiAgICAgTlNTdHJpbmcgKnRlbXBVUkxTdHJpbmcg PSBbVVJMU3RyaW5nIGxvd2VyY2FzZVN0cmluZ107CiAgICAgaWYgKGxhc3RWaXNpdFdhc0hUVFBO b25HZXQgJiYgKFt0ZW1wVVJMU3RyaW5nIGhhc1ByZWZpeDpAImh0dHA6Il0gfHwgW3RlbXBVUkxT dHJpbmcgaGFzUHJlZml4OkAiaHR0cHM6Il0pKQotICAgICAgICBjb3JlKF9wcml2YXRlKS0+c2V0 TGFzdFZpc2l0V2FzSFRUUE5vbkdldChsYXN0VmlzaXRXYXNIVFRQTm9uR2V0KTsKKyAgICAgICAg X3ByaXZhdGUtPl9sYXN0VmlzaXRXYXNIVFRQTm9uR2V0ID0gbGFzdFZpc2l0V2FzSFRUUE5vbkdl dDsKIAogICAgIGlmIChOU0FycmF5ICpyZWRpcmVjdFVSTHMgPSBbZGljdCBfd2Via2l0X2FycmF5 Rm9yS2V5OnJlZGlyZWN0VVJMc0tleV0pIHsKICAgICAgICAgTlNVSW50ZWdlciBzaXplID0gW3Jl ZGlyZWN0VVJMcyBjb3VudF07CkBAIC02NzksNyArNjc2LDcgQEAgV2ViSGlzdG9yeUl0ZW0gKmtp dChIaXN0b3J5SXRlbSogaXRlbSkKIAogLSAoQk9PTClfbGFzdFZpc2l0V2FzSFRUUE5vbkdldAog ewotICAgIHJldHVybiBjb3JlKF9wcml2YXRlKS0+bGFzdFZpc2l0V2FzSFRUUE5vbkdldCgpOwor ICAgIHJldHVybiBfcHJpdmF0ZS0+X2xhc3RWaXNpdFdhc0hUVFBOb25HZXQ7CiB9CiAKIC0gKE5T QXJyYXkgKilfcmVkaXJlY3RVUkxzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L21hYy9IaXN0 b3J5L1dlYkhpc3RvcnlJdGVtSW50ZXJuYWwuaCBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3Rvcnkv V2ViSGlzdG9yeUl0ZW1JbnRlcm5hbC5oCmluZGV4IGY1YTRmZDcwZmZlMTJlM2VkNjkzMjc1M2Vh YWIwYzI4MDNjZWE5ZWQuLjg4MGNiN2NlNjNmZTZlZWM4Yjc3YzVlMTI0YWU0MjcxMTY5MTc4YTgg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW1JbnRl cm5hbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvbWFjL0hpc3RvcnkvV2ViSGlzdG9yeUl0ZW1JbnRl cm5hbC5oCkBAIC0yOCw3ICsyOCw3IEBACiAKICNpbXBvcnQgIldlYkJhY2tGb3J3YXJkTGlzdC5o IgogI2ltcG9ydCAiV2ViSGlzdG9yeUl0ZW1Qcml2YXRlLmgiCi0jaW1wb3J0IDx3dGYvRm9yd2Fy ZC5oPgorI2ltcG9ydCA8d3RmL1JlZlB0ci5oPgogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAgICAg Y2xhc3MgSGlzdG9yeUl0ZW07CkBAIC01OCwzICs1OCwxMSBAQCBleHRlcm4gdm9pZCBXS05vdGlm eUhpc3RvcnlJdGVtQ2hhbmdlZChXZWJDb3JlOjpIaXN0b3J5SXRlbSopOwogQGludGVyZmFjZSBX ZWJCYWNrRm9yd2FyZExpc3QgKFdlYkludGVybmFsKQogLSAodm9pZClfY2xvc2U7CiBAZW5kCisK K0BpbnRlcmZhY2UgV2ViSGlzdG9yeUl0ZW1Qcml2YXRlIDogTlNPYmplY3QgeworQHBhY2thZ2UK KyAgICBSZWZQdHI8V2ViQ29yZTo6SGlzdG9yeUl0ZW0+IF9oaXN0b3J5SXRlbTsKKworICAgIGJv b2wgX2xhc3RWaXNpdFdhc0hUVFBOb25HZXQ7Cit9CitAZW5kCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L3dpbi9XZWJIaXN0b3J5LmNwcCBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3Rvcnku Y3BwCmluZGV4IGJiZGRmYTkzNWFlNjkxY2Q1NmIyOTJjMDZmOTk0YmY3NzdhNjU4ZjIuLjg0ZmRj MTdmMDNjOWQwMjY3NTljMzVlZWVhM2I0NzM1OTI0OTY0OTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvd2luL1dlYkhpc3RvcnkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3Rv cnkuY3BwCkBAIC01ODUsOCArNTg1LDYgQEAgdm9pZCBXZWJIaXN0b3J5Ojp2aXNpdGVkVVJMKGNv bnN0IFVSTCYgdXJsLCBjb25zdCBTdHJpbmcmIHRpdGxlLCBjb25zdCBTdHJpbmcmIGgKICAgICAg ICAgcmV0dXJuOwogCiAgICAgZW50cnlQcml2YXRlLT5zZXRMYXN0VmlzaXRXYXNGYWlsdXJlKHdh c0ZhaWx1cmUpOwotICAgIGlmICghaHR0cE1ldGhvZC5pc0VtcHR5KCkpCi0gICAgICAgIGVudHJ5 UHJpdmF0ZS0+c2V0TGFzdFZpc2l0V2FzSFRUUE5vbkdldCghZXF1YWxJZ25vcmluZ0Nhc2UoaHR0 cE1ldGhvZCwgIkdFVCIpICYmIHVybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkpOwogCiAgICAg Q09NUHRyPFdlYkhpc3RvcnlJdGVtPiBpdGVtKFF1ZXJ5LCBlbnRyeSk7CiAgICAgaXRlbS0+aGlz dG9yeUl0ZW0oKS0+c2V0UmVkaXJlY3RVUkxzKG51bGxwdHIpOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC93aW4vV2ViSGlzdG9yeUl0ZW0uY3BwIGIvU291cmNlL1dlYktpdC93aW4vV2ViSGlz dG9yeUl0ZW0uY3BwCmluZGV4IDdmMTE1MDZkMTY2Y2Y2ZDA1Njc5NzU1M2Y3NmYzNjk2ZTEwNTU5 ODMuLjQ0Yzk4M2VmOGM0MmE1NmIxMjY5ZTE5NWY0MjkwNDE5ZTg1MDE4YmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvd2luL1dlYkhpc3RvcnlJdGVtLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L3dpbi9XZWJIaXN0b3J5SXRlbS5jcHAKQEAgLTE4Nyw5ICsxODcsNiBAQCBIUkVTVUxUIFNURE1F VEhPRENBTExUWVBFIFdlYkhpc3RvcnlJdGVtOjppbml0RnJvbURpY3Rpb25hcnlSZXByZXNlbnRh dGlvbih2b2lkKgogICAgIGlmIChsYXN0VmlzaXRXYXNGYWlsdXJlKQogICAgICAgICBtX2hpc3Rv cnlJdGVtLT5zZXRMYXN0VmlzaXRXYXNGYWlsdXJlKHRydWUpOwogCi0gICAgaWYgKGxhc3RWaXNp dFdhc0hUVFBOb25HZXQgJiYgKHByb3RvY29sSXMobV9oaXN0b3J5SXRlbS0+dXJsU3RyaW5nKCks ICJodHRwIikgfHwgcHJvdG9jb2xJcyhtX2hpc3RvcnlJdGVtLT51cmxTdHJpbmcoKSwgImh0dHBz IikpKQotICAgICAgICBtX2hpc3RvcnlJdGVtLT5zZXRMYXN0VmlzaXRXYXNIVFRQTm9uR2V0KHRy dWUpOwotCiAgICAgaWYgKHJlZGlyZWN0VVJMc1ZlY3Rvci5nZXQoKSkKICAgICAgICAgbV9oaXN0 b3J5SXRlbS0+c2V0UmVkaXJlY3RVUkxzKHN0ZDo6bW92ZShyZWRpcmVjdFVSTHNWZWN0b3IpKTsK IApAQCAtNDQ1LDIyICs0NDIsMTYgQEAgSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0 b3J5SXRlbTo6c2V0TGFzdFZpc2l0V2FzRmFpbHVyZShCT09MIHdhc0ZhaWx1cmUKICAgICByZXR1 cm4gU19PSzsKIH0KIAorLy8gRklYTUU6IFRoaXMgZnVuY3Rpb24gc2hvdWxkIGJlIHJlbW92ZWQg ZnJvbSB0aGUgSVdlYkhpc3RvcnlJdGVtIGludGVyZmFjZS4KIEhSRVNVTFQgU1RETUVUSE9EQ0FM TFRZUEUgV2ViSGlzdG9yeUl0ZW06Omxhc3RWaXNpdFdhc0hUVFBOb25HZXQoQk9PTCogSFRUUE5v bkdldCkKIHsKLSAgICBpZiAoIUhUVFBOb25HZXQpIHsKLSAgICAgICAgQVNTRVJUX05PVF9SRUFD SEVEKCk7Ci0gICAgICAgIHJldHVybiBFX1BPSU5URVI7Ci0gICAgfQotCi0gICAgKkhUVFBOb25H ZXQgPSBtX2hpc3RvcnlJdGVtLT5sYXN0VmlzaXRXYXNIVFRQTm9uR2V0KCk7Ci0KLSAgICByZXR1 cm4gU19PSzsKKyAgICByZXR1cm4gRV9OT1RJTVBMOwogfQogCisvLyBGSVhNRTogVGhpcyBmdW5j dGlvbiBzaG91bGQgYmUgcmVtb3ZlZCBmcm9tIHRoZSBJV2ViSGlzdG9yeUl0ZW0gaW50ZXJmYWNl LgogSFJFU1VMVCBTVERNRVRIT0RDQUxMVFlQRSBXZWJIaXN0b3J5SXRlbTo6c2V0TGFzdFZpc2l0 V2FzSFRUUE5vbkdldChCT09MIEhUVFBOb25HZXQpCiB7Ci0gICAgbV9oaXN0b3J5SXRlbS0+c2V0 TGFzdFZpc2l0V2FzSFRUUE5vbkdldChIVFRQTm9uR2V0KTsKLSAgICByZXR1cm4gU19PSzsKKyAg ICByZXR1cm4gRV9OT1RJTVBMOwogfQogCiBIUkVTVUxUIFNURE1FVEhPRENBTExUWVBFIFdlYkhp c3RvcnlJdGVtOjpyZWRpcmVjdFVSTHMoSUVudW1WQVJJQU5UKiogdXJscykK