180924 2017-12-17 20:42:01 -0800 [Attachment Support] The 'webkitattachmentbloburl' attribute should not persist after markup serialization 2017-12-19 08:41:00 -0800 1 1 1 Unclassified WebKit HTML Editing WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 180892 1 wenson_hsieh wenson_hsieh commit-queue mitz ryanhaddad thorton webkit-bug-importer wenson_hsieh oldest_to_newest 1382695 0 wenson_hsieh 2017-12-17 20:42:01 -0800 This is a temporary attribute, similar to 'webkitattachmentpath', used to correctly serialize attachment elements. As such, there's no need for it to persist on the attachment. This could lead to strange behavior, for instance, when performing a continuity copy/paste. 1382696 1 webkit-bug-importer 2017-12-17 20:43:01 -0800 <rdar://problem/36099093> 1382697 2 329632 wenson_hsieh 2017-12-17 20:57:20 -0800 Created attachment 329632 Dependent on https://bugs.webkit.org/show_bug.cgi?id=180892 1383047 3 329733 wenson_hsieh 2017-12-18 20:33:05 -0800 Created attachment 329733 Rebase on master 1383066 4 329733 commit-queue 2017-12-18 21:38:51 -0800 Comment on attachment 329733 Rebase on master Clearing flags on attachment: 329733 Committed r226097: <https://trac.webkit.org/changeset/226097> 1383141 5 ryanhaddad 2017-12-19 08:41:00 -0800 This change broke the Windows build: https://build.webkit.org/builders/Apple%20Win%20Release%20%28Build%29/builds/6682 329632 2017-12-17 20:57:20 -0800 2017-12-18 13:19:34 -0800 Dependent on https://bugs.webkit.org/show_bug.cgi?id=180892 bug-180924-20171217205720.patch text/plain 10904 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1OTU3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNmRjZTU4NDExZjI1Mzk4 YzUyZjUyOWIwMDgyZTViYjliYThjOGMyNi4uMDJiMTk1NDNjMTI3MTExNDExNmJjNTM2YTA1MjUw N2FkMDVjZjgxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTEyLTE3ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtBdHRhY2htZW50 IHN1cHBvcnRdIFRoZSAnd2Via2l0YXR0YWNobWVudGJsb2J1cmwnIGF0dHJpYnV0ZSBzaG91bGQg bm90IHBlcnNpc3QgYWZ0ZXIgbWFya3VwIHNlcmlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDkyNAorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzYwOTkwOTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgV29yayB0b3dhcmRzIGRyYWdnaW5nIEJsb2ItYmFja2VkIGF0dGFjaG1lbnQgZWxl bWVudHMgYXMgZmlsZXMgb24gaU9TIGFuZCBNYWMuIEl0IGRvZXNuJ3QgbWFrZSBzZW5zZSBmb3Ig dGhlCisgICAgICAgIGF0dGFjaG1lbnQgYmxvYiBVUkwgdG8gc3RpY2sgYXJvdW5kIG9uIHRoZSBl bGVtZW50IGFmdGVyIG1hcmt1cCBzZXJpYWxpemF0aW9uLCBzbyB0aGlzIHBhdGNoIHJlbW92ZXMg bG9naWMgdGhhdAorICAgICAgICBlYWdlcmx5IHNldHMgdGhlIGJsb2IgVVJMIHVwb24gc2V0dGlu ZyBhbiBhdHRhY2htZW50J3MgRmlsZS4gSW5zdGVhZCwgd2UganVzdCBhcHBlbmQgdGhpcyBhdHRy aWJ1dGUgd2hlbgorICAgICAgICBnZW5lcmF0aW5nIG1hcmt1cC4KKworICAgICAgICBUaGlzIHBh dGNoIGFsc28gYXVnbWVudHMgZXhpc3RpbmcgV0tBdHRhY2htZW50VGVzdHMgdG8gZW5zdXJlIHRo YXQgdGhlc2UgYXR0cmlidXRlcyBhcmUgbm90IHByZXNlbnQuCisKKyAgICAgICAgKiBlZGl0aW5n L21hcmt1cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTdHlsZWRNYXJrdXBBY2N1bXVsYXRvcjo6 YXBwZW5kQ3VzdG9tQXR0cmlidXRlcyk6CisgICAgICAgIChXZWJDb3JlOjpjcmVhdGVGcmFnbWVu dEZyb21NYXJrdXApOgorICAgICAgICAqIGh0bWwvSFRNTEF0dGFjaG1lbnRFbGVtZW50LmNwcDoK KyAgICAgICAgKFdlYkNvcmU6OkhUTUxBdHRhY2htZW50RWxlbWVudDo6c2V0RmlsZSk6CisgICAg ICAgICogcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwOgorCisgICAgICAgIEZpeGVzIGEgcmVs YXRlZCBpc3N1ZSB3aGVyZSBhbiBhdHRhY2htZW50IGlzIGJhY2tlZCBieSBCbG9iIGRhdGEgKGFu ZCBub3QgYSBmaWxlIHBhdGgpIHdvdWxkIHNwZWNpZnkgImZpbGU6Ly8vIgorICAgICAgICBhcyBp dHMgYXR0YWNobWVudCBmaWxlIHBhdGggaW4gRHJhZ0NvbnRyb2xsZXIgd2hlbiBzdGFydGluZyBh IGRyYWcuIEluc3RlYWQsIGlmIHRoZXJlIGlzIG5vIGZpbGUgcGF0aCwgZmFsbCBiYWNrCisgICAg ICAgIHRvIHRoZSBibG9iIFVSTC4KKworICAgICAgICBUaGlzIHdpbGwgYmUgdGVzdGVkIGluIGEg ZnV0dXJlIHBhdGNoIG9uY2UgYSBXSzIgZHJhZ2dpbmcgc2ltdWxhdG9yIGZvciBNYWMgaXMgaW1w bGVtZW50ZWQsIGFuZCBzdXBwb3J0IGZvcgorICAgICAgICBkcmFnZ2luZyBvdXQgQmxvYi1iYWNr ZWQgYXR0YWNobWVudHMgYXMgKHBsYXRmb3JtKSBmaWxlcyBpcyBpbXBsZW1lbnRlZC4KKworICAg ICAgICAoV2ViQ29yZTo6SGl0VGVzdFJlc3VsdDo6YWJzb2x1dGVBdHRhY2htZW50VVJMIGNvbnN0 KToKKwogMjAxNy0xMi0xNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4K IAogICAgICAgICBbQXR0YWNobWVudCBTdXBwb3J0XSBTdXBwb3J0IHJlcHJlc2VudGluZyBwYXN0 ZWQgb3IgZHJvcHBlZCBjb250ZW50IHVzaW5nIGF0dGFjaG1lbnQgZWxlbWVudHMKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcvbWFya3VwLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2Vk aXRpbmcvbWFya3VwLmNwcAppbmRleCAzY2Y0MGVkNzhjNWE4ODI2M2M2NTViNzQwMjY1MmQ0N2Y4 MjI3ZTFmLi4xZDczMWRhMjBlZGQ0NWU2NTQwZDdkMWY4YWFkOWZkNDA1ZGRhMTU0IDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAKKysrIGIvU291cmNlL1dlYkNv cmUvZWRpdGluZy9tYXJrdXAuY3BwCkBAIC0zNzEsMTUgKzM3MSwxOSBAQCBTdHJpbmcgU3R5bGVk TWFya3VwQWNjdW11bGF0b3I6OnN0cmluZ1ZhbHVlRm9yUmFuZ2UoY29uc3QgTm9kZSYgbm9kZSwg Y29uc3QgUmFuZwogICAgIHJldHVybiBub2RlVmFsdWU7CiB9CiAKLXZvaWQgU3R5bGVkTWFya3Vw QWNjdW11bGF0b3I6OmFwcGVuZEN1c3RvbUF0dHJpYnV0ZXMoU3RyaW5nQnVpbGRlciYgb3V0LCBj b25zdCBFbGVtZW50JmVsZW1lbnQsIE5hbWVzcGFjZXMqIG5hbWVzcGFjZXMpCit2b2lkIFN0eWxl ZE1hcmt1cEFjY3VtdWxhdG9yOjphcHBlbmRDdXN0b21BdHRyaWJ1dGVzKFN0cmluZ0J1aWxkZXIm IG91dCwgY29uc3QgRWxlbWVudCYgZWxlbWVudCwgTmFtZXNwYWNlcyogbmFtZXNwYWNlcykKIHsK ICNpZiBFTkFCTEUoQVRUQUNITUVOVF9FTEVNRU5UKQogICAgIGlmICghaXM8SFRNTEF0dGFjaG1l bnRFbGVtZW50PihlbGVtZW50KSkKICAgICAgICAgcmV0dXJuOwogICAgIAogICAgIGNvbnN0IEhU TUxBdHRhY2htZW50RWxlbWVudCYgYXR0YWNobWVudCA9IGRvd25jYXN0PEhUTUxBdHRhY2htZW50 RWxlbWVudD4oZWxlbWVudCk7Ci0gICAgaWYgKGF0dGFjaG1lbnQuZmlsZSgpKQotICAgICAgICBh cHBlbmRBdHRyaWJ1dGUob3V0LCBlbGVtZW50LCBBdHRyaWJ1dGUod2Via2l0YXR0YWNobWVudHBh dGhBdHRyLCBhdHRhY2htZW50LmZpbGUoKS0+cGF0aCgpKSwgbmFtZXNwYWNlcyk7CisgICAgaWYg KGF1dG8qIGZpbGUgPSBhdHRhY2htZW50LmZpbGUoKSkgeworICAgICAgICAvLyBUaGVzZSBhdHRy aWJ1dGVzIGFyZSBvbmx5IGludGVuZGVkIGZvciBGaWxlIGRlc2VyaWFsaXphdGlvbiwgYW5kIGFy ZSByZW1vdmVkIGZyb20gdGhlIGdlbmVyYXRlZCBhdHRhY2htZW50CisgICAgICAgIC8vIGVsZW1l bnQgYWZ0ZXIgd2UndmUgZGVzZXJpYWxpemVkIGFuZCBzZXQgaXRzIGJhY2tpbmcgRmlsZS4KKyAg ICAgICAgYXBwZW5kQXR0cmlidXRlKG91dCwgZWxlbWVudCwgeyB3ZWJraXRhdHRhY2htZW50cGF0 aEF0dHIsIGZpbGUtPnBhdGgoKSB9LCBuYW1lc3BhY2VzKTsKKyAgICAgICAgYXBwZW5kQXR0cmli dXRlKG91dCwgZWxlbWVudCwgeyB3ZWJraXRhdHRhY2htZW50YmxvYnVybEF0dHIsIHsgZmlsZS0+ dXJsKCkgfX0sIG5hbWVzcGFjZXMpOworICAgIH0KICNlbHNlCiAgICAgVU5VU0VEX1BBUkFNKG91 dCk7CiAgICAgVU5VU0VEX1BBUkFNKGVsZW1lbnQpOwpAQCAtNzY0LDExICs3NjgsMTMgQEAgUmVm PERvY3VtZW50RnJhZ21lbnQ+IGNyZWF0ZUZyYWdtZW50RnJvbU1hcmt1cChEb2N1bWVudCYgZG9j dW1lbnQsIGNvbnN0IFN0cmluZyYKIAogICAgIGZvciAoYXV0byYgYXR0YWNobWVudCA6IGF0dGFj aG1lbnRzKSB7CiAgICAgICAgIGF1dG8gYXR0YWNobWVudFBhdGggPSBhdHRhY2htZW50LT5hdHRh Y2htZW50UGF0aCgpOwotICAgICAgICBpZiAoYXR0YWNobWVudFBhdGguaXNFbXB0eSgpKQotICAg ICAgICAgICAgYXR0YWNobWVudC0+c2V0RmlsZShGaWxlOjpkZXNlcmlhbGl6ZSh7IH0sIGF0dGFj aG1lbnQtPmJsb2JVUkwoKSwgYXR0YWNobWVudC0+YXR0YWNobWVudFR5cGUoKSwgYXR0YWNobWVu dC0+YXR0YWNobWVudFRpdGxlKCkpKTsKLSAgICAgICAgZWxzZQorICAgICAgICBhdXRvIGJsb2JV UkwgPSBhdHRhY2htZW50LT5ibG9iVVJMKCk7CisgICAgICAgIGlmICghYXR0YWNobWVudFBhdGgu aXNFbXB0eSgpKQogICAgICAgICAgICAgYXR0YWNobWVudC0+c2V0RmlsZShGaWxlOjpjcmVhdGUo YXR0YWNobWVudFBhdGgpKTsKKyAgICAgICAgZWxzZSBpZiAoIWJsb2JVUkwuaXNFbXB0eSgpKQor ICAgICAgICAgICAgYXR0YWNobWVudC0+c2V0RmlsZShGaWxlOjpkZXNlcmlhbGl6ZSh7IH0sIGJs b2JVUkwsIGF0dGFjaG1lbnQtPmF0dGFjaG1lbnRUeXBlKCksIGF0dGFjaG1lbnQtPmF0dGFjaG1l bnRUaXRsZSgpKSk7CiAgICAgICAgIGF0dGFjaG1lbnQtPnJlbW92ZUF0dHJpYnV0ZSh3ZWJraXRh dHRhY2htZW50cGF0aEF0dHIpOworICAgICAgICBhdHRhY2htZW50LT5yZW1vdmVBdHRyaWJ1dGUo d2Via2l0YXR0YWNobWVudGJsb2J1cmxBdHRyKTsKICAgICB9CiAjZW5kaWYKICAgICBpZiAoIWJh c2VVUkwuaXNFbXB0eSgpICYmIGJhc2VVUkwgIT0gYmxhbmtVUkwoKSAmJiBiYXNlVVJMICE9IGRv Y3VtZW50LmJhc2VVUkwoKSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0 dGFjaG1lbnRFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEF0dGFjaG1lbnRF bGVtZW50LmNwcAppbmRleCAyNWY1MTk0M2QyYzcxMTk0YjRjZjcyN2RmY2I2ZWE3YTUzNWFlY2Uy Li4wOTY4NmJmZTEzMWZiZmQ3NGY0N2I3YWIyOWQ0MWZkZDg0ZmFhNDU4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxlbWVudC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvaHRtbC9IVE1MQXR0YWNobWVudEVsZW1lbnQuY3BwCkBAIC0xMjAsOCArMTIwLDYg QEAgdm9pZCBIVE1MQXR0YWNobWVudEVsZW1lbnQ6OnNldEZpbGUoUmVmUHRyPEZpbGU+JiYgZmls ZSwgVXBkYXRlRGlzcGxheUF0dHJpYnV0ZXMKIHsKICAgICBtX2ZpbGUgPSBXVEZNb3ZlKGZpbGUp OwogCi0gICAgc2V0QXR0cmlidXRlV2l0aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6Ondl YmtpdGF0dGFjaG1lbnRibG9idXJsQXR0ciwgbV9maWxlID8gbV9maWxlLT51cmwoKSA6IGVtcHR5 U3RyaW5nKCkpOwotCiAgICAgaWYgKHVwZGF0ZUF0dHJpYnV0ZXMgPT0gVXBkYXRlRGlzcGxheUF0 dHJpYnV0ZXM6OlllcykgewogICAgICAgICBpZiAobV9maWxlKSB7CiAgICAgICAgICAgICBzZXRB dHRyaWJ1dGVXaXRob3V0U3luY2hyb25pemF0aW9uKEhUTUxOYW1lczo6dGl0bGVBdHRyLCBtX2Zp bGUtPm5hbWUoKSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVz dFJlc3VsdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHAK aW5kZXggYTgxZWMzYzZmNWRmMjBlNzU3NzVkMDg2NTA0Zjg3YjQ2OWIyNWYzMS4uNDI0NWEzY2Uw MjZjMDBmMWM1M2FhNjFkOTM2MDQzOTk3NzkwMjZmZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRl cmluZy9IaXRUZXN0UmVzdWx0LmNwcApAQCAtMzU2LDcgKzM1NiwxMiBAQCBVUkwgSGl0VGVzdFJl c3VsdDo6YWJzb2x1dGVBdHRhY2htZW50VVJMKCkgY29uc3QKICAgICBpZiAoIWF0dGFjaG1lbnRG aWxlKQogICAgICAgICByZXR1cm4gVVJMKCk7CiAgICAgCi0gICAgcmV0dXJuIFVSTDo6ZmlsZVVS TFdpdGhGaWxlU3lzdGVtUGF0aChhdHRhY2htZW50RmlsZS0+cGF0aCgpKTsKKyAgICBhdXRvIGZp bGVwYXRoID0gYXR0YWNobWVudEZpbGUtPnBhdGgoKTsKKyAgICBpZiAoIWZpbGVwYXRoLmlzRW1w dHkoKSkKKyAgICAgICAgcmV0dXJuIFVSTDo6ZmlsZVVSTFdpdGhGaWxlU3lzdGVtUGF0aChmaWxl cGF0aCk7CisKKyAgICBBU1NFUlQoYXR0YWNobWVudEZpbGUtPnVybCgpLnByb3RvY29sSXNCbG9i KCkpOworICAgIHJldHVybiBhdHRhY2htZW50RmlsZS0+dXJsKCk7CiB9CiAjZW5kaWYKIApkaWZm IC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDFhZjE3ZTMy NzQwZTk4NGU3NTVlNjMzYWZjN2E1MmE4YWVhYWE5ZDEuLmYzZDhjZmE1MjMxNTBjN2QzZWNmY2I2 NDBmMDFmZWJmNWI5ZjI5YjcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29s cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOCBAQAorMjAxNy0xMi0xNyAgV2Vuc29uIEhzaWVoICA8 d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KKworICAgICAgICBbQXR0YWNobWVudCBzdXBwb3J0XSBU aGUgJ3dlYmtpdGF0dGFjaG1lbnRibG9idXJsJyBhdHRyaWJ1dGUgc2hvdWxkIG5vdCBwZXJzaXN0 IGFmdGVyIG1hcmt1cCBzZXJpYWxpemF0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xODA5MjQKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2MDk5 MDkzPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFR3 ZWFrcyBzb21lIGV4aXN0aW5nIHRlc3RzIHRvIGNoZWNrIHRoYXQgdGVtcG9yYXJ5IGF0dGFjaG1l bnQgc2VyaWFsaXphdGlvbiBhdHRyaWJ1dGVzIGRvbid0IHN0aWNrIGFyb3VuZCBvbiB0aGUKKyAg ICAgICAgYXR0YWNobWVudCBlbGVtZW50cy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW06CisgICAgICAgICgtW1Rlc3RXS1dl YlZpZXcgaGFzQXR0cmlidXRlOmZvclF1ZXJ5U2VsZWN0b3I6XSk6CisgICAgICAgIChUZXN0V2Vi S2l0QVBJOjpURVNUKToKKwogMjAxNy0xMi0xNSAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVo QGFwcGxlLmNvbT4KIAogICAgICAgICBbQXR0YWNobWVudCBTdXBwb3J0XSBTdXBwb3J0IHJlcHJl c2VudGluZyBwYXN0ZWQgb3IgZHJvcHBlZCBjb250ZW50IHVzaW5nIGF0dGFjaG1lbnQgZWxlbWVu dHMKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tB dHRhY2htZW50VGVzdHMubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29h L1dLQXR0YWNobWVudFRlc3RzLm1tCmluZGV4IDE1ZDMxZmFhNjE0MzRjMDE3OTcxNmY1NmQxMGUz MzZmMjkwOGUxMzQuLmU1Mzc1MTY1ODM3MjM2NjllMmUyY2MwYTEzZmU0MDVlYzJlYjZiNTMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2ht ZW50VGVzdHMubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9X S0F0dGFjaG1lbnRUZXN0cy5tbQpAQCAtMjI0LDYgKzIyNCwxMSBAQCAtICh2b2lkKXdhaXRGb3JB dHRhY2htZW50RWxlbWVudFNpemVUb0JlY29tZTooQ0dTaXplKWV4cGVjdGVkU2l6ZQogICAgIH0K IH0KIAorLSAoQk9PTCloYXNBdHRyaWJ1dGU6KE5TU3RyaW5nICopYXR0cmlidXRlTmFtZSBmb3JR dWVyeVNlbGVjdG9yOihOU1N0cmluZyAqKXF1ZXJ5U2VsZWN0b3IKK3sKKyAgICByZXR1cm4gW3Nl bGYgc3RyaW5nQnlFdmFsdWF0aW5nSmF2YVNjcmlwdDpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1h dDpAImRvY3VtZW50LnF1ZXJ5U2VsZWN0b3IoJyVAJykuaGFzQXR0cmlidXRlKCclQCcpIiwgcXVl cnlTZWxlY3RvciwgYXR0cmlidXRlTmFtZV1dLmJvb2xWYWx1ZTsKK30KKwogLSAoTlNTdHJpbmcg Kil2YWx1ZU9mQXR0cmlidXRlOihOU1N0cmluZyAqKWF0dHJpYnV0ZU5hbWUgZm9yUXVlcnlTZWxl Y3RvcjooTlNTdHJpbmcgKilxdWVyeVNlbGVjdG9yCiB7CiAgICAgcmV0dXJuIFtzZWxmIHN0cmlu Z0J5RXZhbHVhdGluZ0phdmFTY3JpcHQ6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkb2N1 bWVudC5xdWVyeVNlbGVjdG9yKCclQCcpLmdldEF0dHJpYnV0ZSgnJUAnKSIsIHF1ZXJ5U2VsZWN0 b3IsIGF0dHJpYnV0ZU5hbWVdXTsKQEAgLTQyNSw2ICs0MzAsOCBAQCBURVNUKFdLQXR0YWNobWVu dFRlc3RzLCBBdHRhY2htZW50RWxlbWVudEluc2VydGlvbikKIAogICAgIFtmaXJzdEF0dGFjaG1l bnQgZXhwZWN0UmVxdWVzdGVkRGF0YVRvQmU6bmlsXTsKICAgICBbc2Vjb25kQXR0YWNobWVudCBl eHBlY3RSZXF1ZXN0ZWREYXRhVG9CZTp0ZXN0SW1hZ2VEYXRhKCldOworICAgIEVYUEVDVF9GQUxT RShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9yUXVl cnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhh c0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0 YWNobWVudCJdKTsKIH0KIAogVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0 ZXNXaGVuSW5zZXJ0aW5nQW5kRGVsZXRpbmdOZXdsaW5lKQpAQCAtNDkwLDYgKzQ5Nyw4IEBAIFRF U1QoV0tBdHRhY2htZW50VGVzdHMsIEF0dGFjaG1lbnRVcGRhdGVzV2hlbkNoYW5naW5nRm9udFN0 eWxlcykKICAgICBbd2ViVmlldyBleHBlY3RVcGRhdGVzQWZ0ZXJDb21tYW5kOkAiVG9nZ2xlSXRh bGljIiB3aXRoQXJndW1lbnQ6bmlsIGV4cGVjdGVkUmVtb3ZhbHM6QFtdIGV4cGVjdGVkSW5zZXJ0 aW9uczpAW11dOwogICAgIFt3ZWJWaWV3IGV4cGVjdFVwZGF0ZXNBZnRlckNvbW1hbmQ6QCJUb2dn bGVVbmRlcmxpbmUiIHdpdGhBcmd1bWVudDpuaWwgZXhwZWN0ZWRSZW1vdmFsczpAW10gZXhwZWN0 ZWRJbnNlcnRpb25zOkBbXV07CiAgICAgW2F0dGFjaG1lbnQgZXhwZWN0UmVxdWVzdGVkRGF0YVRv QmU6dGVzdEhUTUxEYXRhKCldOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1 dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0dGFjaG1l bnQiXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0 dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKIAogICAgIC8v IEluc2VydGluZyB0ZXh0IHNob3VsZCBkZWxldGUgdGhlIGN1cnJlbnQgc2VsZWN0aW9uLCByZW1v dmluZyB0aGUgYXR0YWNobWVudCBpbiB0aGUgcHJvY2Vzcy4KICAgICBbd2ViVmlldyBleHBlY3RV cGRhdGVzQWZ0ZXJDb21tYW5kOkAiSW5zZXJ0VGV4dCIgd2l0aEFyZ3VtZW50OkAiZm9vIiBleHBl Y3RlZFJlbW92YWxzOkBbYXR0YWNobWVudC5nZXQoKV0gZXhwZWN0ZWRJbnNlcnRpb25zOkBbXV07 CkBAIC01MTEsNiArNTIwLDggQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVw ZGF0ZXNXaGVuSW5zZXJ0aW5nTGlzdHMpCiAgICAgW3dlYlZpZXcgZXhwZWN0VXBkYXRlc0FmdGVy Q29tbWFuZDpAIkluc2VydFVub3JkZXJlZExpc3QiIHdpdGhBcmd1bWVudDpuaWwgZXhwZWN0ZWRS ZW1vdmFsczpAW10gZXhwZWN0ZWRJbnNlcnRpb25zOkBbXV07CiAgICAgW3dlYlZpZXcgZXhwZWN0 VXBkYXRlc0FmdGVyQ29tbWFuZDpAIkluc2VydFVub3JkZXJlZExpc3QiIHdpdGhBcmd1bWVudDpu aWwgZXhwZWN0ZWRSZW1vdmFsczpAW10gZXhwZWN0ZWRJbnNlcnRpb25zOkBbXV07CiAgICAgW2F0 dGFjaG1lbnQgZXhwZWN0UmVxdWVzdGVkRGF0YVRvQmU6dGVzdEhUTUxEYXRhKCldOworICAgIEVY UEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVy bCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3 ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVj dG9yOkAiYXR0YWNobWVudCJdKTsKIH0KIAogVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNo bWVudFVwZGF0ZXNXaGVuSW5zZXJ0aW5nUmljaE1hcmt1cCkKQEAgLTUyMyw2ICs1MzQsOCBAQCBU RVNUKFdLQXR0YWNobWVudFRlc3RzLCBBdHRhY2htZW50VXBkYXRlc1doZW5JbnNlcnRpbmdSaWNo TWFya3VwKQogICAgICAgICBhdHRhY2htZW50ID0gb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5pbnNlcnRl ZFswXTsKICAgICAgICAgb2JzZXJ2ZXIuZXhwZWN0QXR0YWNobWVudFVwZGF0ZXMoQFsgXSwgQFth dHRhY2htZW50LmdldCgpXSk7CiAgICAgfQorICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNB dHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0 dGFjaG1lbnQiXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndl YmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAg ICB7CiAgICAgICAgIE9ic2VydmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdl YlZpZXcuZ2V0KCkpOwogICAgICAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2Ny aXB0OkAiZG9jdW1lbnQucXVlcnlTZWxlY3RvcignYXR0YWNobWVudCcpLnJlbW92ZSgpIl07CkBA IC01NTUsNiArNTY4LDggQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0 ZXNXaGVuQ3V0dGluZ0FuZFBhc3RpbmcpCiAgICAgICAgIG9ic2VydmVyLmV4cGVjdEF0dGFjaG1l bnRVcGRhdGVzKEBbXSwgQFthdHRhY2htZW50LmdldCgpXSk7CiAgICAgfQogICAgIFthdHRhY2ht ZW50IGV4cGVjdFJlcXVlc3RlZERhdGFUb0JlOnRlc3RIVE1MRGF0YSgpXTsKKyAgICBFWFBFQ1Rf RkFMU0UoW3dlYlZpZXcgaGFzQXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudGJsb2J1cmwiIGZv clF1ZXJ5U2VsZWN0b3I6QCJhdHRhY2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmll dyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50cGF0aCIgZm9yUXVlcnlTZWxlY3RvcjpA ImF0dGFjaG1lbnQiXSk7CiB9CiAKIFRFU1QoV0tBdHRhY2htZW50VGVzdHMsIEF0dGFjaG1lbnRE YXRhRm9yRW1wdHlGaWxlKQo= 329733 2017-12-18 20:33:05 -0800 2017-12-18 21:38:51 -0800 Rebase on master bug-180924-20171218203304.patch text/plain 10889 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI2MDk0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggOWI3NTcyZTFjYTM3MjFm MTYyMjNiODQ2ODQzODU2MWZhYTdiMjAzYy4uYzY5ZTQ0MDlmOTAwYTU0MTViZGVlMmNlNDBiNmRk MjA0Y2NjNjE0YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDM0IEBACisyMDE3LTEyLTE4ICBXZW5z b24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBwbGUuY29tPgorCisgICAgICAgIFtBdHRhY2htZW50 IFN1cHBvcnRdIFRoZSAnd2Via2l0YXR0YWNobWVudGJsb2J1cmwnIGF0dHJpYnV0ZSBzaG91bGQg bm90IHBlcnNpc3QgYWZ0ZXIgbWFya3VwIHNlcmlhbGl6YXRpb24KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDkyNAorICAgICAgICA8cmRhcjovL3By b2JsZW0vMzYwOTkwOTM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAg ICAgICBXb3JrIHRvd2FyZHMgZHJhZ2dpbmcgQmxvYi1iYWNrZWQgYXR0YWNobWVudCBlbGVtZW50 cyBhcyBmaWxlcyBvbiBpT1MgYW5kIE1hYy4gSXQgZG9lc24ndCBtYWtlIHNlbnNlIGZvciB0aGUK KyAgICAgICAgYXR0YWNobWVudCBibG9iIFVSTCB0byBzdGljayBhcm91bmQgb24gdGhlIGVsZW1l bnQgYWZ0ZXIgbWFya3VwIHNlcmlhbGl6YXRpb24sIHNvIHRoaXMgcGF0Y2ggcmVtb3ZlcyBsb2dp YyB0aGF0CisgICAgICAgIGVhZ2VybHkgc2V0cyB0aGUgYmxvYiBVUkwgdXBvbiBzZXR0aW5nIGFu IGF0dGFjaG1lbnQncyBGaWxlLiBJbnN0ZWFkLCB3ZSBqdXN0IGFwcGVuZCB0aGlzIGF0dHJpYnV0 ZSB3aGVuCisgICAgICAgIGdlbmVyYXRpbmcgbWFya3VwLgorCisgICAgICAgIFRoaXMgcGF0Y2gg YWxzbyBhdWdtZW50cyBleGlzdGluZyBXS0F0dGFjaG1lbnRUZXN0cyB0byBlbnN1cmUgdGhhdCB0 aGVzZSBhdHRyaWJ1dGVzIGFyZSBub3QgcHJlc2VudC4KKworICAgICAgICAqIGVkaXRpbmcvbWFy a3VwLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlN0eWxlZE1hcmt1cEFjY3VtdWxhdG9yOjphcHBl bmRDdXN0b21BdHRyaWJ1dGVzKToKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZUZyYWdtZW50RnJv bU1hcmt1cCk6CisgICAgICAgICogaHRtbC9IVE1MQXR0YWNobWVudEVsZW1lbnQuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6SFRNTEF0dGFjaG1lbnRFbGVtZW50OjpzZXRGaWxlKToKKyAgICAgICAg KiByZW5kZXJpbmcvSGl0VGVzdFJlc3VsdC5jcHA6CisKKyAgICAgICAgRml4ZXMgYSByZWxhdGVk IGlzc3VlIHdoZXJlIGFuIGF0dGFjaG1lbnQgaXMgYmFja2VkIGJ5IEJsb2IgZGF0YSAoYW5kIG5v dCBhIGZpbGUgcGF0aCkgd291bGQgc3BlY2lmeSAiZmlsZTovLy8iCisgICAgICAgIGFzIGl0cyBh dHRhY2htZW50IGZpbGUgcGF0aCBpbiBEcmFnQ29udHJvbGxlciB3aGVuIHN0YXJ0aW5nIGEgZHJh Zy4gSW5zdGVhZCwgaWYgdGhlcmUgaXMgbm8gZmlsZSBwYXRoLCBmYWxsIGJhY2sKKyAgICAgICAg dG8gdGhlIGJsb2IgVVJMLgorCisgICAgICAgIFRoaXMgd2lsbCBiZSB0ZXN0ZWQgaW4gYSBmdXR1 cmUgcGF0Y2ggb25jZSBhIFdLMiBkcmFnZ2luZyBzaW11bGF0b3IgZm9yIE1hYyBpcyBpbXBsZW1l bnRlZCwgYW5kIHN1cHBvcnQgZm9yCisgICAgICAgIGRyYWdnaW5nIG91dCBCbG9iLWJhY2tlZCBh dHRhY2htZW50cyBhcyAocGxhdGZvcm0pIGZpbGVzIGlzIGltcGxlbWVudGVkLgorCisgICAgICAg IChXZWJDb3JlOjpIaXRUZXN0UmVzdWx0OjphYnNvbHV0ZUF0dGFjaG1lbnRVUkwgY29uc3QpOgor CiAyMDE3LTEyLTE4ICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGhhdGNoZXIubmFtZT4KIAog ICAgICAgICBbR1RLXVtXUEVdIENvbmRpdGlvbmFsaXplIGxpYlRBU04xIHVzZSBiZWhpbmQgRU5B QkxFX1NVQlRMRV9DUllQVE8gaW4gdGhlIENNYWtlIGZpbGVzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9lZGl0aW5nL21hcmt1cC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9lZGl0aW5nL21hcmt1 cC5jcHAKaW5kZXggM2NmNDBlZDc4YzVhODgyNjNjNjU1Yjc0MDI2NTJkNDdmODIyN2UxZi4uMWQ3 MzFkYTIwZWRkNDVlNjU0MGQ3ZDFmOGFhZDlmZDQwNWRkYTE1NCAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvZWRpdGluZy9tYXJrdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2VkaXRpbmcv bWFya3VwLmNwcApAQCAtMzcxLDE1ICszNzEsMTkgQEAgU3RyaW5nIFN0eWxlZE1hcmt1cEFjY3Vt dWxhdG9yOjpzdHJpbmdWYWx1ZUZvclJhbmdlKGNvbnN0IE5vZGUmIG5vZGUsIGNvbnN0IFJhbmcK ICAgICByZXR1cm4gbm9kZVZhbHVlOwogfQogCi12b2lkIFN0eWxlZE1hcmt1cEFjY3VtdWxhdG9y OjphcHBlbmRDdXN0b21BdHRyaWJ1dGVzKFN0cmluZ0J1aWxkZXImIG91dCwgY29uc3QgRWxlbWVu dCZlbGVtZW50LCBOYW1lc3BhY2VzKiBuYW1lc3BhY2VzKQordm9pZCBTdHlsZWRNYXJrdXBBY2N1 bXVsYXRvcjo6YXBwZW5kQ3VzdG9tQXR0cmlidXRlcyhTdHJpbmdCdWlsZGVyJiBvdXQsIGNvbnN0 IEVsZW1lbnQmIGVsZW1lbnQsIE5hbWVzcGFjZXMqIG5hbWVzcGFjZXMpCiB7CiAjaWYgRU5BQkxF KEFUVEFDSE1FTlRfRUxFTUVOVCkKICAgICBpZiAoIWlzPEhUTUxBdHRhY2htZW50RWxlbWVudD4o ZWxlbWVudCkpCiAgICAgICAgIHJldHVybjsKICAgICAKICAgICBjb25zdCBIVE1MQXR0YWNobWVu dEVsZW1lbnQmIGF0dGFjaG1lbnQgPSBkb3duY2FzdDxIVE1MQXR0YWNobWVudEVsZW1lbnQ+KGVs ZW1lbnQpOwotICAgIGlmIChhdHRhY2htZW50LmZpbGUoKSkKLSAgICAgICAgYXBwZW5kQXR0cmli dXRlKG91dCwgZWxlbWVudCwgQXR0cmlidXRlKHdlYmtpdGF0dGFjaG1lbnRwYXRoQXR0ciwgYXR0 YWNobWVudC5maWxlKCktPnBhdGgoKSksIG5hbWVzcGFjZXMpOworICAgIGlmIChhdXRvKiBmaWxl ID0gYXR0YWNobWVudC5maWxlKCkpIHsKKyAgICAgICAgLy8gVGhlc2UgYXR0cmlidXRlcyBhcmUg b25seSBpbnRlbmRlZCBmb3IgRmlsZSBkZXNlcmlhbGl6YXRpb24sIGFuZCBhcmUgcmVtb3ZlZCBm cm9tIHRoZSBnZW5lcmF0ZWQgYXR0YWNobWVudAorICAgICAgICAvLyBlbGVtZW50IGFmdGVyIHdl J3ZlIGRlc2VyaWFsaXplZCBhbmQgc2V0IGl0cyBiYWNraW5nIEZpbGUuCisgICAgICAgIGFwcGVu ZEF0dHJpYnV0ZShvdXQsIGVsZW1lbnQsIHsgd2Via2l0YXR0YWNobWVudHBhdGhBdHRyLCBmaWxl LT5wYXRoKCkgfSwgbmFtZXNwYWNlcyk7CisgICAgICAgIGFwcGVuZEF0dHJpYnV0ZShvdXQsIGVs ZW1lbnQsIHsgd2Via2l0YXR0YWNobWVudGJsb2J1cmxBdHRyLCB7IGZpbGUtPnVybCgpIH19LCBu YW1lc3BhY2VzKTsKKyAgICB9CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShvdXQpOwogICAgIFVO VVNFRF9QQVJBTShlbGVtZW50KTsKQEAgLTc2NCwxMSArNzY4LDEzIEBAIFJlZjxEb2N1bWVudEZy YWdtZW50PiBjcmVhdGVGcmFnbWVudEZyb21NYXJrdXAoRG9jdW1lbnQmIGRvY3VtZW50LCBjb25z dCBTdHJpbmcmCiAKICAgICBmb3IgKGF1dG8mIGF0dGFjaG1lbnQgOiBhdHRhY2htZW50cykgewog ICAgICAgICBhdXRvIGF0dGFjaG1lbnRQYXRoID0gYXR0YWNobWVudC0+YXR0YWNobWVudFBhdGgo KTsKLSAgICAgICAgaWYgKGF0dGFjaG1lbnRQYXRoLmlzRW1wdHkoKSkKLSAgICAgICAgICAgIGF0 dGFjaG1lbnQtPnNldEZpbGUoRmlsZTo6ZGVzZXJpYWxpemUoeyB9LCBhdHRhY2htZW50LT5ibG9i VVJMKCksIGF0dGFjaG1lbnQtPmF0dGFjaG1lbnRUeXBlKCksIGF0dGFjaG1lbnQtPmF0dGFjaG1l bnRUaXRsZSgpKSk7Ci0gICAgICAgIGVsc2UKKyAgICAgICAgYXV0byBibG9iVVJMID0gYXR0YWNo bWVudC0+YmxvYlVSTCgpOworICAgICAgICBpZiAoIWF0dGFjaG1lbnRQYXRoLmlzRW1wdHkoKSkK ICAgICAgICAgICAgIGF0dGFjaG1lbnQtPnNldEZpbGUoRmlsZTo6Y3JlYXRlKGF0dGFjaG1lbnRQ YXRoKSk7CisgICAgICAgIGVsc2UgaWYgKCFibG9iVVJMLmlzRW1wdHkoKSkKKyAgICAgICAgICAg IGF0dGFjaG1lbnQtPnNldEZpbGUoRmlsZTo6ZGVzZXJpYWxpemUoeyB9LCBibG9iVVJMLCBhdHRh Y2htZW50LT5hdHRhY2htZW50VHlwZSgpLCBhdHRhY2htZW50LT5hdHRhY2htZW50VGl0bGUoKSkp OwogICAgICAgICBhdHRhY2htZW50LT5yZW1vdmVBdHRyaWJ1dGUod2Via2l0YXR0YWNobWVudHBh dGhBdHRyKTsKKyAgICAgICAgYXR0YWNobWVudC0+cmVtb3ZlQXR0cmlidXRlKHdlYmtpdGF0dGFj aG1lbnRibG9idXJsQXR0cik7CiAgICAgfQogI2VuZGlmCiAgICAgaWYgKCFiYXNlVVJMLmlzRW1w dHkoKSAmJiBiYXNlVVJMICE9IGJsYW5rVVJMKCkgJiYgYmFzZVVSTCAhPSBkb2N1bWVudC5iYXNl VVJMKCkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxl bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxBdHRhY2htZW50RWxlbWVudC5jcHAK aW5kZXggMDMzZmQ0NWQ2MzUyYzVlMThjNjU1NjY0YWRiNjM5MjNjY2E5ODI1Ny4uMWY0NDVlODA2 MzI3MDBjN2U4OTUwZTczODEwNzA5N2M1ZTAwYjQyOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MQXR0YWNobWVudEVsZW1lbnQuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0 bWwvSFRNTEF0dGFjaG1lbnRFbGVtZW50LmNwcApAQCAtMTIwLDggKzEyMCw2IEBAIHZvaWQgSFRN TEF0dGFjaG1lbnRFbGVtZW50OjpzZXRGaWxlKFJlZlB0cjxGaWxlPiYmIGZpbGUsIFVwZGF0ZURp c3BsYXlBdHRyaWJ1dGVzCiB7CiAgICAgbV9maWxlID0gV1RGTW92ZShmaWxlKTsKIAotICAgIHNl dEF0dHJpYnV0ZVdpdGhvdXRTeW5jaHJvbml6YXRpb24oSFRNTE5hbWVzOjp3ZWJraXRhdHRhY2ht ZW50YmxvYnVybEF0dHIsIG1fZmlsZSA/IG1fZmlsZS0+dXJsKCkgOiBlbXB0eVN0cmluZygpKTsK LQogICAgIGlmICh1cGRhdGVBdHRyaWJ1dGVzID09IFVwZGF0ZURpc3BsYXlBdHRyaWJ1dGVzOjpZ ZXMpIHsKICAgICAgICAgaWYgKG1fZmlsZSkgewogICAgICAgICAgICAgc2V0QXR0cmlidXRlV2l0 aG91dFN5bmNocm9uaXphdGlvbihIVE1MTmFtZXM6OnRpdGxlQXR0ciwgbV9maWxlLT5uYW1lKCkp OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3Bw IGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL0hpdFRlc3RSZXN1bHQuY3BwCmluZGV4IGE4MWVj M2M2ZjVkZjIwZTc1Nzc1ZDA4NjUwNGY4N2I0NjliMjVmMzEuLjQyNDVhM2NlMDI2YzAwZjFjNTNh YTYxZDkzNjA0Mzk5Nzc5MDI2ZmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmlu Zy9IaXRUZXN0UmVzdWx0LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvSGl0VGVz dFJlc3VsdC5jcHAKQEAgLTM1Niw3ICszNTYsMTIgQEAgVVJMIEhpdFRlc3RSZXN1bHQ6OmFic29s dXRlQXR0YWNobWVudFVSTCgpIGNvbnN0CiAgICAgaWYgKCFhdHRhY2htZW50RmlsZSkKICAgICAg ICAgcmV0dXJuIFVSTCgpOwogICAgIAotICAgIHJldHVybiBVUkw6OmZpbGVVUkxXaXRoRmlsZVN5 c3RlbVBhdGgoYXR0YWNobWVudEZpbGUtPnBhdGgoKSk7CisgICAgYXV0byBmaWxlcGF0aCA9IGF0 dGFjaG1lbnRGaWxlLT5wYXRoKCk7CisgICAgaWYgKCFmaWxlcGF0aC5pc0VtcHR5KCkpCisgICAg ICAgIHJldHVybiBVUkw6OmZpbGVVUkxXaXRoRmlsZVN5c3RlbVBhdGgoZmlsZXBhdGgpOworCisg ICAgQVNTRVJUKGF0dGFjaG1lbnRGaWxlLT51cmwoKS5wcm90b2NvbElzQmxvYigpKTsKKyAgICBy ZXR1cm4gYXR0YWNobWVudEZpbGUtPnVybCgpOwogfQogI2VuZGlmCiAKZGlmZiAtLWdpdCBhL1Rv b2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1YjUxZTNlODZmN2ZjNmRiNzE1 YzVjZDRmMGIzMmNkZjE5M2JiMWE2Li4zNmQ4YTBkYjM2NTk4MGY0ZTk3YmZhZTAyMTVjMzQ1MTky NGY5NDQyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMTggQEAKKzIwMTctMTItMTggIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9oc2ll aEBhcHBsZS5jb20+CisKKyAgICAgICAgW0F0dGFjaG1lbnQgU3VwcG9ydF0gVGhlICd3ZWJraXRh dHRhY2htZW50YmxvYnVybCcgYXR0cmlidXRlIHNob3VsZCBub3QgcGVyc2lzdCBhZnRlciBtYXJr dXAgc2VyaWFsaXphdGlvbgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTgwOTI0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNjA5OTA5Mz4KKworICAg ICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAgIFR3ZWFrcyBzb21lIGV4aXN0 aW5nIHRlc3RzIHRvIGNoZWNrIHRoYXQgdGVtcG9yYXJ5IGF0dGFjaG1lbnQgc2VyaWFsaXphdGlv biBhdHRyaWJ1dGVzIGRvbid0IHN0aWNrIGFyb3VuZCBvbiB0aGUKKyAgICAgICAgYXR0YWNobWVu dCBlbGVtZW50cy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev V0tBdHRhY2htZW50VGVzdHMubW06CisgICAgICAgICgtW1Rlc3RXS1dlYlZpZXcgaGFzQXR0cmli dXRlOmZvclF1ZXJ5U2VsZWN0b3I6XSk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToK KwogMjAxNy0xMi0xOCAgV2Vuc29uIEhzaWVoICA8d2Vuc29uX2hzaWVoQGFwcGxlLmNvbT4KIAog ICAgICAgICBbQXR0YWNobWVudCBTdXBwb3J0XSBTdXBwb3J0IHJlcHJlc2VudGluZyBwYXN0ZWQg b3IgZHJvcHBlZCBjb250ZW50IHVzaW5nIGF0dGFjaG1lbnQgZWxlbWVudHMKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMu bW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLQXR0YWNobWVudFRl c3RzLm1tCmluZGV4IDE1ZDMxZmFhNjE0MzRjMDE3OTcxNmY1NmQxMGUzMzZmMjkwOGUxMzQuLmU1 Mzc1MTY1ODM3MjM2NjllMmUyY2MwYTEzZmU0MDVlYzJlYjZiNTMgMTAwNjQ0Ci0tLSBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tBdHRhY2htZW50VGVzdHMubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS0F0dGFjaG1lbnRUZXN0 cy5tbQpAQCAtMjI0LDYgKzIyNCwxMSBAQCAtICh2b2lkKXdhaXRGb3JBdHRhY2htZW50RWxlbWVu dFNpemVUb0JlY29tZTooQ0dTaXplKWV4cGVjdGVkU2l6ZQogICAgIH0KIH0KIAorLSAoQk9PTClo YXNBdHRyaWJ1dGU6KE5TU3RyaW5nICopYXR0cmlidXRlTmFtZSBmb3JRdWVyeVNlbGVjdG9yOihO U1N0cmluZyAqKXF1ZXJ5U2VsZWN0b3IKK3sKKyAgICByZXR1cm4gW3NlbGYgc3RyaW5nQnlFdmFs dWF0aW5nSmF2YVNjcmlwdDpbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImRvY3VtZW50LnF1 ZXJ5U2VsZWN0b3IoJyVAJykuaGFzQXR0cmlidXRlKCclQCcpIiwgcXVlcnlTZWxlY3RvciwgYXR0 cmlidXRlTmFtZV1dLmJvb2xWYWx1ZTsKK30KKwogLSAoTlNTdHJpbmcgKil2YWx1ZU9mQXR0cmli dXRlOihOU1N0cmluZyAqKWF0dHJpYnV0ZU5hbWUgZm9yUXVlcnlTZWxlY3RvcjooTlNTdHJpbmcg KilxdWVyeVNlbGVjdG9yCiB7CiAgICAgcmV0dXJuIFtzZWxmIHN0cmluZ0J5RXZhbHVhdGluZ0ph dmFTY3JpcHQ6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJkb2N1bWVudC5xdWVyeVNlbGVj dG9yKCclQCcpLmdldEF0dHJpYnV0ZSgnJUAnKSIsIHF1ZXJ5U2VsZWN0b3IsIGF0dHJpYnV0ZU5h bWVdXTsKQEAgLTQyNSw2ICs0MzAsOCBAQCBURVNUKFdLQXR0YWNobWVudFRlc3RzLCBBdHRhY2ht ZW50RWxlbWVudEluc2VydGlvbikKIAogICAgIFtmaXJzdEF0dGFjaG1lbnQgZXhwZWN0UmVxdWVz dGVkRGF0YVRvQmU6bmlsXTsKICAgICBbc2Vjb25kQXR0YWNobWVudCBleHBlY3RSZXF1ZXN0ZWRE YXRhVG9CZTp0ZXN0SW1hZ2VEYXRhKCldOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNB dHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0 dGFjaG1lbnQiXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndl YmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKIH0K IAogVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0ZXNXaGVuSW5zZXJ0aW5n QW5kRGVsZXRpbmdOZXdsaW5lKQpAQCAtNDkwLDYgKzQ5Nyw4IEBAIFRFU1QoV0tBdHRhY2htZW50 VGVzdHMsIEF0dGFjaG1lbnRVcGRhdGVzV2hlbkNoYW5naW5nRm9udFN0eWxlcykKICAgICBbd2Vi VmlldyBleHBlY3RVcGRhdGVzQWZ0ZXJDb21tYW5kOkAiVG9nZ2xlSXRhbGljIiB3aXRoQXJndW1l bnQ6bmlsIGV4cGVjdGVkUmVtb3ZhbHM6QFtdIGV4cGVjdGVkSW5zZXJ0aW9uczpAW11dOwogICAg IFt3ZWJWaWV3IGV4cGVjdFVwZGF0ZXNBZnRlckNvbW1hbmQ6QCJUb2dnbGVVbmRlcmxpbmUiIHdp dGhBcmd1bWVudDpuaWwgZXhwZWN0ZWRSZW1vdmFsczpAW10gZXhwZWN0ZWRJbnNlcnRpb25zOkBb XV07CiAgICAgW2F0dGFjaG1lbnQgZXhwZWN0UmVxdWVzdGVkRGF0YVRvQmU6dGVzdEhUTUxEYXRh KCldOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRh Y2htZW50YmxvYnVybCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7CisgICAgRVhQ RUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBm b3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKIAogICAgIC8vIEluc2VydGluZyB0ZXh0 IHNob3VsZCBkZWxldGUgdGhlIGN1cnJlbnQgc2VsZWN0aW9uLCByZW1vdmluZyB0aGUgYXR0YWNo bWVudCBpbiB0aGUgcHJvY2Vzcy4KICAgICBbd2ViVmlldyBleHBlY3RVcGRhdGVzQWZ0ZXJDb21t YW5kOkAiSW5zZXJ0VGV4dCIgd2l0aEFyZ3VtZW50OkAiZm9vIiBleHBlY3RlZFJlbW92YWxzOkBb YXR0YWNobWVudC5nZXQoKV0gZXhwZWN0ZWRJbnNlcnRpb25zOkBbXV07CkBAIC01MTEsNiArNTIw LDggQEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0ZXNXaGVuSW5zZXJ0 aW5nTGlzdHMpCiAgICAgW3dlYlZpZXcgZXhwZWN0VXBkYXRlc0FmdGVyQ29tbWFuZDpAIkluc2Vy dFVub3JkZXJlZExpc3QiIHdpdGhBcmd1bWVudDpuaWwgZXhwZWN0ZWRSZW1vdmFsczpAW10gZXhw ZWN0ZWRJbnNlcnRpb25zOkBbXV07CiAgICAgW3dlYlZpZXcgZXhwZWN0VXBkYXRlc0FmdGVyQ29t bWFuZDpAIkluc2VydFVub3JkZXJlZExpc3QiIHdpdGhBcmd1bWVudDpuaWwgZXhwZWN0ZWRSZW1v dmFsczpAW10gZXhwZWN0ZWRJbnNlcnRpb25zOkBbXV07CiAgICAgW2F0dGFjaG1lbnQgZXhwZWN0 UmVxdWVzdGVkRGF0YVRvQmU6dGVzdEhUTUxEYXRhKCldOworICAgIEVYUEVDVF9GQUxTRShbd2Vi VmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJraXRhdHRhY2htZW50YmxvYnVybCIgZm9yUXVlcnlTZWxl Y3RvcjpAImF0dGFjaG1lbnQiXSk7CisgICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJp YnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRwYXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVu dCJdKTsKIH0KIAogVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0ZXNXaGVu SW5zZXJ0aW5nUmljaE1hcmt1cCkKQEAgLTUyMyw2ICs1MzQsOCBAQCBURVNUKFdLQXR0YWNobWVu dFRlc3RzLCBBdHRhY2htZW50VXBkYXRlc1doZW5JbnNlcnRpbmdSaWNoTWFya3VwKQogICAgICAg ICBhdHRhY2htZW50ID0gb2JzZXJ2ZXIub2JzZXJ2ZXIoKS5pbnNlcnRlZFswXTsKICAgICAgICAg b2JzZXJ2ZXIuZXhwZWN0QXR0YWNobWVudFVwZGF0ZXMoQFsgXSwgQFthdHRhY2htZW50LmdldCgp XSk7CiAgICAgfQorICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6QCJ3ZWJr aXRhdHRhY2htZW50YmxvYnVybCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7Cisg ICAgRVhQRUNUX0ZBTFNFKFt3ZWJWaWV3IGhhc0F0dHJpYnV0ZTpAIndlYmtpdGF0dGFjaG1lbnRw YXRoIiBmb3JRdWVyeVNlbGVjdG9yOkAiYXR0YWNobWVudCJdKTsKICAgICB7CiAgICAgICAgIE9i c2VydmVBdHRhY2htZW50VXBkYXRlc0ZvclNjb3BlIG9ic2VydmVyKHdlYlZpZXcuZ2V0KCkpOwog ICAgICAgICBbd2ViVmlldyBzdHJpbmdCeUV2YWx1YXRpbmdKYXZhU2NyaXB0OkAiZG9jdW1lbnQu cXVlcnlTZWxlY3RvcignYXR0YWNobWVudCcpLnJlbW92ZSgpIl07CkBAIC01NTUsNiArNTY4LDgg QEAgVEVTVChXS0F0dGFjaG1lbnRUZXN0cywgQXR0YWNobWVudFVwZGF0ZXNXaGVuQ3V0dGluZ0Fu ZFBhc3RpbmcpCiAgICAgICAgIG9ic2VydmVyLmV4cGVjdEF0dGFjaG1lbnRVcGRhdGVzKEBbXSwg QFthdHRhY2htZW50LmdldCgpXSk7CiAgICAgfQogICAgIFthdHRhY2htZW50IGV4cGVjdFJlcXVl c3RlZERhdGFUb0JlOnRlc3RIVE1MRGF0YSgpXTsKKyAgICBFWFBFQ1RfRkFMU0UoW3dlYlZpZXcg aGFzQXR0cmlidXRlOkAid2Via2l0YXR0YWNobWVudGJsb2J1cmwiIGZvclF1ZXJ5U2VsZWN0b3I6 QCJhdHRhY2htZW50Il0pOworICAgIEVYUEVDVF9GQUxTRShbd2ViVmlldyBoYXNBdHRyaWJ1dGU6 QCJ3ZWJraXRhdHRhY2htZW50cGF0aCIgZm9yUXVlcnlTZWxlY3RvcjpAImF0dGFjaG1lbnQiXSk7 CiB9CiAKIFRFU1QoV0tBdHRhY2htZW50VGVzdHMsIEF0dGFjaG1lbnREYXRhRm9yRW1wdHlGaWxl KQo=