133919 2014-06-14 15:08:43 -0700 Adopt HTTPHeaderName in ResourceResponseBase 2014-06-15 09:34:32 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 1015724 0 andersca 2014-06-14 15:08:43 -0700 Adopt HTTPHeaderName in ResourceResponseBase 1015725 1 233128 andersca 2014-06-14 15:11:57 -0700 Created attachment 233128 Patch 1015765 2 andersca 2014-06-15 09:34:32 -0700 Committed r169989: <http://trac.webkit.org/changeset/169989> 233128 2014-06-14 15:11:57 -0700 2014-06-14 15:13:59 -0700 Patch bug-133919-20140614151133.patch text/plain 13305 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTY5OTgxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMDQyNDhiMWNkMWE0Zjdk ZDBmOTA5Y2EzMGZhZGZiODdmYzgzOTUzZi4uYzVjZGZkYzE4ZjBjZDYwYzQ1N2UxYjczYTRmMjMy NDBiMjRhMDhmOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI3IEBACiAyMDE0LTA2LTE0ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRvcHQgSFRUUEhl YWRlck5hbWUgaW4gUmVzb3VyY2VSZXNwb25zZUJhc2UKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzkxOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTmFt ZXMuaW46CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5j cHA6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFzZTo6dXBkYXRlSGVhZGVy UGFyc2VkU3RhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNwb25zZUJhc2U6OnNl dEhUVFBIZWFkZXJGaWVsZCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFz ZTo6YWRkSFRUUEhlYWRlckZpZWxkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9u c2VCYXNlOjpwYXJzZUNhY2hlQ29udHJvbERpcmVjdGl2ZXMpOgorICAgICAgICAoV2ViQ29yZTo6 UmVzb3VyY2VSZXNwb25zZUJhc2U6Omhhc0NhY2hlVmFsaWRhdG9yRmllbGRzKToKKyAgICAgICAg KFdlYkNvcmU6OnBhcnNlRGF0ZVZhbHVlSW5IZWFkZXIpOgorICAgICAgICAoV2ViQ29yZTo6UmVz b3VyY2VSZXNwb25zZUJhc2U6OmRhdGUpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXNw b25zZUJhc2U6OmFnZSk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFzZTo6 ZXhwaXJlcyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlc3BvbnNlQmFzZTo6bGFzdE1v ZGlmaWVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlUmVzcG9uc2VCYXNlOjppc0F0dGFj aG1lbnQpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2Uu aDoKKworMjAxNC0wNi0xNCAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJzY2FAYXBwbGUuY29tPgor CiAgICAgICAgIFNpbXBsaWZ5IFJlc291cmNlUmVxdWVzdCBjb25zdHJ1Y3RvcnMKICAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzMzkxMQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJOYW1lcy5pbiBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck5hbWVzLmluCmluZGV4 IDc3Y2ZlOGFkNmZiYzFmODFhNDhjNGVhMmY3NmRkNjY2MGMyOTRkNjkuLjQxNGMwZjJkNTRkMzY4 M2I3MzI5Zjk3ZTgyZDY2ZDUwNjBjNmZmNGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck5hbWVzLmluCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck5hbWVzLmluCkBAIC0yNiwxNiArMjYsMjEgQEAKIEFj Y2VwdAogQWNjZXNzLUNvbnRyb2wtUmVxdWVzdC1IZWFkZXJzCiBBY2Nlc3MtQ29udHJvbC1SZXF1 ZXN0LU1ldGhvZAorQWdlCiBBdXRob3JpemF0aW9uCiBDYWNoZS1Db250cm9sCiBDb25uZWN0aW9u CitDb250ZW50LURpc3Bvc2l0aW9uCiBDb250ZW50LUxhbmd1YWdlCiBDb250ZW50LUxlbmd0aAog Q29udGVudC1TZWN1cml0eS1Qb2xpY3kKIENvbnRlbnQtU2VjdXJpdHktUG9saWN5LVJlcG9ydC1P bmx5CiBDb250ZW50LVR5cGUKIENvb2tpZQorRGF0ZQogRGVmYXVsdC1TdHlsZQorRVRhZworRXhw aXJlcwogSG9zdAogSWYtTWF0Y2gKIElmLU1vZGlmaWVkLVNpbmNlCkBAIC00Myw2ICs0OCw3IEBA IElmLU5vbmUtTWF0Y2gKIElmLVJhbmdlCiBJZi1Vbm1vZGlmaWVkLVNpbmNlCiBMYXN0LUV2ZW50 LUlECitMYXN0LU1vZGlmaWVkCiBMb2NhdGlvbgogT3JpZ2luCiBQaW5nLUZyb20KZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNwb25zZUJhc2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFz ZS5jcHAKaW5kZXggMDAxYTgwMmI1NzBkZjc1YTZlY2ZjMTk3MzQ2ZTE0ZDgzYzIwYzBkYi4uNDNk ZDdiMGRmMzg2MmFkOTcwMjc2OGFlZTgwNTM0MWNlZGRjYTVjYSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNlQmFzZS5jcHAK QEAgLTI3LDExICsyNywxMyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogI2luY2x1ZGUgIlJlc291 cmNlUmVzcG9uc2VCYXNlLmgiCiAKKyNpbmNsdWRlICJIVFRQSGVhZGVyTmFtZXMuaCIKICNpbmNs dWRlICJIVFRQUGFyc2Vycy5oIgogI2luY2x1ZGUgIlJlc291cmNlUmVzcG9uc2UuaCIKICNpbmNs dWRlIDx3dGYvQ3VycmVudFRpbWUuaD4KICNpbmNsdWRlIDx3dGYvTWF0aEV4dHJhcy5oPgogI2lu Y2x1ZGUgPHd0Zi9TdGRMaWJFeHRyYXMuaD4KKyNpbmNsdWRlIDx3dGYvdGV4dC9TdHJpbmdWaWV3 Lmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIApAQCAtMjg1LDMyICsyODcsNDIgQEAgU3RyaW5n IFJlc291cmNlUmVzcG9uc2VCYXNlOjpodHRwSGVhZGVyRmllbGQoY29uc3QgY2hhciogbmFtZSkg Y29uc3QKICAgICByZXR1cm4gbV9odHRwSGVhZGVyRmllbGRzLmdldChuYW1lKTsgCiB9CiAKLXZv aWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnVwZGF0ZUhlYWRlclBhcnNlZFN0YXRlKGNvbnN0IEF0 b21pY1N0cmluZyYgbmFtZSkKK3ZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnVwZGF0ZUhlYWRl clBhcnNlZFN0YXRlKEhUVFBIZWFkZXJOYW1lIG5hbWUpCiB7Ci0gICAgREVQUkVDQVRFRF9ERUZJ TkVfU1RBVElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmluZywgYWdlSGVhZGVyLCAoImFnZSIsIEF0 b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICBERVBSRUNBVEVEX0RFRklO RV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBjYWNoZUNvbnRyb2xIZWFkZXIsICgi Y2FjaGUtY29udHJvbCIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAg ICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBkYXRl SGVhZGVyLCAoImRhdGUiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0g ICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmluZywgZXhw aXJlc0hlYWRlciwgKCJleHBpcmVzIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJh bCkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJp bmcsIGxhc3RNb2RpZmllZEhlYWRlciwgKCJsYXN0LW1vZGlmaWVkIiwgQXRvbWljU3RyaW5nOjpD b25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NB TChjb25zdCBBdG9taWNTdHJpbmcsIHByYWdtYUhlYWRlciwgKCJwcmFnbWEiLCBBdG9taWNTdHJp bmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0KLSAgICBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo bmFtZSwgYWdlSGVhZGVyKSkKKyAgICBzd2l0Y2ggKG5hbWUpIHsKKyAgICBjYXNlIEhUVFBIZWFk ZXJOYW1lOjpBZ2U6CiAgICAgICAgIG1faGF2ZVBhcnNlZEFnZUhlYWRlciA9IGZhbHNlOwotICAg IGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIGNhY2hlQ29udHJvbEhlYWRlcikgfHwg ZXF1YWxJZ25vcmluZ0Nhc2UobmFtZSwgcHJhZ21hSGVhZGVyKSkKKyAgICAgICAgYnJlYWs7CisK KyAgICBjYXNlIEhUVFBIZWFkZXJOYW1lOjpDYWNoZUNvbnRyb2w6CisgICAgY2FzZSBIVFRQSGVh ZGVyTmFtZTo6UHJhZ21hOgogICAgICAgICBtX2hhdmVQYXJzZWRDYWNoZUNvbnRyb2xIZWFkZXIg PSBmYWxzZTsKLSAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShuYW1lLCBkYXRlSGVhZGVy KSkKKyAgICAgICAgYnJlYWs7CisKKyAgICBjYXNlIEhUVFBIZWFkZXJOYW1lOjpEYXRlOgogICAg ICAgICBtX2hhdmVQYXJzZWREYXRlSGVhZGVyID0gZmFsc2U7Ci0gICAgZWxzZSBpZiAoZXF1YWxJ Z25vcmluZ0Nhc2UobmFtZSwgZXhwaXJlc0hlYWRlcikpCisgICAgICAgIGJyZWFrOworCisgICAg Y2FzZSBIVFRQSGVhZGVyTmFtZTo6RXhwaXJlczoKICAgICAgICAgbV9oYXZlUGFyc2VkRXhwaXJl c0hlYWRlciA9IGZhbHNlOwotICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKG5hbWUsIGxh c3RNb2RpZmllZEhlYWRlcikpCisgICAgICAgIGJyZWFrOworCisgICAgY2FzZSBIVFRQSGVhZGVy TmFtZTo6TGFzdE1vZGlmaWVkOgogICAgICAgICBtX2hhdmVQYXJzZWRMYXN0TW9kaWZpZWRIZWFk ZXIgPSBmYWxzZTsKKyAgICAgICAgYnJlYWs7CisKKyAgICBkZWZhdWx0OgorICAgICAgICBicmVh azsKKyAgICB9CiB9CiAKIHZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnNldEhUVFBIZWFkZXJG aWVsZChjb25zdCBBdG9taWNTdHJpbmcmIG5hbWUsIGNvbnN0IFN0cmluZyYgdmFsdWUpCiB7CiAg ICAgbGF6eUluaXQoQ29tbW9uQW5kVW5jb21tb25GaWVsZHMpOwogCi0gICAgdXBkYXRlSGVhZGVy UGFyc2VkU3RhdGUobmFtZSk7CisgICAgSFRUUEhlYWRlck5hbWUgaGVhZGVyTmFtZTsKKyAgICBp ZiAoZmluZEhUVFBIZWFkZXJOYW1lKG5hbWUuc3RyaW5nKCksIGhlYWRlck5hbWUpKQorICAgICAg ICB1cGRhdGVIZWFkZXJQYXJzZWRTdGF0ZShoZWFkZXJOYW1lKTsKIAogICAgIG1faHR0cEhlYWRl ckZpZWxkcy5zZXQobmFtZSwgdmFsdWUpOwogCkBAIC0zMjEsNyArMzMzLDkgQEAgdm9pZCBSZXNv dXJjZVJlc3BvbnNlQmFzZTo6YWRkSFRUUEhlYWRlckZpZWxkKGNvbnN0IEF0b21pY1N0cmluZyYg bmFtZSwgY29uc3QgU3QKIHsKICAgICBsYXp5SW5pdChDb21tb25BbmRVbmNvbW1vbkZpZWxkcyk7 CiAKLSAgICB1cGRhdGVIZWFkZXJQYXJzZWRTdGF0ZShuYW1lKTsKKyAgICBIVFRQSGVhZGVyTmFt ZSBoZWFkZXJOYW1lOworICAgIGlmIChmaW5kSFRUUEhlYWRlck5hbWUobmFtZS5zdHJpbmcoKSwg aGVhZGVyTmFtZSkpCisgICAgICAgIHVwZGF0ZUhlYWRlclBhcnNlZFN0YXRlKGhlYWRlck5hbWUp OwogCiAgICAgbV9odHRwSGVhZGVyRmllbGRzLmFkZChuYW1lLCB2YWx1ZSk7CiB9CkBAIC0zNDUs MTMgKzM1OSw3IEBAIHZvaWQgUmVzb3VyY2VSZXNwb25zZUJhc2U6OnBhcnNlQ2FjaGVDb250cm9s RGlyZWN0aXZlcygpIGNvbnN0CiAgICAgbV9jYWNoZUNvbnRyb2xDb250YWluc05vQ2FjaGUgPSBm YWxzZTsKICAgICBtX2NhY2hlQ29udHJvbE1heEFnZSA9IHN0ZDo6bnVtZXJpY19saW1pdHM8ZG91 YmxlPjo6cXVpZXRfTmFOKCk7CiAKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo Y29uc3QgQXRvbWljU3RyaW5nLCBjYWNoZUNvbnRyb2xTdHJpbmcsICgiY2FjaGUtY29udHJvbCIs IEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICBERVBSRUNBVEVEX0RF RklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBub0NhY2hlRGlyZWN0aXZlLCAo Im5vLWNhY2hlIiwgQXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIERF UFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIG5vU3RvcmVE aXJlY3RpdmUsICgibm8tc3RvcmUiLCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFs KSk7Ci0gICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0IEF0b21pY1N0cmlu ZywgbXVzdFJldmFsaWRhdGVEaXJlY3RpdmUsICgibXVzdC1yZXZhbGlkYXRlIiwgQXRvbWljU3Ry aW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJ Q19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIG1heEFnZURpcmVjdGl2ZSwgKCJtYXgtYWdlIiwg QXRvbWljU3RyaW5nOjpDb25zdHJ1Y3RGcm9tTGl0ZXJhbCkpOwotCi0gICAgU3RyaW5nIGNhY2hl Q29udHJvbFZhbHVlID0gbV9odHRwSGVhZGVyRmllbGRzLmdldChjYWNoZUNvbnRyb2xTdHJpbmcp OworICAgIFN0cmluZyBjYWNoZUNvbnRyb2xWYWx1ZSA9IG1faHR0cEhlYWRlckZpZWxkcy5nZXQo SFRUUEhlYWRlck5hbWU6OkNhY2hlQ29udHJvbCk7CiAgICAgaWYgKCFjYWNoZUNvbnRyb2xWYWx1 ZS5pc0VtcHR5KCkpIHsKICAgICAgICAgVmVjdG9yPHN0ZDo6cGFpcjxTdHJpbmcsIFN0cmluZz4+ IGRpcmVjdGl2ZXM7CiAgICAgICAgIHBhcnNlQ2FjaGVIZWFkZXIoY2FjaGVDb250cm9sVmFsdWUs IGRpcmVjdGl2ZXMpOwpAQCAtMzYwLDEzICszNjgsMTMgQEAgdm9pZCBSZXNvdXJjZVJlc3BvbnNl QmFzZTo6cGFyc2VDYWNoZUNvbnRyb2xEaXJlY3RpdmVzKCkgY29uc3QKICAgICAgICAgZm9yIChz aXplX3QgaSA9IDA7IGkgPCBkaXJlY3RpdmVzU2l6ZTsgKytpKSB7CiAgICAgICAgICAgICAvLyBS RkMyNjE2IDE0LjkuMTogQSBuby1jYWNoZSBkaXJlY3RpdmUgd2l0aCBhIHZhbHVlIGlzIG9ubHkg bWVhbmluZ2Z1bCBmb3IgcHJveHkgY2FjaGVzLgogICAgICAgICAgICAgLy8gSXQgc2hvdWxkIGJl IGlnbm9yZWQgYnkgYSBicm93c2VyIGxldmVsIGNhY2hlLgotICAgICAgICAgICAgaWYgKGVxdWFs SWdub3JpbmdDYXNlKGRpcmVjdGl2ZXNbaV0uZmlyc3QsIG5vQ2FjaGVEaXJlY3RpdmUpICYmIGRp cmVjdGl2ZXNbaV0uc2Vjb25kLmlzRW1wdHkoKSkKKyAgICAgICAgICAgIGlmIChlcXVhbElnbm9y aW5nQ2FzZShkaXJlY3RpdmVzW2ldLmZpcnN0LCAibm8tY2FjaGUiKSAmJiBkaXJlY3RpdmVzW2ld LnNlY29uZC5pc0VtcHR5KCkpCiAgICAgICAgICAgICAgICAgbV9jYWNoZUNvbnRyb2xDb250YWlu c05vQ2FjaGUgPSB0cnVlOwotICAgICAgICAgICAgZWxzZSBpZiAoZXF1YWxJZ25vcmluZ0Nhc2Uo ZGlyZWN0aXZlc1tpXS5maXJzdCwgbm9TdG9yZURpcmVjdGl2ZSkpCisgICAgICAgICAgICBlbHNl IGlmIChlcXVhbElnbm9yaW5nQ2FzZShkaXJlY3RpdmVzW2ldLmZpcnN0LCAibm8tc3RvcmUiKSkK ICAgICAgICAgICAgICAgICBtX2NhY2hlQ29udHJvbENvbnRhaW5zTm9TdG9yZSA9IHRydWU7Ci0g ICAgICAgICAgICBlbHNlIGlmIChlcXVhbElnbm9yaW5nQ2FzZShkaXJlY3RpdmVzW2ldLmZpcnN0 LCBtdXN0UmV2YWxpZGF0ZURpcmVjdGl2ZSkpCisgICAgICAgICAgICBlbHNlIGlmIChlcXVhbEln bm9yaW5nQ2FzZShkaXJlY3RpdmVzW2ldLmZpcnN0LCAibXVzdC1yZXZhbGlkYXRlIikpCiAgICAg ICAgICAgICAgICAgbV9jYWNoZUNvbnRyb2xDb250YWluc011c3RSZXZhbGlkYXRlID0gdHJ1ZTsK LSAgICAgICAgICAgIGVsc2UgaWYgKGVxdWFsSWdub3JpbmdDYXNlKGRpcmVjdGl2ZXNbaV0uZmly c3QsIG1heEFnZURpcmVjdGl2ZSkpIHsKKyAgICAgICAgICAgIGVsc2UgaWYgKGVxdWFsSWdub3Jp bmdDYXNlKGRpcmVjdGl2ZXNbaV0uZmlyc3QsICJtYXgtYWdlIikpIHsKICAgICAgICAgICAgICAg ICBpZiAoIXN0ZDo6aXNuYW4obV9jYWNoZUNvbnRyb2xNYXhBZ2UpKSB7CiAgICAgICAgICAgICAg ICAgICAgIC8vIEZpcnN0IG1heC1hZ2UgZGlyZWN0aXZlIHdpbnMgaWYgdGhlcmUgYXJlIG11bHRp cGxlIG9uZXMuCiAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlOwpAQCAtMzgzLDEwICszOTEs OSBAQCB2b2lkIFJlc291cmNlUmVzcG9uc2VCYXNlOjpwYXJzZUNhY2hlQ29udHJvbERpcmVjdGl2 ZXMoKSBjb25zdAogICAgICAgICAvLyBIYW5kbGUgUHJhZ21hOiBuby1jYWNoZQogICAgICAgICAv LyBUaGlzIGlzIGRlcHJlY2F0ZWQgYW5kIGVxdWl2YWxlbnQgdG8gQ2FjaGUtY29udHJvbDogbm8t Y2FjaGUKICAgICAgICAgLy8gRG9uJ3QgYm90aGVyIHRva2VuaXppbmcgdGhlIHZhbHVlLCBpdCBp cyBub3QgaW1wb3J0YW50Ci0gICAgICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChj b25zdCBBdG9taWNTdHJpbmcsIHByYWdtYUhlYWRlciwgKCJwcmFnbWEiLCBBdG9taWNTdHJpbmc6 OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0gICAgICAgIFN0cmluZyBwcmFnbWFWYWx1ZSA9IG1f aHR0cEhlYWRlckZpZWxkcy5nZXQocHJhZ21hSGVhZGVyKTsKKyAgICAgICAgU3RyaW5nIHByYWdt YVZhbHVlID0gbV9odHRwSGVhZGVyRmllbGRzLmdldChIVFRQSGVhZGVyTmFtZTo6UHJhZ21hKTsK IAotICAgICAgICBtX2NhY2hlQ29udHJvbENvbnRhaW5zTm9DYWNoZSA9IHByYWdtYVZhbHVlLmxv d2VyKCkuY29udGFpbnMobm9DYWNoZURpcmVjdGl2ZSk7CisgICAgICAgIG1fY2FjaGVDb250cm9s Q29udGFpbnNOb0NhY2hlID0gcHJhZ21hVmFsdWUuY29udGFpbnMoIm5vLWNhY2hlIiwgZmFsc2Up OwogICAgIH0KIH0KICAgICAKQEAgLTQxNSw5ICs0MjIsNyBAQCBib29sIFJlc291cmNlUmVzcG9u c2VCYXNlOjpoYXNDYWNoZVZhbGlkYXRvckZpZWxkcygpIGNvbnN0CiB7CiAgICAgbGF6eUluaXQo Q29tbW9uRmllbGRzT25seSk7CiAKLSAgICBERVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwo Y29uc3QgQXRvbWljU3RyaW5nLCBsYXN0TW9kaWZpZWRIZWFkZXIsICgibGFzdC1tb2RpZmllZCIs IEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICBERVBSRUNBVEVEX0RF RklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBlVGFnSGVhZGVyLCAoImV0YWci LCBBdG9taWNTdHJpbmc6OkNvbnN0cnVjdEZyb21MaXRlcmFsKSk7Ci0gICAgcmV0dXJuICFtX2h0 dHBIZWFkZXJGaWVsZHMuZ2V0KGxhc3RNb2RpZmllZEhlYWRlcikuaXNFbXB0eSgpIHx8ICFtX2h0 dHBIZWFkZXJGaWVsZHMuZ2V0KGVUYWdIZWFkZXIpLmlzRW1wdHkoKTsKKyAgICByZXR1cm4gIW1f aHR0cEhlYWRlckZpZWxkcy5nZXQoSFRUUEhlYWRlck5hbWU6Okxhc3RNb2RpZmllZCkuaXNFbXB0 eSgpIHx8ICFtX2h0dHBIZWFkZXJGaWVsZHMuZ2V0KEhUVFBIZWFkZXJOYW1lOjpFVGFnKS5pc0Vt cHR5KCk7CiB9CiAKIGRvdWJsZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6Y2FjaGVDb250cm9sTWF4 QWdlKCkgY29uc3QKQEAgLTQyNyw3ICs0MzIsNyBAQCBkb3VibGUgUmVzb3VyY2VSZXNwb25zZUJh c2U6OmNhY2hlQ29udHJvbE1heEFnZSgpIGNvbnN0CiAgICAgcmV0dXJuIG1fY2FjaGVDb250cm9s TWF4QWdlOwogfQogCi1zdGF0aWMgZG91YmxlIHBhcnNlRGF0ZVZhbHVlSW5IZWFkZXIoY29uc3Qg SFRUUEhlYWRlck1hcCYgaGVhZGVycywgY29uc3QgQXRvbWljU3RyaW5nJiBoZWFkZXJOYW1lKQor c3RhdGljIGRvdWJsZSBwYXJzZURhdGVWYWx1ZUluSGVhZGVyKGNvbnN0IEhUVFBIZWFkZXJNYXAm IGhlYWRlcnMsIEhUVFBIZWFkZXJOYW1lIGhlYWRlck5hbWUpCiB7CiAgICAgU3RyaW5nIGhlYWRl clZhbHVlID0gaGVhZGVycy5nZXQoaGVhZGVyTmFtZSk7CiAgICAgaWYgKGhlYWRlclZhbHVlLmlz RW1wdHkoKSkKQEAgLTQ0Nyw4ICs0NTIsNyBAQCBkb3VibGUgUmVzb3VyY2VSZXNwb25zZUJhc2U6 OmRhdGUoKSBjb25zdAogICAgIGxhenlJbml0KENvbW1vbkZpZWxkc09ubHkpOwogCiAgICAgaWYg KCFtX2hhdmVQYXJzZWREYXRlSGVhZGVyKSB7Ci0gICAgICAgIERFUFJFQ0FURURfREVGSU5FX1NU QVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJpbmcsIGhlYWRlck5hbWUsICgiZGF0ZSIsIEF0b21p Y1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICAgICAgbV9kYXRlID0gcGFyc2VE YXRlVmFsdWVJbkhlYWRlcihtX2h0dHBIZWFkZXJGaWVsZHMsIGhlYWRlck5hbWUpOworICAgICAg ICBtX2RhdGUgPSBwYXJzZURhdGVWYWx1ZUluSGVhZGVyKG1faHR0cEhlYWRlckZpZWxkcywgSFRU UEhlYWRlck5hbWU6OkRhdGUpOwogICAgICAgICBtX2hhdmVQYXJzZWREYXRlSGVhZGVyID0gdHJ1 ZTsKICAgICB9CiAgICAgcmV0dXJuIG1fZGF0ZTsKQEAgLTQ1OSw4ICs0NjMsNyBAQCBkb3VibGUg UmVzb3VyY2VSZXNwb25zZUJhc2U6OmFnZSgpIGNvbnN0CiAgICAgbGF6eUluaXQoQ29tbW9uRmll bGRzT25seSk7CiAKICAgICBpZiAoIW1faGF2ZVBhcnNlZEFnZUhlYWRlcikgewotICAgICAgICBE RVBSRUNBVEVEX0RFRklORV9TVEFUSUNfTE9DQUwoY29uc3QgQXRvbWljU3RyaW5nLCBoZWFkZXJO YW1lLCAoImFnZSIsIEF0b21pY1N0cmluZzo6Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICAg ICAgU3RyaW5nIGhlYWRlclZhbHVlID0gbV9odHRwSGVhZGVyRmllbGRzLmdldChoZWFkZXJOYW1l KTsKKyAgICAgICAgU3RyaW5nIGhlYWRlclZhbHVlID0gbV9odHRwSGVhZGVyRmllbGRzLmdldChI VFRQSGVhZGVyTmFtZTo6QWdlKTsKICAgICAgICAgYm9vbCBvazsKICAgICAgICAgbV9hZ2UgPSBo ZWFkZXJWYWx1ZS50b0RvdWJsZSgmb2spOwogICAgICAgICBpZiAoIW9rKQpAQCAtNDc1LDggKzQ3 OCw3IEBAIGRvdWJsZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6ZXhwaXJlcygpIGNvbnN0CiAgICAg bGF6eUluaXQoQ29tbW9uRmllbGRzT25seSk7CiAKICAgICBpZiAoIW1faGF2ZVBhcnNlZEV4cGly ZXNIZWFkZXIpIHsKLSAgICAgICAgREVQUkVDQVRFRF9ERUZJTkVfU1RBVElDX0xPQ0FMKGNvbnN0 IEF0b21pY1N0cmluZywgaGVhZGVyTmFtZSwgKCJleHBpcmVzIiwgQXRvbWljU3RyaW5nOjpDb25z dHJ1Y3RGcm9tTGl0ZXJhbCkpOwotICAgICAgICBtX2V4cGlyZXMgPSBwYXJzZURhdGVWYWx1ZUlu SGVhZGVyKG1faHR0cEhlYWRlckZpZWxkcywgaGVhZGVyTmFtZSk7CisgICAgICAgIG1fZXhwaXJl cyA9IHBhcnNlRGF0ZVZhbHVlSW5IZWFkZXIobV9odHRwSGVhZGVyRmllbGRzLCBIVFRQSGVhZGVy TmFtZTo6RXhwaXJlcyk7CiAgICAgICAgIG1faGF2ZVBhcnNlZEV4cGlyZXNIZWFkZXIgPSB0cnVl OwogICAgIH0KICAgICByZXR1cm4gbV9leHBpcmVzOwpAQCAtNDg3LDggKzQ4OSw3IEBAIGRvdWJs ZSBSZXNvdXJjZVJlc3BvbnNlQmFzZTo6bGFzdE1vZGlmaWVkKCkgY29uc3QKICAgICBsYXp5SW5p dChDb21tb25GaWVsZHNPbmx5KTsKIAogICAgIGlmICghbV9oYXZlUGFyc2VkTGFzdE1vZGlmaWVk SGVhZGVyKSB7Ci0gICAgICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBB dG9taWNTdHJpbmcsIGhlYWRlck5hbWUsICgibGFzdC1tb2RpZmllZCIsIEF0b21pY1N0cmluZzo6 Q29uc3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICAgICAgbV9sYXN0TW9kaWZpZWQgPSBwYXJzZURh dGVWYWx1ZUluSGVhZGVyKG1faHR0cEhlYWRlckZpZWxkcywgaGVhZGVyTmFtZSk7CisgICAgICAg IG1fbGFzdE1vZGlmaWVkID0gcGFyc2VEYXRlVmFsdWVJbkhlYWRlcihtX2h0dHBIZWFkZXJGaWVs ZHMsIEhUVFBIZWFkZXJOYW1lOjpMYXN0TW9kaWZpZWQpOwogICAgICAgICBtX2hhdmVQYXJzZWRM YXN0TW9kaWZpZWRIZWFkZXIgPSB0cnVlOwogICAgIH0KICAgICByZXR1cm4gbV9sYXN0TW9kaWZp ZWQ7CkBAIC00OTgsMTQgKzQ5OSwxMyBAQCBib29sIFJlc291cmNlUmVzcG9uc2VCYXNlOjppc0F0 dGFjaG1lbnQoKSBjb25zdAogewogICAgIGxhenlJbml0KENvbW1vbkFuZFVuY29tbW9uRmllbGRz KTsKIAotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJp bmcsIGhlYWRlck5hbWUsICgiY29udGVudC1kaXNwb3NpdGlvbiIsIEF0b21pY1N0cmluZzo6Q29u c3RydWN0RnJvbUxpdGVyYWwpKTsKLSAgICBTdHJpbmcgdmFsdWUgPSBtX2h0dHBIZWFkZXJGaWVs ZHMuZ2V0KGhlYWRlck5hbWUpOworICAgIFN0cmluZyB2YWx1ZSA9IG1faHR0cEhlYWRlckZpZWxk cy5nZXQoSFRUUEhlYWRlck5hbWU6OkNvbnRlbnREaXNwb3NpdGlvbik7CiAgICAgc2l6ZV90IGxv YyA9IHZhbHVlLmZpbmQoJzsnKTsKICAgICBpZiAobG9jICE9IG5vdEZvdW5kKQogICAgICAgICB2 YWx1ZSA9IHZhbHVlLmxlZnQobG9jKTsKICAgICB2YWx1ZSA9IHZhbHVlLnN0cmlwV2hpdGVTcGFj ZSgpOwotICAgIERFUFJFQ0FURURfREVGSU5FX1NUQVRJQ19MT0NBTChjb25zdCBBdG9taWNTdHJp bmcsIGF0dGFjaG1lbnRTdHJpbmcsICgiYXR0YWNobWVudCIsIEF0b21pY1N0cmluZzo6Q29uc3Ry dWN0RnJvbUxpdGVyYWwpKTsKLSAgICByZXR1cm4gZXF1YWxJZ25vcmluZ0Nhc2UodmFsdWUsIGF0 dGFjaG1lbnRTdHJpbmcpOworCisgICAgcmV0dXJuIGVxdWFsSWdub3JpbmdDYXNlKHZhbHVlLCAi YXR0YWNobWVudCIpOwogfQogICAKIGJvb2wgUmVzb3VyY2VSZXNwb25zZUJhc2U6Ondhc0NhY2hl ZCgpIGNvbnN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlUmVzcG9uc2VCYXNlLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL1Jl c291cmNlUmVzcG9uc2VCYXNlLmgKaW5kZXggOGJkYWRhYmE2MDJlY2EyMDE2ZjhjNGNmNDA1ZGMx N2U5MTBiZDM3ZC4uNTkzYmJjOTU3OTMwNzkxYzMyYjc3NzRmOWRjM2ZiZTU2ZWFmNjkzOSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9SZXNvdXJjZVJlc3BvbnNl QmFzZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXNw b25zZUJhc2UuaApAQCAtMTY4LDcgKzE2OCw3IEBAIHB1YmxpYzoKIHByaXZhdGU6CiAgICAgY29u c3QgUmVzb3VyY2VSZXNwb25zZSYgYXNSZXNvdXJjZVJlc3BvbnNlKCkgY29uc3Q7CiAgICAgdm9p ZCBwYXJzZUNhY2hlQ29udHJvbERpcmVjdGl2ZXMoKSBjb25zdDsKLSAgICB2b2lkIHVwZGF0ZUhl YWRlclBhcnNlZFN0YXRlKGNvbnN0IEF0b21pY1N0cmluZyYgbmFtZSk7CisgICAgdm9pZCB1cGRh dGVIZWFkZXJQYXJzZWRTdGF0ZShIVFRQSGVhZGVyTmFtZSk7CiAKICAgICBtdXRhYmxlIGJvb2wg bV9oYXZlUGFyc2VkQ2FjaGVDb250cm9sSGVhZGVyIDogMTsKICAgICBtdXRhYmxlIGJvb2wgbV9o YXZlUGFyc2VkQWdlSGVhZGVyIDogMTsK