169102 2017-03-02 15:31:34 -0800 Update WKWebsiteDatastoreConfiguration SPI 2017-03-02 17:33:31 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 beidson beidson commit-queue thorton oldest_to_newest 1282918 0 beidson 2017-03-02 15:31:34 -0800 Update WKWebsiteDatastoreConfiguration SPI Based on late review feedback to the initial patch. 1282922 1 303255 beidson 2017-03-02 15:33:44 -0800 Created attachment 303255 Patch 1282925 2 303255 thorton 2017-03-02 15:36:31 -0800 Comment on attachment 303255 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=303255&action=review > Source/WebKit2/UIProcess/API/Cocoa/_WKWebsiteDataStoreConfiguration.mm:51 > + _webStorageDirectoryURL = [url copy]; You need a whole bunch of adopts! 1282932 3 303259 beidson 2017-03-02 15:41:27 -0800 Created attachment 303259 Patch 1282933 4 beidson 2017-03-02 15:41:51 -0800 Waiting for EWS then will CQ+ 1283001 5 303259 commit-queue 2017-03-02 17:33:28 -0800 Comment on attachment 303259 Patch Clearing flags on attachment: 303259 Committed r213331: <http://trac.webkit.org/changeset/213331> 1283002 6 commit-queue 2017-03-02 17:33:31 -0800 All reviewed patches have been landed. Closing bug. 303255 2017-03-02 15:33:44 -0800 2017-03-02 15:41:25 -0800 Patch bug-169102-20170302153343.patch text/plain 10369 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGMyNDEyZGI4YTA5ZWQ4 ZGYwNTYzOWY1ZTEzOWVlZTY5YTUzNGZiNy4uMWVlZGM3NjgxNmZiNGQzMjkxODc4ZTBjYzY1M2Ji N2I2Yzg5NWMxYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTAzLTAyICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgV0tXZWJzaXRl RGF0YXN0b3JlQ29uZmlndXJhdGlvbiBTUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxMDIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKyAgICAgICAgCisgICAgICAgIE1ha2UgdGhlc2Ugc3RyaW5ncyBVUkxzLCBhbmQg dGhyb3cgZXhjZXB0aW9ucyBpZiB5b3UgdHJ5IHRvIHVzZSBub24tZmlsZSBVUkxzLgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW06CisgICAgICAg ICgtW1dLV2Vic2l0ZURhdGFTdG9yZSBfaW5pdFdpdGhDb25maWd1cmF0aW9uOl0pOgorCisgICAg ICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlv bi5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb24ubW06CisgICAgICAgIChjaGVja1VSTEFyZ3VtZW50KToKKyAgICAgICAgKC1b X1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gX3dlYlN0b3JhZ2VEaXJlY3RvcnldKToK KyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gX3NldFdlYlN0b3Jh Z2VEaXJlY3Rvcnk6XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0 aW9uIF9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeV0pOgorICAgICAgICAoLVtfV0tXZWJzaXRl RGF0YVN0b3JlQ29uZmlndXJhdGlvbiBfc2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk6XSk6 CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIF93ZWJTUUxEYXRh YmFzZURpcmVjdG9yeV0pOgorICAgICAgICAoLVtfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvbiBfc2V0V2ViU1FMRGF0YWJhc2VEaXJlY3Rvcnk6XSk6CisKIDIwMTctMDItMjggIE1hdHQg UmFqY2EgIDxtcmFqY2FAYXBwbGUuY29tPgogCiAgICAgICAgIE1lZGlhOiBub3RpZnkgY2xpZW50 cyB3aGVuIGF1dG9wbGF5ZWQgbWVkaWEgaXMgbXV0ZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJzaXRlRGF0YVN0b3JlLm1tIGIvU291cmNlL1dl YktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KaW5kZXggYjk0 NDQ4YjI0YmJhNjI0MmVmYjQ5OGMzZjRkMTI2MGRjZTJlZmVhZC4uNzEzODE5ZTQ3NDBhZDM0ZDkw MThkYzg5MDM3MjE5MDQ5ZmRmMWJjNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KKysrIGIvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0KQEAgLTE1MywxMiArMTUz LDEyIEBAIC0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhDb25maWd1cmF0aW9uOihfV0tXZWJzaXRl RGF0YVN0b3JlQ29uZmlndXJhdGlvbiAqKWNvbmZpCiAKICAgICBhdXRvIGNvbmZpZyA9IEFQSTo6 V2Vic2l0ZURhdGFTdG9yZTo6ZGVmYXVsdERhdGFTdG9yZUNvbmZpZ3VyYXRpb24oKTsKIAotICAg IGlmIChjb25maWd1cmF0aW9uLndlYlN0b3JhZ2VEaXJlY3RvcnkpCi0gICAgICAgIGNvbmZpZy5s b2NhbFN0b3JhZ2VEaXJlY3RvcnkgPSBjb25maWd1cmF0aW9uLndlYlN0b3JhZ2VEaXJlY3Rvcnk7 Ci0gICAgaWYgKGNvbmZpZ3VyYXRpb24ud2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkpCi0gICAgICAg IGNvbmZpZy53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSA9IGNvbmZpZ3VyYXRpb24ud2ViU1FMRGF0 YWJhc2VEaXJlY3Rvcnk7Ci0gICAgaWYgKGNvbmZpZ3VyYXRpb24uaW5kZXhlZERCRGF0YWJhc2VE aXJlY3RvcnkpCi0gICAgICAgIGNvbmZpZy5pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSA9IGNv bmZpZ3VyYXRpb24uaW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk7CisgICAgaWYgKGNvbmZpZ3Vy YXRpb24uX3dlYlN0b3JhZ2VEaXJlY3RvcnkpCisgICAgICAgIGNvbmZpZy5sb2NhbFN0b3JhZ2VE aXJlY3RvcnkgPSBjb25maWd1cmF0aW9uLl93ZWJTdG9yYWdlRGlyZWN0b3J5LnBhdGg7CisgICAg aWYgKGNvbmZpZ3VyYXRpb24uX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5KQorICAgICAgICBjb25m aWcud2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSBjb25maWd1cmF0aW9uLl93ZWJTUUxEYXRhYmFz ZURpcmVjdG9yeS5wYXRoOworICAgIGlmIChjb25maWd1cmF0aW9uLl9pbmRleGVkREJEYXRhYmFz ZURpcmVjdG9yeSkKKyAgICAgICAgY29uZmlnLmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0g Y29uZmlndXJhdGlvbi5faW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkucGF0aDsKIAogICAgIEFQ STo6T2JqZWN0Ojpjb25zdHJ1Y3RJbldyYXBwZXI8QVBJOjpXZWJzaXRlRGF0YVN0b3JlPihzZWxm LCBjb25maWcpOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmggYi9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKaW5k ZXggYTU1M2E3NWI3OGQ0ZjJkNzA2ODZmOWRlMTVhMjI5ZGFiMDU2ODMwMy4uNmVlYzI0Y2Y5ZDY2 Mjk1ODczZDBmMzBlNDhiNmQwYWVjYmMzMmMyMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCisr KyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb24uaApAQCAtMzQsOSArMzQsOSBAQCBOU19BU1NVTUVfTk9OTlVMTF9CRUdJ TgogV0tfQ0xBU1NfQVZBSUxBQkxFKG1hY29zeCgxMC4xMyksIGlvcygxMS4wKSkKIEBpbnRlcmZh Y2UgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gOiBOU09iamVjdAogCi1AcHJvcGVy dHkgKG5vbmF0b21pYywgY29weSkgTlNTdHJpbmcgKndlYlN0b3JhZ2VEaXJlY3Rvcnk7Ci1AcHJv cGVydHkgKG5vbmF0b21pYywgY29weSkgTlNTdHJpbmcgKmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0 b3J5OwotQHByb3BlcnR5IChub25hdG9taWMsIGNvcHkpIE5TU3RyaW5nICp3ZWJTUUxEYXRhYmFz ZURpcmVjdG9yeTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldFdlYlN0 b3JhZ2VEaXJlY3Rvcnk6KSBOU1VSTCAqX3dlYlN0b3JhZ2VEaXJlY3Rvcnk7CitAcHJvcGVydHkg KG5vbmF0b21pYywgY29weSwgc2V0dGVyPV9zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTop IE5TVVJMICpfaW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk7CitAcHJvcGVydHkgKG5vbmF0b21p YywgY29weSwgc2V0dGVyPV9zZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeTopIE5TVVJMICpfd2Vi U1FMRGF0YWJhc2VEaXJlY3Rvcnk7CiAKIEBlbmQKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5t bSBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb24ubW0KaW5kZXggOGQ3NmE0MTQyYmMxODNkMmUyZWQzM2FlMDNiNThjYmVi YmVhNjJjYS4uMTYxODRkMzk0MGM4MTE5YWJhYTlhNDMwNDc0OTI4MzRhOGJkYzUwMCAxMDA2NDQK LS0tIGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbi5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0Nv Y29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tCkBAIC0yOCw4ICsyOCw0NiBA QAogCiAjaWYgV0tfQVBJX0VOQUJMRUQKIAotQGltcGxlbWVudGF0aW9uIF9XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uCisjaW1wb3J0IDx3dGYvUmV0YWluUHRyLmg+CiAKK3N0YXRpYyB2 b2lkIGNoZWNrVVJMQXJndW1lbnQoTlNVUkwgKnVybCkKK3sKKyAgICBpZiAodXJsICYmICFbdXJs IGlzRmlsZVVSTF0pCisgICAgICAgIFtOU0V4Y2VwdGlvbiByYWlzZTpOU0ludmFsaWRBcmd1bWVu dEV4Y2VwdGlvbiBmb3JtYXQ6QCIlQCBpcyBub3QgYSBmaWxlIFVSTCIsIHVybF07Cit9CisKK0Bp bXBsZW1lbnRhdGlvbiBfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiB7CisgICAgUmV0 YWluUHRyPE5TVVJMPiBfd2ViU3RvcmFnZURpcmVjdG9yeVVSTDsKKyAgICBSZXRhaW5QdHI8TlNV Ukw+IF9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeVVSTDsKKyAgICBSZXRhaW5QdHI8TlNVUkw+ IF93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeVVSTDsKK30KKworLShOU1VSTCAqKV93ZWJTdG9yYWdl RGlyZWN0b3J5IHsKKyAgICByZXR1cm4gX3dlYlN0b3JhZ2VEaXJlY3RvcnlVUkwuZ2V0KCk7Cit9 CisKKy0odm9pZClfc2V0V2ViU3RvcmFnZURpcmVjdG9yeTooTlNVUkwgKil1cmwgeworICAgIGNo ZWNrVVJMQXJndW1lbnQodXJsKTsKKyAgICBfd2ViU3RvcmFnZURpcmVjdG9yeVVSTCA9IFt1cmwg Y29weV07Cit9CisKKy0oTlNVUkwgKilfaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgeworICAg IHJldHVybiBfaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnlVUkwuZ2V0KCk7Cit9CisKKy0odm9p ZClfc2V0SW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk6KE5TVVJMICopdXJsIHsKKyAgICBjaGVj a1VSTEFyZ3VtZW50KHVybCk7CisgICAgX2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5VVJMID0g W3VybCBjb3B5XTsKK30KKworLShOU1VSTCAqKV93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSB7Cisg ICAgcmV0dXJuIF93ZWJTUUxEYXRhYmFzZURpcmVjdG9yeVVSTC5nZXQoKTsKK30KKworLSh2b2lk KV9zZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeTooTlNVUkwgKil1cmwgeworICAgIGNoZWNrVVJM QXJndW1lbnQodXJsKTsKKyAgICBfd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnlVUkwgPSBbdXJsIGNv cHldOworfQogQGVuZAogCiAjZW5kaWYKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rv b2xzL0NoYW5nZUxvZwppbmRleCA0ODA1YmEzZmNlZDYzYjc0ODNjN2YxOWRlZWY2MWUyZDdmOGU5 MmVhLi5mNjJhYTU4NDcwMzIxZmQ5NGE3OGQzMDMwZGQ0NTI5YTZhZjZlZjBmIDEwMDY0NAotLS0g YS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTQgQEAK KzIwMTctMDMtMDIgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgorCisgICAgICAg IFVwZGF0ZSBXS1dlYnNpdGVEYXRhc3RvcmVDb25maWd1cmF0aW9uIFNQSS4KKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE2OTEwMgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0 cy9XZWJLaXQyQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tOgorICAgICAgICAo LVtXZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxlciB1c2VyQ29udGVudENv bnRyb2xsZXI6ZGlkUmVjZWl2ZVNjcmlwdE1lc3NhZ2U6XSk6CisgICAgICAgIChURVNUKToKKwog MjAxNy0wMi0yOCAgTWF0dCBSYWpjYSAgPG1yYWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVk aWE6IG5vdGlmeSBjbGllbnRzIHdoZW4gYXV0b3BsYXllZCBtZWRpYSBpcyBtdXRlZApkaWZmIC0t Z2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvV2Vic2l0ZURhdGFT dG9yZUN1c3RvbVBhdGhzLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29j b2EvV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzLm1tCmluZGV4IDI1YTdhYzk3MmNlNTM1N2I3 ZmM2NzdiMDg1YmY5NjI1MmJjMTdmMmEuLmE5ZjQ5YjE0YjAyNDQwYWIzMTIwM2NjMDljMmVhODU5 YTFhMThjMDQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNv Y29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KQEAg LTUyLDcgKzUyLDYgQEAgQGltcGxlbWVudGF0aW9uIFdlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRo c01lc3NhZ2VIYW5kbGVyCiAKIC0gKHZvaWQpdXNlckNvbnRlbnRDb250cm9sbGVyOihXS1VzZXJD b250ZW50Q29udHJvbGxlciAqKXVzZXJDb250ZW50Q29udHJvbGxlciBkaWRSZWNlaXZlU2NyaXB0 TWVzc2FnZTooV0tTY3JpcHRNZXNzYWdlICopbWVzc2FnZQogewotICAgIHByaW50ZigiTWVzc2Fn ZSFcbiIpOwogICAgIHJlY2VpdmVkU2NyaXB0TWVzc2FnZSA9IHRydWU7CiAgICAgc2NyaXB0TWVz c2FnZXMuYXBwZW5kKG1lc3NhZ2UpOwogfQpAQCAtNzUsMjMgKzc0LDIzIEBAIFRFU1QoV2ViS2l0 MiwgV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzKQogICAgIFJldGFpblB0cjxXS1dlYlZpZXdD b25maWd1cmF0aW9uPiBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3Vy YXRpb24gYWxsb2NdIGluaXRdKTsKICAgICBbW2NvbmZpZ3VyYXRpb24gdXNlckNvbnRlbnRDb250 cm9sbGVyXSBhZGRTY3JpcHRNZXNzYWdlSGFuZGxlcjpoYW5kbGVyLmdldCgpIG5hbWU6QCJ0ZXN0 SGFuZGxlciJdOwogCi0gICAgTlNTdHJpbmcgKnNxbFBhdGggPSBbQCJ+L0xpYnJhcnkvV2ViS2l0 L1Rlc3RXZWJLaXRBUEkvQ3VzdG9tV2Vic2l0ZURhdGEvV2ViU1FMLyIgc3RyaW5nQnlFeHBhbmRp bmdUaWxkZUluUGF0aF07Ci0gICAgTlNTdHJpbmcgKmlkYlBhdGggPSBbQCJ+L0xpYnJhcnkvV2Vi S2l0L1Rlc3RXZWJLaXRBUEkvQ3VzdG9tV2Vic2l0ZURhdGEvSW5kZXhlZERCLyIgc3RyaW5nQnlF eHBhbmRpbmdUaWxkZUluUGF0aF07Ci0gICAgTlNTdHJpbmcgKmxvY2FsU3RvcmFnZVBhdGggPSBb QCJ+L0xpYnJhcnkvV2ViS2l0L1Rlc3RXZWJLaXRBUEkvQ3VzdG9tV2Vic2l0ZURhdGEvTG9jYWxT dG9yYWdlLyIgc3RyaW5nQnlFeHBhbmRpbmdUaWxkZUluUGF0aF07CisgICAgTlNVUkwgKnNxbFBh dGggPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOltAIn4vTGlicmFyeS9XZWJLaXQvVGVzdFdlYktp dEFQSS9DdXN0b21XZWJzaXRlRGF0YS9XZWJTUUwvIiBzdHJpbmdCeUV4cGFuZGluZ1RpbGRlSW5Q YXRoXV07CisgICAgTlNVUkwgKmlkYlBhdGggPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOltAIn4v TGlicmFyeS9XZWJLaXQvVGVzdFdlYktpdEFQSS9DdXN0b21XZWJzaXRlRGF0YS9JbmRleGVkREIv IiBzdHJpbmdCeUV4cGFuZGluZ1RpbGRlSW5QYXRoXV07CisgICAgTlNVUkwgKmxvY2FsU3RvcmFn ZVBhdGggPSBbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOltAIn4vTGlicmFyeS9XZWJLaXQvVGVzdFdl YktpdEFQSS9DdXN0b21XZWJzaXRlRGF0YS9Mb2NhbFN0b3JhZ2UvIiBzdHJpbmdCeUV4cGFuZGlu Z1RpbGRlSW5QYXRoXV07CiAKLSAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHJl bW92ZUl0ZW1BdFVSTDpbTlNVUkwgZmlsZVVSTFdpdGhQYXRoOnNxbFBhdGhdIGVycm9yOm5pbF07 Ci0gICAgW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSByZW1vdmVJdGVtQXRVUkw6W05T VVJMIGZpbGVVUkxXaXRoUGF0aDppZGJQYXRoXSBlcnJvcjpuaWxdOwotICAgIFtbTlNGaWxlTWFu YWdlciBkZWZhdWx0TWFuYWdlcl0gcmVtb3ZlSXRlbUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBh dGg6bG9jYWxTdG9yYWdlUGF0aF0gZXJyb3I6bmlsXTsKKyAgICBbW05TRmlsZU1hbmFnZXIgZGVm YXVsdE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFVSTDpzcWxQYXRoIGVycm9yOm5pbF07CisgICAgW1tO U0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSByZW1vdmVJdGVtQXRVUkw6aWRiUGF0aCBlcnJv cjpuaWxdOworICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gcmVtb3ZlSXRlbUF0 VVJMOmxvY2FsU3RvcmFnZVBhdGggZXJyb3I6bmlsXTsKIAotICAgIEVYUEVDVF9GQUxTRShbW05T RmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6c3FsUGF0aF0pOwot ICAgIEVYUEVDVF9GQUxTRShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlz dHNBdFBhdGg6bG9jYWxTdG9yYWdlUGF0aF0pOwotICAgIEVYUEVDVF9GQUxTRShbW05TRmlsZU1h bmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6aWRiUGF0aF0pOworICAgIEVY UEVDVF9GQUxTRShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBh dGg6c3FsUGF0aC5wYXRoXSk7CisgICAgRVhQRUNUX0ZBTFNFKFtbTlNGaWxlTWFuYWdlciBkZWZh dWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpsb2NhbFN0b3JhZ2VQYXRoLnBhdGhdKTsKKyAg ICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3Rz QXRQYXRoOmlkYlBhdGgucGF0aF0pOwogCiAgICAgX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb24gKndlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uID0gW1tfV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbiBhbGxvY10gaW5pdF07Ci0gICAgd2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb24ud2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSBzcWxQYXRoOwotICAgIHdlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uLmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0gaWRiUGF0 aDsKLSAgICB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi53ZWJTdG9yYWdlRGlyZWN0b3J5 ID0gbG9jYWxTdG9yYWdlUGF0aDsKLSAgICAKKyAgICB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvbi5fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkgPSBzcWxQYXRoOworICAgIHdlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uLl9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSA9IGlkYlBhdGg7 CisgICAgd2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uX3dlYlN0b3JhZ2VEaXJlY3Rvcnkg PSBsb2NhbFN0b3JhZ2VQYXRoOworCiAgICAgY29uZmlndXJhdGlvbi5nZXQoKS53ZWJzaXRlRGF0 YVN0b3JlID0gW1tXS1dlYnNpdGVEYXRhU3RvcmUgYWxsb2NdIF9pbml0V2l0aENvbmZpZ3VyYXRp b246d2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25dOwogICAgIFt3ZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvbiByZWxlYXNlXTsKIApAQCAtMTA1LDggKzEwNCw4IEBAIFRFU1QoV2ViS2l0 MiwgV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzKQogICAgIGdldE5leHRNZXNzYWdlKCk7CiAg ICAgZ2V0TmV4dE1lc3NhZ2UoKTsKIAotICAgIEVYUEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBk ZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDpzcWxQYXRoXSk7Ci0gICAgRVhQRUNUX1RS VUUoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmxvY2Fs U3RvcmFnZVBhdGhdKTsKKyAgICBFWFBFQ1RfVFJVRShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1h bmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6c3FsUGF0aC5wYXRoXSk7CisgICAgRVhQRUNUX1RSVUUo W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmxvY2FsU3Rv cmFnZVBhdGgucGF0aF0pOwogCiAgICAgLy8gRklYTUU6IDxyZGFyOi8vcHJvYmxlbS8zMDc4NTYx OD4gLSBXZSBkb24ndCB5ZXQgc3VwcG9ydCBJREIgZGF0YWJhc2UgcHJvY2Vzc2VzIGF0IGN1c3Rv bSBwYXRocyBwZXIgV2Vic2l0ZURhdGFTdG9yZQogICAgIC8vIEVYUEVDVF9UUlVFKFtbTlNGaWxl TWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDppZGJQYXRoXSk7Cg== 303259 2017-03-02 15:41:27 -0800 2017-03-02 17:33:28 -0800 Patch bug-169102-20170302154126.patch text/plain 10388 beidson U3VidmVyc2lvbiBSZXZpc2lvbjogMjEzMjUyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKaW5kZXggNGMyNDEyZGI4YTA5ZWQ4 ZGYwNTYzOWY1ZTEzOWVlZTY5YTUzNGZiNy4uNjRlNTRlNWQwOTRkNTg5MTJiOTJkMmRiYTMyM2Qz OWIwZDYwYTRkMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJLaXQyL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1IEBACisyMDE3LTAzLTAyICBCcmFk eSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKworICAgICAgICBVcGRhdGUgV0tXZWJzaXRl RGF0YXN0b3JlQ29uZmlndXJhdGlvbiBTUEkuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0xNjkxMDIKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9y dG9uLgorICAgICAgICAKKyAgICAgICAgTWFrZSB0aGVzZSBzdHJpbmdzIFVSTHMsIGFuZCB0aHJv dyBleGNlcHRpb25zIGlmIHlvdSB0cnkgdG8gdXNlIG5vbi1maWxlIFVSTHMuCisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbToKKyAgICAgICAgKC1b V0tXZWJzaXRlRGF0YVN0b3JlIF9pbml0V2l0aENvbmZpZ3VyYXRpb246XSk6CisKKyAgICAgICAg KiBVSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmg6 CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmln dXJhdGlvbi5tbToKKyAgICAgICAgKGNoZWNrVVJMQXJndW1lbnQpOgorICAgICAgICAoLVtfV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBfd2ViU3RvcmFnZURpcmVjdG9yeV0pOgorICAg ICAgICAoLVtfV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiBfc2V0V2ViU3RvcmFnZURp cmVjdG9yeTpdKToKKyAgICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24g X2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uIF9zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTpdKToKKyAg ICAgICAgKC1bX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gX3dlYlNRTERhdGFiYXNl RGlyZWN0b3J5XSk6CisgICAgICAgICgtW19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9u IF9zZXRXZWJTUUxEYXRhYmFzZURpcmVjdG9yeTpdKToKKwogMjAxNy0wMi0yOCAgTWF0dCBSYWpj YSAgPG1yYWpjYUBhcHBsZS5jb20+CiAKICAgICAgICAgTWVkaWE6IG5vdGlmeSBjbGllbnRzIHdo ZW4gYXV0b3BsYXllZCBtZWRpYSBpcyBtdXRlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv VUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnNpdGVEYXRhU3RvcmUubW0gYi9Tb3VyY2UvV2ViS2l0 Mi9VSVByb2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQppbmRleCBiOTQ0NDhi MjRiYmE2MjQyZWZiNDk4YzNmNGQxMjYwZGNlMmVmZWFkLi43MTM4MTllNDc0MGFkMzRkOTAxOGRj ODkwMzcyMTkwNDlmZGYxYmM3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv QVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL1dLV2Vic2l0ZURhdGFTdG9yZS5tbQpAQCAtMTUzLDEyICsxNTMsMTIg QEAgLSAoaW5zdGFuY2V0eXBlKV9pbml0V2l0aENvbmZpZ3VyYXRpb246KF9XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uICopY29uZmkKIAogICAgIGF1dG8gY29uZmlnID0gQVBJOjpXZWJz aXRlRGF0YVN0b3JlOjpkZWZhdWx0RGF0YVN0b3JlQ29uZmlndXJhdGlvbigpOwogCi0gICAgaWYg KGNvbmZpZ3VyYXRpb24ud2ViU3RvcmFnZURpcmVjdG9yeSkKLSAgICAgICAgY29uZmlnLmxvY2Fs U3RvcmFnZURpcmVjdG9yeSA9IGNvbmZpZ3VyYXRpb24ud2ViU3RvcmFnZURpcmVjdG9yeTsKLSAg ICBpZiAoY29uZmlndXJhdGlvbi53ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSkKLSAgICAgICAgY29u ZmlnLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gY29uZmlndXJhdGlvbi53ZWJTUUxEYXRhYmFz ZURpcmVjdG9yeTsKLSAgICBpZiAoY29uZmlndXJhdGlvbi5pbmRleGVkREJEYXRhYmFzZURpcmVj dG9yeSkKLSAgICAgICAgY29uZmlnLmluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5ID0gY29uZmln dXJhdGlvbi5pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsKKyAgICBpZiAoY29uZmlndXJhdGlv bi5fd2ViU3RvcmFnZURpcmVjdG9yeSkKKyAgICAgICAgY29uZmlnLmxvY2FsU3RvcmFnZURpcmVj dG9yeSA9IGNvbmZpZ3VyYXRpb24uX3dlYlN0b3JhZ2VEaXJlY3RvcnkucGF0aDsKKyAgICBpZiAo Y29uZmlndXJhdGlvbi5fd2ViU1FMRGF0YWJhc2VEaXJlY3RvcnkpCisgICAgICAgIGNvbmZpZy53 ZWJTUUxEYXRhYmFzZURpcmVjdG9yeSA9IGNvbmZpZ3VyYXRpb24uX3dlYlNRTERhdGFiYXNlRGly ZWN0b3J5LnBhdGg7CisgICAgaWYgKGNvbmZpZ3VyYXRpb24uX2luZGV4ZWREQkRhdGFiYXNlRGly ZWN0b3J5KQorICAgICAgICBjb25maWcuaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnkgPSBjb25m aWd1cmF0aW9uLl9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeS5wYXRoOwogCiAgICAgQVBJOjpP YmplY3Q6OmNvbnN0cnVjdEluV3JhcHBlcjxBUEk6OldlYnNpdGVEYXRhU3RvcmU+KHNlbGYsIGNv bmZpZyk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJv Y2Vzcy9BUEkvQ29jb2EvX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaAppbmRleCBh NTUzYTc1Yjc4ZDRmMmQ3MDY4NmY5ZGUxNWEyMjlkYWIwNTY4MzAzLi42ZWVjMjRjZjlkNjYyOTU4 NzNkMGYzMGU0OGI2ZDBhZWNiYzMyYzIzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVBy b2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29u ZmlndXJhdGlvbi5oCkBAIC0zNCw5ICszNCw5IEBAIE5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCiBX S19DTEFTU19BVkFJTEFCTEUobWFjb3N4KDEwLjEzKSwgaW9zKDExLjApKQogQGludGVyZmFjZSBf V0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiA6IE5TT2JqZWN0CiAKLUBwcm9wZXJ0eSAo bm9uYXRvbWljLCBjb3B5KSBOU1N0cmluZyAqd2ViU3RvcmFnZURpcmVjdG9yeTsKLUBwcm9wZXJ0 eSAobm9uYXRvbWljLCBjb3B5KSBOU1N0cmluZyAqaW5kZXhlZERCRGF0YWJhc2VEaXJlY3Rvcnk7 Ci1AcHJvcGVydHkgKG5vbmF0b21pYywgY29weSkgTlNTdHJpbmcgKndlYlNRTERhdGFiYXNlRGly ZWN0b3J5OworQHByb3BlcnR5IChub25hdG9taWMsIGNvcHksIHNldHRlcj1fc2V0V2ViU3RvcmFn ZURpcmVjdG9yeTopIE5TVVJMICpfd2ViU3RvcmFnZURpcmVjdG9yeTsKK0Bwcm9wZXJ0eSAobm9u YXRvbWljLCBjb3B5LCBzZXR0ZXI9X3NldEluZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5OikgTlNV UkwgKl9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTsKK0Bwcm9wZXJ0eSAobm9uYXRvbWljLCBj b3B5LCBzZXR0ZXI9X3NldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5OikgTlNVUkwgKl93ZWJTUUxE YXRhYmFzZURpcmVjdG9yeTsKIAogQGVuZAogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLm1tIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9Db2NvYS9fV0tXZWJzaXRlRGF0YVN0b3JlQ29u ZmlndXJhdGlvbi5tbQppbmRleCA4ZDc2YTQxNDJiYzE4M2QyZTJlZDMzYWUwM2I1OGNiZWJiZWE2 MmNhLi4wMmVkYzc5ZDIwMDliZmI1MGMzNTM4MGUyNmMxMWE0MjY4ZTZkYzFlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL0NvY29hL19XS1dlYnNpdGVEYXRhU3RvcmVD b25maWd1cmF0aW9uLm1tCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9BUEkvQ29jb2Ev X1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24ubW0KQEAgLTI4LDggKzI4LDQ2IEBACiAK ICNpZiBXS19BUElfRU5BQkxFRAogCi1AaW1wbGVtZW50YXRpb24gX1dLV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb24KKyNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KIAorc3RhdGljIHZvaWQg Y2hlY2tVUkxBcmd1bWVudChOU1VSTCAqdXJsKQoreworICAgIGlmICh1cmwgJiYgIVt1cmwgaXNG aWxlVVJMXSkKKyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW52YWxpZEFyZ3VtZW50RXhj ZXB0aW9uIGZvcm1hdDpAIiVAIGlzIG5vdCBhIGZpbGUgVVJMIiwgdXJsXTsKK30KKworQGltcGxl bWVudGF0aW9uIF9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uIHsKKyAgICBSZXRhaW5Q dHI8TlNVUkw+IF93ZWJTdG9yYWdlRGlyZWN0b3J5VVJMOworICAgIFJldGFpblB0cjxOU1VSTD4g X2luZGV4ZWREQkRhdGFiYXNlRGlyZWN0b3J5VVJMOworICAgIFJldGFpblB0cjxOU1VSTD4gX3dl YlNRTERhdGFiYXNlRGlyZWN0b3J5VVJMOworfQorCistKE5TVVJMICopX3dlYlN0b3JhZ2VEaXJl Y3RvcnkgeworICAgIHJldHVybiBfd2ViU3RvcmFnZURpcmVjdG9yeVVSTC5nZXQoKTsKK30KKwor LSh2b2lkKV9zZXRXZWJTdG9yYWdlRGlyZWN0b3J5OihOU1VSTCAqKXVybCB7CisgICAgY2hlY2tV UkxBcmd1bWVudCh1cmwpOworICAgIF93ZWJTdG9yYWdlRGlyZWN0b3J5VVJMID0gYWRvcHROUyhb dXJsIGNvcHldKTsKK30KKworLShOU1VSTCAqKV9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeSB7 CisgICAgcmV0dXJuIF9pbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeVVSTC5nZXQoKTsKK30KKwor LSh2b2lkKV9zZXRJbmRleGVkREJEYXRhYmFzZURpcmVjdG9yeTooTlNVUkwgKil1cmwgeworICAg IGNoZWNrVVJMQXJndW1lbnQodXJsKTsKKyAgICBfaW5kZXhlZERCRGF0YWJhc2VEaXJlY3RvcnlV UkwgPSBhZG9wdE5TKFt1cmwgY29weV0pOworfQorCistKE5TVVJMICopX3dlYlNRTERhdGFiYXNl RGlyZWN0b3J5IHsKKyAgICByZXR1cm4gX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5VVJMLmdldCgp OworfQorCistKHZvaWQpX3NldFdlYlNRTERhdGFiYXNlRGlyZWN0b3J5OihOU1VSTCAqKXVybCB7 CisgICAgY2hlY2tVUkxBcmd1bWVudCh1cmwpOworICAgIF93ZWJTUUxEYXRhYmFzZURpcmVjdG9y eVVSTCA9IGFkb3B0TlMoW3VybCBjb3B5XSk7Cit9CiBAZW5kCiAKICNlbmRpZgpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDQ4MDViYTNmY2VkNjNi NzQ4M2M3ZjE5ZGVlZjYxZTJkN2Y4ZTkyZWEuLjhmZTkyNGQyYjE0ZTJmOThlZWM4M2RmOTFjMzI0 YmM5N2E0YTUzMzYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxNy0wMy0wMiAgQnJhZHkgRWlkc29uICA8YmVpZHNv bkBhcHBsZS5jb20+CisKKyAgICAgICAgVXBkYXRlIFdLV2Vic2l0ZURhdGFzdG9yZUNvbmZpZ3Vy YXRpb24gU1BJLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTY5MTAyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAq IFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0MkNvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21Q YXRocy5tbToKKyAgICAgICAgKC1bV2Vic2l0ZURhdGFTdG9yZUN1c3RvbVBhdGhzTWVzc2FnZUhh bmRsZXIgdXNlckNvbnRlbnRDb250cm9sbGVyOmRpZFJlY2VpdmVTY3JpcHRNZXNzYWdlOl0pOgor ICAgICAgICAoVEVTVCk6CisKIDIwMTctMDItMjggIE1hdHQgUmFqY2EgIDxtcmFqY2FAYXBwbGUu Y29tPgogCiAgICAgICAgIE1lZGlhOiBub3RpZnkgY2xpZW50cyB3aGVuIGF1dG9wbGF5ZWQgbWVk aWEgaXMgbXV0ZWQKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 MkNvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0MkNvY29hL1dlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocy5tbQppbmRl eCAyNWE3YWM5NzJjZTUzNTdiN2ZjNjc3YjA4NWJmOTYyNTJiYzE3ZjJhLi5hOWY0OWIxNGIwMjQ0 MGFiMzEyMDNjYzA5YzJlYTg1OWExYTE4YzA0IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJDb2NvYS9XZWJzaXRlRGF0YVN0b3JlQ3VzdG9tUGF0aHMubW0KKysr IGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyQ29jb2EvV2Vic2l0ZURhdGFTdG9y ZUN1c3RvbVBhdGhzLm1tCkBAIC01Miw3ICs1Miw2IEBAIEBpbXBsZW1lbnRhdGlvbiBXZWJzaXRl RGF0YVN0b3JlQ3VzdG9tUGF0aHNNZXNzYWdlSGFuZGxlcgogCiAtICh2b2lkKXVzZXJDb250ZW50 Q29udHJvbGxlcjooV0tVc2VyQ29udGVudENvbnRyb2xsZXIgKil1c2VyQ29udGVudENvbnRyb2xs ZXIgZGlkUmVjZWl2ZVNjcmlwdE1lc3NhZ2U6KFdLU2NyaXB0TWVzc2FnZSAqKW1lc3NhZ2UKIHsK LSAgICBwcmludGYoIk1lc3NhZ2UhXG4iKTsKICAgICByZWNlaXZlZFNjcmlwdE1lc3NhZ2UgPSB0 cnVlOwogICAgIHNjcmlwdE1lc3NhZ2VzLmFwcGVuZChtZXNzYWdlKTsKIH0KQEAgLTc1LDIzICs3 NCwyMyBAQCBURVNUKFdlYktpdDIsIFdlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocykKICAgICBS ZXRhaW5QdHI8V0tXZWJWaWV3Q29uZmlndXJhdGlvbj4gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMo W1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7CiAgICAgW1tjb25maWd1cmF0 aW9uIHVzZXJDb250ZW50Q29udHJvbGxlcl0gYWRkU2NyaXB0TWVzc2FnZUhhbmRsZXI6aGFuZGxl ci5nZXQoKSBuYW1lOkAidGVzdEhhbmRsZXIiXTsKIAotICAgIE5TU3RyaW5nICpzcWxQYXRoID0g W0Aifi9MaWJyYXJ5L1dlYktpdC9UZXN0V2ViS2l0QVBJL0N1c3RvbVdlYnNpdGVEYXRhL1dlYlNR TC8iIHN0cmluZ0J5RXhwYW5kaW5nVGlsZGVJblBhdGhdOwotICAgIE5TU3RyaW5nICppZGJQYXRo ID0gW0Aifi9MaWJyYXJ5L1dlYktpdC9UZXN0V2ViS2l0QVBJL0N1c3RvbVdlYnNpdGVEYXRhL0lu ZGV4ZWREQi8iIHN0cmluZ0J5RXhwYW5kaW5nVGlsZGVJblBhdGhdOwotICAgIE5TU3RyaW5nICps b2NhbFN0b3JhZ2VQYXRoID0gW0Aifi9MaWJyYXJ5L1dlYktpdC9UZXN0V2ViS2l0QVBJL0N1c3Rv bVdlYnNpdGVEYXRhL0xvY2FsU3RvcmFnZS8iIHN0cmluZ0J5RXhwYW5kaW5nVGlsZGVJblBhdGhd OworICAgIE5TVVJMICpzcWxQYXRoID0gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpbQCJ+L0xpYnJh cnkvV2ViS2l0L1Rlc3RXZWJLaXRBUEkvQ3VzdG9tV2Vic2l0ZURhdGEvV2ViU1FMLyIgc3RyaW5n QnlFeHBhbmRpbmdUaWxkZUluUGF0aF1dOworICAgIE5TVVJMICppZGJQYXRoID0gW05TVVJMIGZp bGVVUkxXaXRoUGF0aDpbQCJ+L0xpYnJhcnkvV2ViS2l0L1Rlc3RXZWJLaXRBUEkvQ3VzdG9tV2Vi c2l0ZURhdGEvSW5kZXhlZERCLyIgc3RyaW5nQnlFeHBhbmRpbmdUaWxkZUluUGF0aF1dOworICAg IE5TVVJMICpsb2NhbFN0b3JhZ2VQYXRoID0gW05TVVJMIGZpbGVVUkxXaXRoUGF0aDpbQCJ+L0xp YnJhcnkvV2ViS2l0L1Rlc3RXZWJLaXRBUEkvQ3VzdG9tV2Vic2l0ZURhdGEvTG9jYWxTdG9yYWdl LyIgc3RyaW5nQnlFeHBhbmRpbmdUaWxkZUluUGF0aF1dOwogCi0gICAgW1tOU0ZpbGVNYW5hZ2Vy IGRlZmF1bHRNYW5hZ2VyXSByZW1vdmVJdGVtQXRVUkw6W05TVVJMIGZpbGVVUkxXaXRoUGF0aDpz cWxQYXRoXSBlcnJvcjpuaWxdOwotICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0g cmVtb3ZlSXRlbUF0VVJMOltOU1VSTCBmaWxlVVJMV2l0aFBhdGg6aWRiUGF0aF0gZXJyb3I6bmls XTsKLSAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIHJlbW92ZUl0ZW1BdFVSTDpb TlNVUkwgZmlsZVVSTFdpdGhQYXRoOmxvY2FsU3RvcmFnZVBhdGhdIGVycm9yOm5pbF07CisgICAg W1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSByZW1vdmVJdGVtQXRVUkw6c3FsUGF0aCBl cnJvcjpuaWxdOworICAgIFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gcmVtb3ZlSXRl bUF0VVJMOmlkYlBhdGggZXJyb3I6bmlsXTsKKyAgICBbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1h bmFnZXJdIHJlbW92ZUl0ZW1BdFVSTDpsb2NhbFN0b3JhZ2VQYXRoIGVycm9yOm5pbF07CiAKLSAg ICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3Rz QXRQYXRoOnNxbFBhdGhdKTsKLSAgICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1 bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOmxvY2FsU3RvcmFnZVBhdGhdKTsKLSAgICBFWFBF Q1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRo OmlkYlBhdGhdKTsKKyAgICBFWFBFQ1RfRkFMU0UoW1tOU0ZpbGVNYW5hZ2VyIGRlZmF1bHRNYW5h Z2VyXSBmaWxlRXhpc3RzQXRQYXRoOnNxbFBhdGgucGF0aF0pOworICAgIEVYUEVDVF9GQUxTRShb W05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6bG9jYWxTdG9y YWdlUGF0aC5wYXRoXSk7CisgICAgRVhQRUNUX0ZBTFNFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0 TWFuYWdlcl0gZmlsZUV4aXN0c0F0UGF0aDppZGJQYXRoLnBhdGhdKTsKIAogICAgIF9XS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uICp3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbiA9 IFtbX1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdOwotICAgIHdl YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLndlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gc3Fs UGF0aDsKLSAgICB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5pbmRleGVkREJEYXRhYmFz ZURpcmVjdG9yeSA9IGlkYlBhdGg7Ci0gICAgd2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24u d2ViU3RvcmFnZURpcmVjdG9yeSA9IGxvY2FsU3RvcmFnZVBhdGg7Ci0gICAgCisgICAgd2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uX3dlYlNRTERhdGFiYXNlRGlyZWN0b3J5ID0gc3FsUGF0 aDsKKyAgICB3ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5faW5kZXhlZERCRGF0YWJhc2VE aXJlY3RvcnkgPSBpZGJQYXRoOworICAgIHdlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLl93 ZWJTdG9yYWdlRGlyZWN0b3J5ID0gbG9jYWxTdG9yYWdlUGF0aDsKKwogICAgIGNvbmZpZ3VyYXRp b24uZ2V0KCkud2Vic2l0ZURhdGFTdG9yZSA9IFtbV0tXZWJzaXRlRGF0YVN0b3JlIGFsbG9jXSBf aW5pdFdpdGhDb25maWd1cmF0aW9uOndlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uXTsKICAg ICBbd2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24gcmVsZWFzZV07CiAKQEAgLTEwNSw4ICsx MDQsOCBAQCBURVNUKFdlYktpdDIsIFdlYnNpdGVEYXRhU3RvcmVDdXN0b21QYXRocykKICAgICBn ZXROZXh0TWVzc2FnZSgpOwogICAgIGdldE5leHRNZXNzYWdlKCk7CiAKLSAgICBFWFBFQ1RfVFJV RShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBhdGg6c3FsUGF0 aF0pOwotICAgIEVYUEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmls ZUV4aXN0c0F0UGF0aDpsb2NhbFN0b3JhZ2VQYXRoXSk7CisgICAgRVhQRUNUX1RSVUUoW1tOU0Zp bGVNYW5hZ2VyIGRlZmF1bHRNYW5hZ2VyXSBmaWxlRXhpc3RzQXRQYXRoOnNxbFBhdGgucGF0aF0p OworICAgIEVYUEVDVF9UUlVFKFtbTlNGaWxlTWFuYWdlciBkZWZhdWx0TWFuYWdlcl0gZmlsZUV4 aXN0c0F0UGF0aDpsb2NhbFN0b3JhZ2VQYXRoLnBhdGhdKTsKIAogICAgIC8vIEZJWE1FOiA8cmRh cjovL3Byb2JsZW0vMzA3ODU2MTg+IC0gV2UgZG9uJ3QgeWV0IHN1cHBvcnQgSURCIGRhdGFiYXNl IHByb2Nlc3NlcyBhdCBjdXN0b20gcGF0aHMgcGVyIFdlYnNpdGVEYXRhU3RvcmUKICAgICAvLyBF WFBFQ1RfVFJVRShbW05TRmlsZU1hbmFnZXIgZGVmYXVsdE1hbmFnZXJdIGZpbGVFeGlzdHNBdFBh dGg6aWRiUGF0aF0pOwo=