87002 2012-05-21 04:28:33 -0700 SecurityOrigin returns 0 as port when it is the default port for the protocol 2012-05-21 09:47:34 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED WONTFIX P2 Normal --- 1 tmpsantos tmpsantos abarth oldest_to_newest 628955 0 tmpsantos 2012-05-21 04:28:33 -0700 It should return the correct value instead, like 80 for http, 443 for https, etc. 629017 1 143015 tmpsantos 2012-05-21 06:03:10 -0700 Created attachment 143015 Patch 629046 2 143015 buildbot 2012-05-21 06:48:59 -0700 Comment on attachment 143015 Patch Attachment 143015 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12738424 629086 3 143032 tmpsantos 2012-05-21 07:41:32 -0700 Created attachment 143032 Patch 629110 4 143032 buildbot 2012-05-21 08:18:18 -0700 Comment on attachment 143032 Patch Attachment 143032 did not pass mac-ews (mac): Output: http://queues.webkit.org/results/12732663 629165 5 143032 abarth 2012-05-21 09:15:49 -0700 Comment on attachment 143032 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=143032&action=review Please add an API test that shows the change in behavior. These tests are easy to write for Chromium, but you should feel free to write one for a different port if you prefer. Would you be willing to list in this bug which APIs are changing in which port? There's some risk of a compatibility problem. For example, if some client of the API is trying to construct storage identifiers manually, they might get a different answer after this patch... > Source/WebCore/WebCore.order:6589 > +__ZNK7WebCore14SecurityOrigin4portEv You probably need to add this line to WebCore.exp.in to fix the apple-mac build. > Source/WebCore/page/SecurityOrigin.h:68 > - unsigned short port() const { return m_port; } > + unsigned short port() const; I wonder if we should change the name of this function so it doesn't look like an accessor for m_port. Perhaps we should call it portNumber()? 629168 6 abarth 2012-05-21 09:17:22 -0700 It's still slightly unclear to me whether this patch is solving a real problem. We need to balance the risk of changing an API against the benefit of doing so. I don't mind changing this in the Chromium API, but other folks might be more conservative about how they'd like their APIs to evolve. 629182 7 143047 tmpsantos 2012-05-21 09:24:20 -0700 Created attachment 143047 Patch 629208 8 tmpsantos 2012-05-21 09:47:34 -0700 It is too risky to change this method. Should be fixed on the API layer if needed. 143015 2012-05-21 06:03:10 -0700 2012-05-21 07:41:23 -0700 Patch bug-87002-20120521160428.patch text/plain 4525 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRjNTU4ZjNlN2RlODYy ZTJiZGNmZmM3ZWM3ZmQxZWQ0ZmRiMzQwNy4uNDg1ZTQ3YTA0ODk4NWU5ODVlOGIxNTBiOTA1Yzll ZDY1ZDk3OWRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTIxICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgorCisgICAgICAg IFNlY3VyaXR5T3JpZ2luIHJldHVybnMgMCBhcyBwb3J0IHdoZW4gaXQgaXMgdGhlIGRlZmF1bHQg cG9ydCBmb3IgdGhlIHByb3RvY29sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NzAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBpbnRlcm5hbCByZXByZXNlbnRhdGlvbiBmb3IgdGhlIGRlZmF1bHQg cG9ydCBpbnNpZGUgS1VSTCBpcyAwLiBXZQorICAgICAgICBzaG91bGQgbG9va3VwIGZvciB0aGUg cHJvdG9jb2wgYW5kIHJldHVybiB0aGUgY29ycmVjdCB2YWx1ZSBmb3IgcG9ydAorICAgICAgICBp ZiBpdCBpcyBrbm93bi4KKworICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OnBvcnQpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgorICAgICAgICAoU2VjdXJpdHlPcmln aW4pOgorICAgICAgICAqIHBsYXRmb3JtL0tVUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVm YXVsdFBvcnRGb3JQcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OmlzRGVmYXVsdFBvcnRGb3JQcm90b2NvbCk6CisgICAgICAgICogcGxhdGZvcm0vS1VSTC5o OgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDUtMTggIEFuZHJlYXMgS2xpbmcgIDxrbGlu Z0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjExNzUwMSk6IEljb25EYXRhYmFz ZSBhc3NlcnRzIG9uIHN0YXJ0dXAgaW4gc3luY2hyb25vdXNJY29uRm9yUGFnZVVSTCgpLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2Uv V2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAppbmRleCBmNWE4ZjkyY2YwMjkzZmQ3MjJl ZGY5ZWRjNWNjYzM4NmFkNTJiZjgyLi41ODk2OTE5NjE3ZDEwYTU1MDMzNjdlODM5YmQzNWZkMDk2 ZTk1NzY1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtMjA5LDYg KzIwOSwxNCBAQCB2b2lkIFNlY3VyaXR5T3JpZ2luOjpzZXREb21haW5Gcm9tRE9NKGNvbnN0IFN0 cmluZyYgbmV3RG9tYWluKQogICAgIG1fZG9tYWluID0gbmV3RG9tYWluLmxvd2VyKCk7CiB9CiAK K3Vuc2lnbmVkIHNob3J0IFNlY3VyaXR5T3JpZ2luOjpwb3J0KCkgY29uc3QKK3sKKyAgICBpZiAo bV9wb3J0KQorICAgICAgICByZXR1cm4gbV9wb3J0OworCisgICAgcmV0dXJuIGRlZmF1bHRQb3J0 Rm9yUHJvdG9jb2wobV9wcm90b2NvbCk7Cit9CisKIGJvb2wgU2VjdXJpdHlPcmlnaW46OmNhbkFj Y2Vzcyhjb25zdCBTZWN1cml0eU9yaWdpbiogb3RoZXIpIGNvbnN0CiB7CiAgICAgaWYgKG1fdW5p dmVyc2FsQWNjZXNzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9y aWdpbi5oIGIvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCmluZGV4IGQ3Yjlh YTRkOTdkOGVmNWVkZDQzZGVjOGIzMjMyMDU3ZmRhYjI2YTUuLjQ3ZjRlZTA2NjExZTY5NWYyYmMx NTE0NGI2NDNhNzk4ODg1ZmUyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2Vj dXJpdHlPcmlnaW4uaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgK QEAgLTY1LDcgKzY1LDcgQEAgcHVibGljOgogICAgIFN0cmluZyBwcm90b2NvbCgpIGNvbnN0IHsg cmV0dXJuIG1fcHJvdG9jb2w7IH0KICAgICBTdHJpbmcgaG9zdCgpIGNvbnN0IHsgcmV0dXJuIG1f aG9zdDsgfQogICAgIFN0cmluZyBkb21haW4oKSBjb25zdCB7IHJldHVybiBtX2RvbWFpbjsgfQot ICAgIHVuc2lnbmVkIHNob3J0IHBvcnQoKSBjb25zdCB7IHJldHVybiBtX3BvcnQ7IH0KKyAgICB1 bnNpZ25lZCBzaG9ydCBwb3J0KCkgY29uc3Q7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhp cyBTZWN1cml0eU9yaWdpbiBjYW4gc2NyaXB0IG9iamVjdHMgaW4gdGhlIGdpdmVuCiAgICAgLy8g U2VjdXJpdHlPcmlnaW4uIEZvciBleGFtcGxlLCBjYWxsIHRoaXMgZnVuY3Rpb24gYmVmb3JlIGFs bG93aW5nCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuY3BwCmluZGV4IDBiNDZlYzBmYzc2ZjBmNzljODk5 NGNlMzMwYjYwMTMxNWExNGE1MTUuLjI0MmU4YTQ5MjllZGNlMDA4NmVhZmYzNjc3OWNkNjI3MDEy ZGVkYzUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuY3BwCkBAIC0xNzc3LDExICsxNzc3LDggQEAg Ym9vbCBLVVJMOjppc0JsYW5rVVJMKCkgY29uc3QKICAgICByZXR1cm4gcHJvdG9jb2xJcygiYWJv dXQiKTsKIH0KIAotYm9vbCBpc0RlZmF1bHRQb3J0Rm9yUHJvdG9jb2wodW5zaWduZWQgc2hvcnQg cG9ydCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKK3Vuc2lnbmVkIHNob3J0IGRlZmF1bHRQb3J0 Rm9yUHJvdG9jb2woY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIHsKLSAgICBpZiAocHJvdG9jb2wu aXNFbXB0eSgpKQotICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICB0eXBlZGVmIEhhc2hNYXA8 U3RyaW5nLCB1bnNpZ25lZCwgQ2FzZUZvbGRpbmdIYXNoPiBEZWZhdWx0UG9ydHNNYXA7CiAgICAg REVGSU5FX1NUQVRJQ19MT0NBTChEZWZhdWx0UG9ydHNNYXAsIGRlZmF1bHRQb3J0cywgKCkpOwog ICAgIGlmIChkZWZhdWx0UG9ydHMuaXNFbXB0eSgpKSB7CkBAIC0xNzg5LDggKzE3ODYsMTkgQEAg Ym9vbCBpc0RlZmF1bHRQb3J0Rm9yUHJvdG9jb2wodW5zaWduZWQgc2hvcnQgcG9ydCwgY29uc3Qg U3RyaW5nJiBwcm90b2NvbCkKICAgICAgICAgZGVmYXVsdFBvcnRzLnNldCgiaHR0cHMiLCA0NDMp OwogICAgICAgICBkZWZhdWx0UG9ydHMuc2V0KCJmdHAiLCAyMSk7CiAgICAgICAgIGRlZmF1bHRQ b3J0cy5zZXQoImZ0cHMiLCA5OTApOworICAgICAgICBkZWZhdWx0UG9ydHMuc2V0KCJ3cyIsIDgw KTsKKyAgICAgICAgZGVmYXVsdFBvcnRzLnNldCgid3NzIiwgNDQzKTsKKyAgICAgICAgZGVmYXVs dFBvcnRzLnNldCgiZ29waGVyIiwgNzApOwogICAgIH0KLSAgICByZXR1cm4gZGVmYXVsdFBvcnRz LmdldChwcm90b2NvbCkgPT0gcG9ydDsKKyAgICByZXR1cm4gZGVmYXVsdFBvcnRzLmdldChwcm90 b2NvbCk7Cit9CisKK2Jvb2wgaXNEZWZhdWx0UG9ydEZvclByb3RvY29sKHVuc2lnbmVkIHNob3J0 IHBvcnQsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpCit7CisgICAgaWYgKHByb3RvY29sLmlzRW1w dHkoKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGRlZmF1bHRQb3J0Rm9y UHJvdG9jb2wocHJvdG9jb2wpID09IHBvcnQ7CiB9CiAKIGJvb2wgcG9ydEFsbG93ZWQoY29uc3Qg S1VSTCYgdXJsKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5oIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5oCmluZGV4IGVlNjdlMTZmYzlmMDRjMzQ0NmEx NzZiOWQ0ZjZkOTVmNDNiMWEwNmEuLjE4YmY4ZjM1YzVjODVjYmMwOWQxNTViNTE0M2U5NmUwZGU0 YjIyZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaAorKysgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgKQEAgLTI4NSw2ICsyODUsNyBAQCBjb25zdCBL VVJMJiBibGFua1VSTCgpOwogYm9vbCBwcm90b2NvbElzKGNvbnN0IFN0cmluZyYgdXJsLCBjb25z dCBjaGFyKiBwcm90b2NvbCk7CiBib29sIHByb3RvY29sSXNKYXZhU2NyaXB0KGNvbnN0IFN0cmlu ZyYgdXJsKTsKIAordW5zaWduZWQgc2hvcnQgZGVmYXVsdFBvcnRGb3JQcm90b2NvbChjb25zdCBT dHJpbmcmIHByb3RvY29sKTsKIGJvb2wgaXNEZWZhdWx0UG9ydEZvclByb3RvY29sKHVuc2lnbmVk IHNob3J0IHBvcnQsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpOwogYm9vbCBwb3J0QWxsb3dlZChj b25zdCBLVVJMJik7IC8vIEJsYWNrbGlzdCBwb3J0cyB0aGF0IHNob3VsZCBuZXZlciBiZSB1c2Vk IGZvciBXZWIgcmVzb3VyY2VzLgogCg== 143032 2012-05-21 07:41:32 -0700 2012-05-21 09:24:10 -0700 Patch bug-87002-20120521174250.patch text/plain 5334 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRjNTU4ZjNlN2RlODYy ZTJiZGNmZmM3ZWM3ZmQxZWQ0ZmRiMzQwNy4uNDg1ZTQ3YTA0ODk4NWU5ODVlOGIxNTBiOTA1Yzll ZDY1ZDk3OWRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTIxICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgorCisgICAgICAg IFNlY3VyaXR5T3JpZ2luIHJldHVybnMgMCBhcyBwb3J0IHdoZW4gaXQgaXMgdGhlIGRlZmF1bHQg cG9ydCBmb3IgdGhlIHByb3RvY29sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NzAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBpbnRlcm5hbCByZXByZXNlbnRhdGlvbiBmb3IgdGhlIGRlZmF1bHQg cG9ydCBpbnNpZGUgS1VSTCBpcyAwLiBXZQorICAgICAgICBzaG91bGQgbG9va3VwIGZvciB0aGUg cHJvdG9jb2wgYW5kIHJldHVybiB0aGUgY29ycmVjdCB2YWx1ZSBmb3IgcG9ydAorICAgICAgICBp ZiBpdCBpcyBrbm93bi4KKworICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OnBvcnQpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgorICAgICAgICAoU2VjdXJpdHlPcmln aW4pOgorICAgICAgICAqIHBsYXRmb3JtL0tVUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVm YXVsdFBvcnRGb3JQcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OmlzRGVmYXVsdFBvcnRGb3JQcm90b2NvbCk6CisgICAgICAgICogcGxhdGZvcm0vS1VSTC5o OgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDUtMTggIEFuZHJlYXMgS2xpbmcgIDxrbGlu Z0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjExNzUwMSk6IEljb25EYXRhYmFz ZSBhc3NlcnRzIG9uIHN0YXJ0dXAgaW4gc3luY2hyb25vdXNJY29uRm9yUGFnZVVSTCgpLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlciBiL1NvdXJjZS9XZWJDb3JlL1dl YkNvcmUub3JkZXIKaW5kZXggMmRjM2UzMjNhM2E1YjYzZWU1M2Q4MzE1MjE1ODlkMmQyY2M4YTAw MC4uZTgwOGM0NjFlMDFmYWNiMWRiYWU2YjdjNWRmNzE0YjMzNWE1NjYwOCAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRlcgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lm9yZGVyCkBAIC02NTg2LDYgKzY1ODYsNyBAQCBfX1pOSzdXZWJDb3JlMjFDb250ZW50U2VjdXJp dHlQb2xpY3kyNWFsbG93Q2hpbGRGcmFtZUZyb21Tb3VyY2VFUktOU180S1VSTEUKIF9fWk5LN1dl YkNvcmU5RnJhbWVUcmVlMTV1bmlxdWVDaGlsZE5hbWVFUktOM1dURjEyQXRvbWljU3RyaW5nRQog X19aTjdXZWJDb3JlOUZyYW1lVHJlZTExYXBwZW5kQ2hpbGRFTjNXVEYxMFBhc3NSZWZQdHJJTlNf NUZyYW1lRUVFCiBfX1pON1dlYkNvcmU5RnJhbWVUcmVlMTlhY3R1YWxseUFwcGVuZENoaWxkRU4z V1RGMTBQYXNzUmVmUHRySU5TXzVGcmFtZUVFRQorX19aTks3V2ViQ29yZTE0U2VjdXJpdHlPcmln aW40cG9ydEV2CiBfX1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjljYW5BY2Nlc3NFUEtTMF8K IF9fWk43V2ViQ29yZTE5VGV4dFJlc291cmNlRGVjb2RlcjExc2V0RW5jb2RpbmdFUktOU18xMlRl eHRFbmNvZGluZ0VOUzBfMTRFbmNvZGluZ1NvdXJjZUUKIF9fWk43V2ViQ29yZTExRnJhbWVMb2Fk ZXIyMWxvYWRVUkxJbnRvQ2hpbGRGcmFtZUVSS05TXzRLVVJMRVJLTjNXVEY2U3RyaW5nRVBOU181 RnJhbWVFCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwCmluZGV4IGY1YThmOTJj ZjAyOTNmZDcyMmVkZjllZGM1Y2NjMzg2YWQ1MmJmODIuLjU4OTY5MTk2MTdkMTBhNTUwMzM2N2U4 MzliZDM1ZmQwOTZlOTU3NjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJp dHlPcmlnaW4uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4uY3Bw CkBAIC0yMDksNiArMjA5LDE0IEBAIHZvaWQgU2VjdXJpdHlPcmlnaW46OnNldERvbWFpbkZyb21E T00oY29uc3QgU3RyaW5nJiBuZXdEb21haW4pCiAgICAgbV9kb21haW4gPSBuZXdEb21haW4ubG93 ZXIoKTsKIH0KIAordW5zaWduZWQgc2hvcnQgU2VjdXJpdHlPcmlnaW46OnBvcnQoKSBjb25zdAor eworICAgIGlmIChtX3BvcnQpCisgICAgICAgIHJldHVybiBtX3BvcnQ7CisKKyAgICByZXR1cm4g ZGVmYXVsdFBvcnRGb3JQcm90b2NvbChtX3Byb3RvY29sKTsKK30KKwogYm9vbCBTZWN1cml0eU9y aWdpbjo6Y2FuQWNjZXNzKGNvbnN0IFNlY3VyaXR5T3JpZ2luKiBvdGhlcikgY29uc3QKIHsKICAg ICBpZiAobV91bml2ZXJzYWxBY2Nlc3MpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NlY3VyaXR5T3JpZ2luLmggYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgK aW5kZXggZDdiOWFhNGQ5N2Q4ZWY1ZWRkNDNkZWM4YjMyMzIwNTdmZGFiMjZhNS4uNDdmNGVlMDY2 MTFlNjk1ZjJiYzE1MTQ0YjY0M2E3OTg4ODVmZTJhNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNv cmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJp dHlPcmlnaW4uaApAQCAtNjUsNyArNjUsNyBAQCBwdWJsaWM6CiAgICAgU3RyaW5nIHByb3RvY29s KCkgY29uc3QgeyByZXR1cm4gbV9wcm90b2NvbDsgfQogICAgIFN0cmluZyBob3N0KCkgY29uc3Qg eyByZXR1cm4gbV9ob3N0OyB9CiAgICAgU3RyaW5nIGRvbWFpbigpIGNvbnN0IHsgcmV0dXJuIG1f ZG9tYWluOyB9Ci0gICAgdW5zaWduZWQgc2hvcnQgcG9ydCgpIGNvbnN0IHsgcmV0dXJuIG1fcG9y dDsgfQorICAgIHVuc2lnbmVkIHNob3J0IHBvcnQoKSBjb25zdDsKIAogICAgIC8vIFJldHVybnMg dHJ1ZSBpZiB0aGlzIFNlY3VyaXR5T3JpZ2luIGNhbiBzY3JpcHQgb2JqZWN0cyBpbiB0aGUgZ2l2 ZW4KICAgICAvLyBTZWN1cml0eU9yaWdpbi4gRm9yIGV4YW1wbGUsIGNhbGwgdGhpcyBmdW5jdGlv biBiZWZvcmUgYWxsb3dpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tV UkwuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5jcHAKaW5kZXggMGI0NmVjMGZj NzZmMGY3OWM4OTk0Y2UzMzBiNjAxMzE1YTE0YTUxNS4uMjQyZThhNDkyOWVkY2UwMDg2ZWFmZjM2 Nzc5Y2Q2MjcwMTJkZWRjNSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VS TC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5jcHAKQEAgLTE3NzcsMTEg KzE3NzcsOCBAQCBib29sIEtVUkw6OmlzQmxhbmtVUkwoKSBjb25zdAogICAgIHJldHVybiBwcm90 b2NvbElzKCJhYm91dCIpOwogfQogCi1ib29sIGlzRGVmYXVsdFBvcnRGb3JQcm90b2NvbCh1bnNp Z25lZCBzaG9ydCBwb3J0LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQordW5zaWduZWQgc2hvcnQg ZGVmYXVsdFBvcnRGb3JQcm90b2NvbChjb25zdCBTdHJpbmcmIHByb3RvY29sKQogewotICAgIGlm IChwcm90b2NvbC5pc0VtcHR5KCkpCi0gICAgICAgIHJldHVybiBmYWxzZTsKLQogICAgIHR5cGVk ZWYgSGFzaE1hcDxTdHJpbmcsIHVuc2lnbmVkLCBDYXNlRm9sZGluZ0hhc2g+IERlZmF1bHRQb3J0 c01hcDsKICAgICBERUZJTkVfU1RBVElDX0xPQ0FMKERlZmF1bHRQb3J0c01hcCwgZGVmYXVsdFBv cnRzLCAoKSk7CiAgICAgaWYgKGRlZmF1bHRQb3J0cy5pc0VtcHR5KCkpIHsKQEAgLTE3ODksOCAr MTc4NiwxOSBAQCBib29sIGlzRGVmYXVsdFBvcnRGb3JQcm90b2NvbCh1bnNpZ25lZCBzaG9ydCBw b3J0LCBjb25zdCBTdHJpbmcmIHByb3RvY29sKQogICAgICAgICBkZWZhdWx0UG9ydHMuc2V0KCJo dHRwcyIsIDQ0Myk7CiAgICAgICAgIGRlZmF1bHRQb3J0cy5zZXQoImZ0cCIsIDIxKTsKICAgICAg ICAgZGVmYXVsdFBvcnRzLnNldCgiZnRwcyIsIDk5MCk7CisgICAgICAgIGRlZmF1bHRQb3J0cy5z ZXQoIndzIiwgODApOworICAgICAgICBkZWZhdWx0UG9ydHMuc2V0KCJ3c3MiLCA0NDMpOworICAg ICAgICBkZWZhdWx0UG9ydHMuc2V0KCJnb3BoZXIiLCA3MCk7CiAgICAgfQotICAgIHJldHVybiBk ZWZhdWx0UG9ydHMuZ2V0KHByb3RvY29sKSA9PSBwb3J0OworICAgIHJldHVybiBkZWZhdWx0UG9y dHMuZ2V0KHByb3RvY29sKTsKK30KKworYm9vbCBpc0RlZmF1bHRQb3J0Rm9yUHJvdG9jb2wodW5z aWduZWQgc2hvcnQgcG9ydCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCkKK3sKKyAgICBpZiAocHJv dG9jb2wuaXNFbXB0eSgpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1cm4gZGVm YXVsdFBvcnRGb3JQcm90b2NvbChwcm90b2NvbCkgPT0gcG9ydDsKIH0KIAogYm9vbCBwb3J0QWxs b3dlZChjb25zdCBLVVJMJiB1cmwpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9LVVJMLmggYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmgKaW5kZXggZWU2N2UxNmZj OWYwNGMzNDQ2YTE3NmI5ZDRmNmQ5NWY0M2IxYTA2YS4uMThiZjhmMzVjNWM4NWNiYzA5ZDE1NWI1 MTQzZTk2ZTBkZTRiMjJmNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VS TC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaApAQCAtMjg1LDYgKzI4NSw3 IEBAIGNvbnN0IEtVUkwmIGJsYW5rVVJMKCk7CiBib29sIHByb3RvY29sSXMoY29uc3QgU3RyaW5n JiB1cmwsIGNvbnN0IGNoYXIqIHByb3RvY29sKTsKIGJvb2wgcHJvdG9jb2xJc0phdmFTY3JpcHQo Y29uc3QgU3RyaW5nJiB1cmwpOwogCit1bnNpZ25lZCBzaG9ydCBkZWZhdWx0UG9ydEZvclByb3Rv Y29sKGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpOwogYm9vbCBpc0RlZmF1bHRQb3J0Rm9yUHJvdG9j b2wodW5zaWduZWQgc2hvcnQgcG9ydCwgY29uc3QgU3RyaW5nJiBwcm90b2NvbCk7CiBib29sIHBv cnRBbGxvd2VkKGNvbnN0IEtVUkwmKTsgLy8gQmxhY2tsaXN0IHBvcnRzIHRoYXQgc2hvdWxkIG5l dmVyIGJlIHVzZWQgZm9yIFdlYiByZXNvdXJjZXMuCiAK 143047 2012-05-21 09:24:20 -0700 2012-05-21 09:25:43 -0700 Patch bug-87002-20120521192538.patch text/plain 6508 tmpsantos U3VidmVyc2lvbiBSZXZpc2lvbjogMTE3NzQ0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWRjNTU4ZjNlN2RlODYy ZTJiZGNmZmM3ZWM3ZmQxZWQ0ZmRiMzQwNy4uNDg1ZTQ3YTA0ODk4NWU5ODVlOGIxNTBiOTA1Yzll ZDY1ZDk3OWRmNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA1LTIxICBUaGlh Z28gTWFyY29zIFAuIFNhbnRvcyAgPHRoaWFnby5zYW50b3NAaW50ZWwuY29tPgorCisgICAgICAg IFNlY3VyaXR5T3JpZ2luIHJldHVybnMgMCBhcyBwb3J0IHdoZW4gaXQgaXMgdGhlIGRlZmF1bHQg cG9ydCBmb3IgdGhlIHByb3RvY29sCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD04NzAwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgIFRoZSBpbnRlcm5hbCByZXByZXNlbnRhdGlvbiBmb3IgdGhlIGRlZmF1bHQg cG9ydCBpbnNpZGUgS1VSTCBpcyAwLiBXZQorICAgICAgICBzaG91bGQgbG9va3VwIGZvciB0aGUg cHJvdG9jb2wgYW5kIHJldHVybiB0aGUgY29ycmVjdCB2YWx1ZSBmb3IgcG9ydAorICAgICAgICBp ZiBpdCBpcyBrbm93bi4KKworICAgICAgICAqIHBhZ2UvU2VjdXJpdHlPcmlnaW4uY3BwOgorICAg ICAgICAoV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW46OnBvcnQpOgorICAgICAgICAoV2ViQ29yZSk6 CisgICAgICAgICogcGFnZS9TZWN1cml0eU9yaWdpbi5oOgorICAgICAgICAoU2VjdXJpdHlPcmln aW4pOgorICAgICAgICAqIHBsYXRmb3JtL0tVUkwuY3BwOgorICAgICAgICAoV2ViQ29yZTo6ZGVm YXVsdFBvcnRGb3JQcm90b2NvbCk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNv cmU6OmlzRGVmYXVsdFBvcnRGb3JQcm90b2NvbCk6CisgICAgICAgICogcGxhdGZvcm0vS1VSTC5o OgorICAgICAgICAoV2ViQ29yZSk6CisKIDIwMTItMDUtMTggIEFuZHJlYXMgS2xpbmcgIDxrbGlu Z0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJFR1JFU1NJT04ocjExNzUwMSk6IEljb25EYXRhYmFz ZSBhc3NlcnRzIG9uIHN0YXJ0dXAgaW4gc3luY2hyb25vdXNJY29uRm9yUGFnZVVSTCgpLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmV4cC5pbgppbmRleCAxODkwZGI2ODYyOWQwZmYzZjg5ZGRkYWUxYzYxZGZiMWU0Mjg4 YWVlLi42MTA0OTkzODdmY2NmMmU5N2U0MzE2ZDM2NWM2ZTI3YmMwNzg0MjJlIDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgpAQCAtMTMxMyw2ICsxMzEzLDcgQEAgX19aTks3V2ViQ29yZTE0U2VjdXJpdHlP cmlnaW4xMXRvUmF3U3RyaW5nRXYKIF9fWk5LN1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luMThkYXRh YmFzZUlkZW50aWZpZXJFdgogX19aTks3V2ViQ29yZTE0U2VjdXJpdHlPcmlnaW41ZXF1YWxFUEtT MF8KIF9fWk5LN1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luOHRvU3RyaW5nRXYKK19fWk5LN1dlYkNv cmUxNFNlY3VyaXR5T3JpZ2luNHBvcnRFdgogX19aTks3V2ViQ29yZTE1QWZmaW5lVHJhbnNmb3Jt MTBpc0lkZW50aXR5RXYKIF9fWk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybTEyaXNJbnZlcnRp YmxlRXYKIF9fWk5LN1dlYkNvcmUxNUFmZmluZVRyYW5zZm9ybTdpbnZlcnNlRXYKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3Jl Lm9yZGVyCmluZGV4IDJkYzNlMzIzYTNhNWI2M2VlNTNkODMxNTIxNTg5ZDJkMmNjOGEwMDAuLmZh MjcwOTU4MzUyZGJiYWFlYjYwNjNmMTgyZTBhMjk0MDhjZGViOGYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL1dlYkNvcmUub3JkZXIKKysrIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS5vcmRl cgpAQCAtMTkyMjMsNiArMTkyMjMsNyBAQCBfX1pOM1dURjlIYXNoVGFibGVJTlNfNlJlZlB0cklO N1dlYkNvcmUxNFNlY3VyaXR5T3JpZ2luRUVFU3Q0cGFpcklTNF9OUzFfSU5TMl8xNQogX19aTjNX VEY5SGFzaFRhYmxlSU5TXzZSZWZQdHJJTjdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbkVFRVN0NHBh aXJJUzRfTlMxX0lOUzJfMTVTdG9yYWdlQXJlYUltcGxFRUVFTlNfMThQYWlyRmlyc3RFeHRyYWN0 b3JJUzhfRUVOUzJfMThTZWN1cml0eU9yaWdpbkhhc2hFTlNfMTRQYWlySGFzaFRyYWl0c0lOU18x MEhhc2hUcmFpdHNJUzRfRUVOU0RfSVM3X0VFRUVTRV9FNGZpbmRJUzRfTlNfMjJJZGVudGl0eUhh c2hUcmFuc2xhdG9ySVM0X1M4X1NCX0VFRUVOU18xN0hhc2hUYWJsZUl0ZXJhdG9ySVM0X1M4X1NB X1NCX1NHX1NFX0VFUktUXwogX19aTjNXVEY5SGFzaFRhYmxlSU5TXzZSZWZQdHJJTjdXZWJDb3Jl MTRTZWN1cml0eU9yaWdpbkVFRVN0NHBhaXJJUzRfTlMxX0lOUzJfMTVTdG9yYWdlQXJlYUltcGxF RUVFTlNfMThQYWlyRmlyc3RFeHRyYWN0b3JJUzhfRUVOUzJfMThTZWN1cml0eU9yaWdpbkhhc2hF TlNfMTRQYWlySGFzaFRyYWl0c0lOU18xMEhhc2hUcmFpdHNJUzRfRUVOU0RfSVM3X0VFRUVTRV9F Nmxvb2t1cEVSS1M0XwogX19aTjNXVEY5SGFzaFRhYmxlSU5TXzZSZWZQdHJJTjdXZWJDb3JlMTRT ZWN1cml0eU9yaWdpbkVFRVN0NHBhaXJJUzRfTlMxX0lOUzJfMTVTdG9yYWdlQXJlYUltcGxFRUVF TlNfMThQYWlyRmlyc3RFeHRyYWN0b3JJUzhfRUVOUzJfMThTZWN1cml0eU9yaWdpbkhhc2hFTlNf MTRQYWlySGFzaFRyYWl0c0lOU18xMEhhc2hUcmFpdHNJUzRfRUVOU0RfSVM3X0VFRUVTRV9FNnJl aGFzaEVpCitfX1pOSzdXZWJDb3JlMTRTZWN1cml0eU9yaWdpbjRwb3J0RXYKIF9fWk43V2ViQ29y ZTE4U2VjdXJpdHlPcmlnaW5IYXNoNGhhc2hFUE5TXzE0U2VjdXJpdHlPcmlnaW5FCiBfX1pON1dl YkNvcmUxNVN0b3JhZ2VBcmVhSW1wbDZjcmVhdGVFTlNfMTFTdG9yYWdlVHlwZUVOM1dURjEwUGFz c1JlZlB0cklOU18xNFNlY3VyaXR5T3JpZ2luRUVFTlMzX0lOU18xOFN0b3JhZ2VTeW5jTWFuYWdl ckVFRWoKIF9fWk43V2ViQ29yZTEwU3RvcmFnZU1hcDZjcmVhdGVFagpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wYWdl L1NlY3VyaXR5T3JpZ2luLmNwcAppbmRleCBmNWE4ZjkyY2YwMjkzZmQ3MjJlZGY5ZWRjNWNjYzM4 NmFkNTJiZjgyLi41ODk2OTE5NjE3ZDEwYTU1MDMzNjdlODM5YmQzNWZkMDk2ZTk1NzY1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcAorKysgYi9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmNwcApAQCAtMjA5LDYgKzIwOSwxNCBAQCB2 b2lkIFNlY3VyaXR5T3JpZ2luOjpzZXREb21haW5Gcm9tRE9NKGNvbnN0IFN0cmluZyYgbmV3RG9t YWluKQogICAgIG1fZG9tYWluID0gbmV3RG9tYWluLmxvd2VyKCk7CiB9CiAKK3Vuc2lnbmVkIHNo b3J0IFNlY3VyaXR5T3JpZ2luOjpwb3J0KCkgY29uc3QKK3sKKyAgICBpZiAobV9wb3J0KQorICAg ICAgICByZXR1cm4gbV9wb3J0OworCisgICAgcmV0dXJuIGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2wo bV9wcm90b2NvbCk7Cit9CisKIGJvb2wgU2VjdXJpdHlPcmlnaW46OmNhbkFjY2Vzcyhjb25zdCBT ZWN1cml0eU9yaWdpbiogb3RoZXIpIGNvbnN0CiB7CiAgICAgaWYgKG1fdW5pdmVyc2FsQWNjZXNz KQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oIGIvU291 cmNlL1dlYkNvcmUvcGFnZS9TZWN1cml0eU9yaWdpbi5oCmluZGV4IGQ3YjlhYTRkOTdkOGVmNWVk ZDQzZGVjOGIzMjMyMDU3ZmRhYjI2YTUuLjQ3ZjRlZTA2NjExZTY5NWYyYmMxNTE0NGI2NDNhNzk4 ODg1ZmUyYTYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BhZ2UvU2VjdXJpdHlPcmlnaW4u aAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wYWdlL1NlY3VyaXR5T3JpZ2luLmgKQEAgLTY1LDcgKzY1 LDcgQEAgcHVibGljOgogICAgIFN0cmluZyBwcm90b2NvbCgpIGNvbnN0IHsgcmV0dXJuIG1fcHJv dG9jb2w7IH0KICAgICBTdHJpbmcgaG9zdCgpIGNvbnN0IHsgcmV0dXJuIG1faG9zdDsgfQogICAg IFN0cmluZyBkb21haW4oKSBjb25zdCB7IHJldHVybiBtX2RvbWFpbjsgfQotICAgIHVuc2lnbmVk IHNob3J0IHBvcnQoKSBjb25zdCB7IHJldHVybiBtX3BvcnQ7IH0KKyAgICB1bnNpZ25lZCBzaG9y dCBwb3J0KCkgY29uc3Q7CiAKICAgICAvLyBSZXR1cm5zIHRydWUgaWYgdGhpcyBTZWN1cml0eU9y aWdpbiBjYW4gc2NyaXB0IG9iamVjdHMgaW4gdGhlIGdpdmVuCiAgICAgLy8gU2VjdXJpdHlPcmln aW4uIEZvciBleGFtcGxlLCBjYWxsIHRoaXMgZnVuY3Rpb24gYmVmb3JlIGFsbG93aW5nCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9LVVJMLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL0tVUkwuY3BwCmluZGV4IDBiNDZlYzBmYzc2ZjBmNzljODk5NGNlMzMwYjYwMTMx NWExNGE1MTUuLjI0MmU4YTQ5MjllZGNlMDA4NmVhZmYzNjc3OWNkNjI3MDEyZGVkYzUgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL0tVUkwuY3BwCkBAIC0xNzc3LDExICsxNzc3LDggQEAgYm9vbCBLVVJMOjpp c0JsYW5rVVJMKCkgY29uc3QKICAgICByZXR1cm4gcHJvdG9jb2xJcygiYWJvdXQiKTsKIH0KIAot Ym9vbCBpc0RlZmF1bHRQb3J0Rm9yUHJvdG9jb2wodW5zaWduZWQgc2hvcnQgcG9ydCwgY29uc3Qg U3RyaW5nJiBwcm90b2NvbCkKK3Vuc2lnbmVkIHNob3J0IGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2wo Y29uc3QgU3RyaW5nJiBwcm90b2NvbCkKIHsKLSAgICBpZiAocHJvdG9jb2wuaXNFbXB0eSgpKQot ICAgICAgICByZXR1cm4gZmFsc2U7Ci0KICAgICB0eXBlZGVmIEhhc2hNYXA8U3RyaW5nLCB1bnNp Z25lZCwgQ2FzZUZvbGRpbmdIYXNoPiBEZWZhdWx0UG9ydHNNYXA7CiAgICAgREVGSU5FX1NUQVRJ Q19MT0NBTChEZWZhdWx0UG9ydHNNYXAsIGRlZmF1bHRQb3J0cywgKCkpOwogICAgIGlmIChkZWZh dWx0UG9ydHMuaXNFbXB0eSgpKSB7CkBAIC0xNzg5LDggKzE3ODYsMTkgQEAgYm9vbCBpc0RlZmF1 bHRQb3J0Rm9yUHJvdG9jb2wodW5zaWduZWQgc2hvcnQgcG9ydCwgY29uc3QgU3RyaW5nJiBwcm90 b2NvbCkKICAgICAgICAgZGVmYXVsdFBvcnRzLnNldCgiaHR0cHMiLCA0NDMpOwogICAgICAgICBk ZWZhdWx0UG9ydHMuc2V0KCJmdHAiLCAyMSk7CiAgICAgICAgIGRlZmF1bHRQb3J0cy5zZXQoImZ0 cHMiLCA5OTApOworICAgICAgICBkZWZhdWx0UG9ydHMuc2V0KCJ3cyIsIDgwKTsKKyAgICAgICAg ZGVmYXVsdFBvcnRzLnNldCgid3NzIiwgNDQzKTsKKyAgICAgICAgZGVmYXVsdFBvcnRzLnNldCgi Z29waGVyIiwgNzApOwogICAgIH0KLSAgICByZXR1cm4gZGVmYXVsdFBvcnRzLmdldChwcm90b2Nv bCkgPT0gcG9ydDsKKyAgICByZXR1cm4gZGVmYXVsdFBvcnRzLmdldChwcm90b2NvbCk7Cit9CisK K2Jvb2wgaXNEZWZhdWx0UG9ydEZvclByb3RvY29sKHVuc2lnbmVkIHNob3J0IHBvcnQsIGNvbnN0 IFN0cmluZyYgcHJvdG9jb2wpCit7CisgICAgaWYgKHByb3RvY29sLmlzRW1wdHkoKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0dXJuIGRlZmF1bHRQb3J0Rm9yUHJvdG9jb2wocHJv dG9jb2wpID09IHBvcnQ7CiB9CiAKIGJvb2wgcG9ydEFsbG93ZWQoY29uc3QgS1VSTCYgdXJsKQpk aWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vS1VSTC5oIGIvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vS1VSTC5oCmluZGV4IGVlNjdlMTZmYzlmMDRjMzQ0NmExNzZiOWQ0ZjZkOTVm NDNiMWEwNmEuLjE4YmY4ZjM1YzVjODVjYmMwOWQxNTViNTE0M2U5NmUwZGU0YjIyZjYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0tVUkwuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9LVVJMLmgKQEAgLTI4NSw2ICsyODUsNyBAQCBjb25zdCBLVVJMJiBibGFua1VS TCgpOwogYm9vbCBwcm90b2NvbElzKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBjaGFyKiBwcm90 b2NvbCk7CiBib29sIHByb3RvY29sSXNKYXZhU2NyaXB0KGNvbnN0IFN0cmluZyYgdXJsKTsKIAor dW5zaWduZWQgc2hvcnQgZGVmYXVsdFBvcnRGb3JQcm90b2NvbChjb25zdCBTdHJpbmcmIHByb3Rv Y29sKTsKIGJvb2wgaXNEZWZhdWx0UG9ydEZvclByb3RvY29sKHVuc2lnbmVkIHNob3J0IHBvcnQs IGNvbnN0IFN0cmluZyYgcHJvdG9jb2wpOwogYm9vbCBwb3J0QWxsb3dlZChjb25zdCBLVVJMJik7 IC8vIEJsYWNrbGlzdCBwb3J0cyB0aGF0IHNob3VsZCBuZXZlciBiZSB1c2VkIGZvciBXZWIgcmVz b3VyY2VzLgogCg==