115752 2013-05-07 13:41:17 -0700 Add and remove databases and origins from the database tracker 2013-05-07 14:52:02 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 andersca andersca oldest_to_newest 885946 0 andersca 2013-05-07 13:41:17 -0700 Add and remove databases and origins from the database tracker 885965 1 200974 andersca 2013-05-07 14:16:40 -0700 Created attachment 200974 Patch 885988 2 andersca 2013-05-07 14:52:02 -0700 Committed r149693: <http://trac.webkit.org/changeset/149693> 200974 2013-05-07 14:16:40 -0700 2013-05-07 14:41:52 -0700 Patch bug-115752-20130507141546.patch text/plain 14410 andersca U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ5Njg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYjhmYTViZjRlMGVlMGQw YjEyNTI5NmQxZGYwZTNiOGExN2VlZGY5ZS4uMThhMTkxOWM4ZjY5NzJhNDJkNDE0NzQwNjk1NmVm ODQwMGM1ZjQ5OCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDE2IEBACiAyMDEzLTA1LTA3ICBBbmRl cnMgQ2FybHNzb24gIDxhbmRlcnNjYUBhcHBsZS5jb20+CiAKKyAgICAgICAgQWRkIGFuZCByZW1v dmUgZGF0YWJhc2VzIGFuZCBvcmlnaW5zIGZyb20gdGhlIGRhdGFiYXNlIHRyYWNrZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNTc1MgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEFkZCBzeW1ib2xzIG5l ZWRlZCBieSBXZWJLaXQyLgorCisgICAgICAgICogV2ViQ29yZS5leHAuaW46CisKKzIwMTMtMDUt MDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFwcGxlLmNvbT4KKwogICAgICAgICBUaGUg c3RvcmFnZSBkYXRhYmFzZSB0cmFja2VyIHNob3VsZCBrbm93IHdoZW4gZGF0YWJhc2VzIGNvbWUg YW5kIGdvCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0x MTU3NDgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdDIvQ2hhbmdlTG9nCmluZGV4IGViY2ExZmRhYjIwMDRiNGI1NGQwZmZhNjJhZGQ4NWIxN2Zl NmQwZGYuLmQwYmIzNDI1NjRiY2M0NjM3ZmVlZDUzOWUwMjQwMmZjNTFlYWEzMDkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0Mi9DaGFuZ2VM b2cKQEAgLTEsNSArMSw1MyBAQAogMjAxMy0wNS0wNyAgQW5kZXJzIENhcmxzc29uICA8YW5kZXJz Y2FAYXBwbGUuY29tPgogCisgICAgICAgIEFkZCBhbmQgcmVtb3ZlIGRhdGFiYXNlcyBhbmQgb3Jp Z2lucyBmcm9tIHRoZSBkYXRhYmFzZSB0cmFja2VyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU3NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURh dGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJhc2U6OkxvY2Fs U3RvcmFnZURhdGFiYXNlKToKKyAgICAgICAgUmVuYW1lIG1fZGF0YWJhc2VGaWxlbmFtZSB0byBt X2RhdGFiYXNlUGF0aC4KKworICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZTo6 dHJ5VG9PcGVuRGF0YWJhc2UpOgorICAgICAgICBSZW5hbWUgbV9kYXRhYmFzZUZpbGVuYW1lIHRv IG1fZGF0YWJhc2VQYXRoLgorCisgICAgICAgICogVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9y YWdlRGF0YWJhc2UuaDoKKyAgICAgICAgUmVuYW1lIG1fZGF0YWJhc2VGaWxlbmFtZSB0byBtX2Rh dGFiYXNlUGF0aC4KKworICAgICAgICAqIFVJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURh dGFiYXNlVHJhY2tlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlcjo6ZGF0YWJhc2VQYXRoKToKKyAgICAgICAgUmVuYW1lIGRhdGFiYXNlRmlsZW5hbWUg dG8gZGF0YWJhc2VQYXRoLgorCisgICAgICAgIChXZWJLaXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNl VHJhY2tlcjo6ZGlkT3BlbkRhdGFiYXNlV2l0aE9yaWdpbik6CisgICAgICAgIENhbGwgYWRkRGF0 YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllci4KKworICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3Jh Z2VEYXRhYmFzZVRyYWNrZXI6OmRlbGV0ZUVtcHR5RGF0YWJhc2VXaXRoT3JpZ2luKToKKyAgICAg ICAgQ2FsbCByZW1vdmVEYXRhYmFzZVdpdGhPcmlnaW5JZGVudGlmaWVyLgorCisgICAgICAgIChX ZWJLaXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6dHJhY2tlckRhdGFiYXNlUGF0aCk6 CisgICAgICAgIENhbGwgZGF0YWJhc2VQYXRoIGluc3RlYWQgb2YgZGF0YWJhc2VGaWxlLgorCisg ICAgICAgIChXZWJLaXQ6OkxvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6b3BlblRyYWNrZXJE YXRhYmFzZSk6CisgICAgICAgIEJhaWwgaWYgdGhlIGRhdGFiYXNlIGlzIGFscmVhZHkgb3Blbi4K KworICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OnVwZGF0ZVRy YWNrZXJEYXRhYmFzZUZyb21Mb2NhbFN0b3JhZ2VEYXRhYmFzZUZpbGVzKToKKyAgICAgICAgQ2Fs bCBhZGREYXRhYmFzZVdpdGhPcmlnaW5JZGVudGlmaWVyIGlmIHRoaXMgaXMgYW4gb3JpZ2luIHdl IGRvbid0IGtub3cgYWJvdXQuCisKKyAgICAgICAgKFdlYktpdDo6TG9jYWxTdG9yYWdlRGF0YWJh c2VUcmFja2VyOjphZGREYXRhYmFzZVdpdGhPcmlnaW5JZGVudGlmaWVyKToKKyAgICAgICAgQWRk IHRoZSBkYXRhYmFzZSB0byB0aGUgT3JpZ2lucyB0YWJsZS4KKworICAgICAgICAoV2ViS2l0OjpM b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OnJlbW92ZURhdGFiYXNlV2l0aE9yaWdpbklkZW50 aWZpZXIpOgorICAgICAgICByZW1vdmUgdGhlIGRhdGFiYXNlIGZyb20gdGhlIE9yaWdpbnMgdGFi bGUgYW5kIGRlbGV0ZSBpdC4KKworICAgICAgICAoV2ViS2l0OjpMb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXI6OnBhdGhGb3JEYXRhYmFzZVdpdGhPcmlnaW5JZGVudGlmaWVyKToKKyAgICAgICAg SGVscGVyIGZ1bmN0aW9uIHRoYXQgbG9va3MgdXAgYSBkYXRhYmFzZSBwYXRoIGdpdmVuIGl0cyBp ZGVudGlmaWVyLgorICAgICAgICAKKyAgICAgICAgKiBVSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0 b3JhZ2VEYXRhYmFzZVRyYWNrZXIuaDoKKyAgICAgICAgUmVuYW1lIGRhdGFiYXNlRmlsZSB0byBk YXRhYmFzZVBhdGguCisKKzIwMTMtMDUtMDcgIEFuZGVycyBDYXJsc3NvbiAgPGFuZGVyc2NhQGFw cGxlLmNvbT4KKwogICAgICAgICBUaGUgc3RvcmFnZSBkYXRhYmFzZSB0cmFja2VyIHNob3VsZCBr bm93IHdoZW4gZGF0YWJhc2VzIGNvbWUgYW5kIGdvCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMTU3NDgKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvV2ViQ29yZS5leHAuaW4gYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgppbmRleCBk ZDU2NGE0OWQ0YzBjMmEyZTA3MzU5ZjgxODQ2Y2YzZDA4YTVkYjY0Li5hZmY3ZmFiZjg5ZjBlMzgw MzllNzE3MmU2ZjhkOThhNTJhNzU0ZDZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmV4cC5pbgorKysgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgpAQCAtNDcwLDYg KzQ3MCw3IEBAIF9fWk43V2ViQ29yZTE1UmVzb3VyY2VSZXF1ZXN0MjFodHRwUGlwZWxpbmluZ0Vu YWJsZWRFdgogX19aTjdXZWJDb3JlMTVSZXNvdXJjZVJlcXVlc3QyNHNldEhUVFBQaXBlbGluaW5n RW5hYmxlZEViCiBfX1pON1dlYkNvcmUxNVNRTGl0ZVN0YXRlbWVudDEyZ2V0Q29sdW1uSW50RWkK IF9fWk43V2ViQ29yZTE1U1FMaXRlU3RhdGVtZW50MTNnZXRDb2x1bW5UZXh0RWkKK19fWk43V2Vi Q29yZTE1U1FMaXRlU3RhdGVtZW50MTRleGVjdXRlQ29tbWFuZEV2CiBfX1pON1dlYkNvcmUxNVNR TGl0ZVN0YXRlbWVudDIxZ2V0Q29sdW1uQmxvYkFzU3RyaW5nRWkKIF9fWk43V2ViQ29yZTE1U1FM aXRlU3RhdGVtZW50MjJpc0NvbHVtbkRlY2xhcmVkQXNCbG9iRWkKIF9fWk43V2ViQ29yZTE1U1FM aXRlU3RhdGVtZW50NHN0ZXBFdgpAQCAtNjgwLDYgKzY4MSw3IEBAIF9fWk43V2ViQ29yZTIwU3Bh Y2VTcGxpdFN0cmluZ0RhdGFEMUV2CiBfX1pON1dlYkNvcmUyMFVzZXJHZXN0dXJlSW5kaWNhdG9y N3Nfc3RhdGVFCiBfX1pON1dlYkNvcmUyMFVzZXJHZXN0dXJlSW5kaWNhdG9yQzFFTlNfMjZQcm9j ZXNzaW5nVXNlckdlc3R1cmVTdGF0ZUUKIF9fWk43V2ViQ29yZTIwVXNlckdlc3R1cmVJbmRpY2F0 b3JEMUV2CitfX1pON1dlYkNvcmUyMGRlbGV0ZUVtcHR5RGlyZWN0b3J5RVJLTjNXVEY2U3RyaW5n RQogX19aTjdXZWJDb3JlMjBtYWtlUkdCQTMyRnJvbUZsb2F0c0VmZmZmCiBfX1pON1dlYkNvcmUy MHByb3RvY29sSXNKYXZhU2NyaXB0RVJLTjNXVEY2U3RyaW5nRQogX19aTjdXZWJDb3JlMjB0b1VJ bnQzMkVuZm9yY2VSYW5nZUVQTjNKU0M5RXhlY1N0YXRlRU5TMF83SlNWYWx1ZUUKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNl LmNwcCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFi YXNlLmNwcAppbmRleCA1Zjc1YTdhMDJlYTMxZmVlYTg0NWFkYjUyYmI2YmFlNzQ3OTgxNGNjLi44 M2UxNmNkNzRjZDZmOGE5NzY5MmU2OGRjYjNhY2Y2YjBmNTc2Y2E0IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZS5jcHAKKysr IGIvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2Uu Y3BwCkBAIC01NCw3ICs1NCw3IEBAIExvY2FsU3RvcmFnZURhdGFiYXNlOjpMb2NhbFN0b3JhZ2VE YXRhYmFzZShQYXNzUmVmUHRyPFdvcmtRdWV1ZT4gcXVldWUsIFBhc3NSZWZQCiAgICAgOiBtX3F1 ZXVlKHF1ZXVlKQogICAgICwgbV90cmFja2VyKHRyYWNrZXIpCiAgICAgLCBtX3NlY3VyaXR5T3Jp Z2luKHNlY3VyaXR5T3JpZ2luKQotICAgICwgbV9kYXRhYmFzZUZpbGVuYW1lKG1fdHJhY2tlci0+ ZGF0YWJhc2VGaWxlbmFtZShtX3NlY3VyaXR5T3JpZ2luLmdldCgpKSkKKyAgICAsIG1fZGF0YWJh c2VQYXRoKG1fdHJhY2tlci0+ZGF0YWJhc2VQYXRoKG1fc2VjdXJpdHlPcmlnaW4uZ2V0KCkpKQog ICAgICwgbV9mYWlsZWRUb09wZW5EYXRhYmFzZShmYWxzZSkKICAgICAsIG1fZGlkSW1wb3J0SXRl bXMoZmFsc2UpCiAgICAgLCBtX2lzQ2xvc2VkKGZhbHNlKQpAQCAtODMsMTYgKzgzLDE2IEBAIHZv aWQgTG9jYWxTdG9yYWdlRGF0YWJhc2U6Om9wZW5EYXRhYmFzZShEYXRhYmFzZU9wZW5pbmdTdHJh dGVneSBvcGVuaW5nU3RyYXRlZ3kpCiAKIGJvb2wgTG9jYWxTdG9yYWdlRGF0YWJhc2U6OnRyeVRv T3BlbkRhdGFiYXNlKERhdGFiYXNlT3BlbmluZ1N0cmF0ZWd5IG9wZW5pbmdTdHJhdGVneSkKIHsK LSAgICBpZiAoIWZpbGVFeGlzdHMobV9kYXRhYmFzZUZpbGVuYW1lKSAmJiBvcGVuaW5nU3RyYXRl Z3kgPT0gU2tpcElmTm9uRXhpc3RlbnQpCisgICAgaWYgKCFmaWxlRXhpc3RzKG1fZGF0YWJhc2VQ YXRoKSAmJiBvcGVuaW5nU3RyYXRlZ3kgPT0gU2tpcElmTm9uRXhpc3RlbnQpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCi0gICAgaWYgKG1fZGF0YWJhc2VGaWxlbmFtZS5pc0VtcHR5KCkpIHsKKyAg ICBpZiAobV9kYXRhYmFzZVBhdGguaXNFbXB0eSgpKSB7CiAgICAgICAgIExPR19FUlJPUigiRmls ZW5hbWUgZm9yIGxvY2FsIHN0b3JhZ2UgZGF0YWJhc2UgaXMgZW1wdHkgLSBjYW5ub3Qgb3BlbiBm b3IgcGVyc2lzdGVudCBzdG9yYWdlIik7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAK LSAgICBpZiAoIW1fZGF0YWJhc2Uub3BlbihtX2RhdGFiYXNlRmlsZW5hbWUpKSB7Ci0gICAgICAg IExPR19FUlJPUigiRmFpbGVkIHRvIG9wZW4gZGF0YWJhc2UgZmlsZSAlcyBmb3IgbG9jYWwgc3Rv cmFnZSIsIG1fZGF0YWJhc2VGaWxlbmFtZS51dGY4KCkuZGF0YSgpKTsKKyAgICBpZiAoIW1fZGF0 YWJhc2Uub3BlbihtX2RhdGFiYXNlUGF0aCkpIHsKKyAgICAgICAgTE9HX0VSUk9SKCJGYWlsZWQg dG8gb3BlbiBkYXRhYmFzZSBmaWxlICVzIGZvciBsb2NhbCBzdG9yYWdlIiwgbV9kYXRhYmFzZVBh dGgudXRmOCgpLmRhdGEoKSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICB9CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFi YXNlLmggYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRh YmFzZS5oCmluZGV4IGE4YzE0NWY2YTQ5N2NlNWZiMDM5YTFlYjIxZjNiYzIyODg5NjYyYWYuLjFh Y2Q2YjI1M2Q0ZDI3NDQxNjZlOGRjNTExZmIzNzEyNTdkOTM3NTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlLmgKKysrIGIv U291cmNlL1dlYktpdDIvVUlQcm9jZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2UuaApA QCAtODIsNyArODIsNyBAQCBwcml2YXRlOgogICAgIFJlZlB0cjxMb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXI+IG1fdHJhY2tlcjsKICAgICBSZWZQdHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+ IG1fc2VjdXJpdHlPcmlnaW47CiAKLSAgICBTdHJpbmcgbV9kYXRhYmFzZUZpbGVuYW1lOworICAg IFN0cmluZyBtX2RhdGFiYXNlUGF0aDsKICAgICBXZWJDb3JlOjpTUUxpdGVEYXRhYmFzZSBtX2Rh dGFiYXNlOwogICAgIGJvb2wgbV9mYWlsZWRUb09wZW5EYXRhYmFzZTsKICAgICBib29sIG1fZGlk SW1wb3J0SXRlbXM7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFn ZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwIGIvU291cmNlL1dlYktpdDIvVUlQcm9j ZXNzL1N0b3JhZ2UvTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyLmNwcAppbmRleCA5YzRkZjUz ZjM0MmQ3NTk1OTRhNzM4MzI2NzFlMTk0YWJmNjFjNWY1Li42OGVlZTAxZDI0NjM3OTRiZTJlNjRh ZmU1MjBlZjRmMzlhZGUxNjdlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3Mv U3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJL aXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlci5jcHAKQEAg LTU1LDE3ICs1NSwxOSBAQCB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6c2V0TG9j YWxTdG9yYWdlRGlyZWN0b3J5KGNvbnN0IFN0cmluZyYgbG9jYWxTdAogICAgIG1fcXVldWUtPmRp c3BhdGNoKGJpbmQoJkxvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6c2V0TG9jYWxTdG9yYWdl RGlyZWN0b3J5SW50ZXJuYWwsIHRoaXMsIGxvY2FsU3RvcmFnZURpcmVjdG9yeS5pc29sYXRlZENv cHkoKSkpOwogfQogCi1TdHJpbmcgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkYXRhYmFz ZUZpbGVuYW1lKFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdpbikgY29uc3QKK1N0cmluZyBM b2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OmRhdGFiYXNlUGF0aChTZWN1cml0eU9yaWdpbiog c2VjdXJpdHlPcmlnaW4pIGNvbnN0CiB7Ci0gICAgcmV0dXJuIGRhdGFiYXNlRmlsZW5hbWUoc2Vj dXJpdHlPcmlnaW4tPmRhdGFiYXNlSWRlbnRpZmllcigpICsgIi5sb2NhbHN0b3JhZ2UiKTsKKyAg ICByZXR1cm4gZGF0YWJhc2VQYXRoKHNlY3VyaXR5T3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIo KSArICIubG9jYWxzdG9yYWdlIik7CiB9CiAKLXZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFj a2VyOjpkaWRPcGVuRGF0YWJhc2VXaXRoT3JpZ2luKFdlYkNvcmU6OlNlY3VyaXR5T3JpZ2luKikK K3ZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkaWRPcGVuRGF0YWJhc2VXaXRoT3Jp Z2luKFNlY3VyaXR5T3JpZ2luKiBzZWN1cml0eU9yaWdpbikKIHsKKyAgICBhZGREYXRhYmFzZVdp dGhPcmlnaW5JZGVudGlmaWVyKHNlY3VyaXR5T3JpZ2luLT5kYXRhYmFzZUlkZW50aWZpZXIoKSwg ZGF0YWJhc2VQYXRoKHNlY3VyaXR5T3JpZ2luKSk7CiB9CiAKLXZvaWQgTG9jYWxTdG9yYWdlRGF0 YWJhc2VUcmFja2VyOjpkZWxldGVFbXB0eURhdGFiYXNlV2l0aE9yaWdpbihXZWJDb3JlOjpTZWN1 cml0eU9yaWdpbiopCit2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGVsZXRlRW1w dHlEYXRhYmFzZVdpdGhPcmlnaW4oU2VjdXJpdHlPcmlnaW4qIHNlY3VyaXR5T3JpZ2luKQogewor ICAgIHJlbW92ZURhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIoc2VjdXJpdHlPcmlnaW4tPmRh dGFiYXNlSWRlbnRpZmllcigpKTsKIH0KIAogdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXI6OnNldExvY2FsU3RvcmFnZURpcmVjdG9yeUludGVybmFsKGNvbnN0IFN0cmluZyYgbG9jYWxT dG9yYWdlRGlyZWN0b3J5KQpAQCAtNzksNyArODEsNyBAQCB2b2lkIExvY2FsU3RvcmFnZURhdGFi YXNlVHJhY2tlcjo6c2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5SW50ZXJuYWwoY29uc3QgU3RyaW5n JgogICAgIG1fcXVldWUtPmRpc3BhdGNoKGJpbmQoJkxvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tl cjo6aW1wb3J0T3JpZ2luSWRlbnRpZmllcnMsIHRoaXMpKTsKIH0KIAotU3RyaW5nIExvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlcjo6ZGF0YWJhc2VGaWxlbmFtZShjb25zdCBTdHJpbmcmIGZpbGVu YW1lKSBjb25zdAorU3RyaW5nIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6ZGF0YWJhc2VQ YXRoKGNvbnN0IFN0cmluZyYgZmlsZW5hbWUpIGNvbnN0CiB7CiAgICAgaWYgKCFtYWtlQWxsRGly ZWN0b3JpZXMobV9sb2NhbFN0b3JhZ2VEaXJlY3RvcnkpKSB7CiAgICAgICAgIExPR19FUlJPUigi VW5hYmxlZCB0byBjcmVhdGUgTG9jYWxTdG9yYWdlIGRhdGFiYXNlIHBhdGggJXMiLCBtX2xvY2Fs U3RvcmFnZURpcmVjdG9yeS51dGY4KCkuZGF0YSgpKTsKQEAgLTkxLDExICs5MywxNCBAQCBTdHJp bmcgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpkYXRhYmFzZUZpbGVuYW1lKGNvbnN0IFN0 cmluZyYgZmlsZW5hbWUpIGNvbgogCiBTdHJpbmcgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2Vy Ojp0cmFja2VyRGF0YWJhc2VQYXRoKCkgY29uc3QKIHsKLSAgICByZXR1cm4gZGF0YWJhc2VGaWxl bmFtZSgiU3RvcmFnZVRyYWNrZXIuZGIiKTsKKyAgICByZXR1cm4gZGF0YWJhc2VQYXRoKCJTdG9y YWdlVHJhY2tlci5kYiIpOwogfQogCiB2b2lkIExvY2FsU3RvcmFnZURhdGFiYXNlVHJhY2tlcjo6 b3BlblRyYWNrZXJEYXRhYmFzZShEYXRhYmFzZU9wZW5pbmdTdHJhdGVneSBvcGVuaW5nU3RyYXRl Z3kpCiB7CisgICAgaWYgKG1fZGF0YWJhc2UuaXNPcGVuKCkpCisgICAgICAgIHJldHVybjsKKwog ICAgIFN0cmluZyBkYXRhYmFzZVBhdGggPSB0cmFja2VyRGF0YWJhc2VQYXRoKCk7CiAKICAgICBp ZiAoIWZpbGVFeGlzdHMoZGF0YWJhc2VQYXRoKSAmJiBvcGVuaW5nU3RyYXRlZ3kgPT0gU2tpcElm Tm9uRXhpc3RlbnQpCkBAIC0xNTksNyArMTY0LDkgQEAgdm9pZCBMb2NhbFN0b3JhZ2VEYXRhYmFz ZVRyYWNrZXI6OnVwZGF0ZVRyYWNrZXJEYXRhYmFzZUZyb21Mb2NhbFN0b3JhZ2VEYXRhYmFzZUYK IAogICAgICAgICBTdHJpbmcgb3JpZ2luSWRlbnRpZmllciA9IGZpbGVuYW1lLnN1YnN0cmluZygw LCBmaWxlbmFtZS5sZW5ndGgoKSAtIHN0cmxlbigiLmxvY2Fsc3RvcmFnZSIpKTsKIAotICAgICAg ICAvLyBGSVhNRTogSW5zZXJ0IHRoZSBvcmlnaW4gYW5kIGRhdGFiYXNlIHBhaXIuCisgICAgICAg IGlmICghbV9vcmlnaW5zLmNvbnRhaW5zKG9yaWdpbklkZW50aWZpZXIpKQorICAgICAgICAgICAg YWRkRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihvcmlnaW5JZGVudGlmaWVyLCBwYXRoKTsK KwogICAgICAgICBvcmlnaW5zRnJvbUxvY2FsU3RvcmFnZURhdGFiYXNlRmlsZXMuYWRkKG9yaWdp bklkZW50aWZpZXIpOwogICAgIH0KIApAQCAtMTY4LDkgKzE3NSw4NSBAQCB2b2lkIExvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlcjo6dXBkYXRlVHJhY2tlckRhdGFiYXNlRnJvbUxvY2FsU3RvcmFn ZURhdGFiYXNlRgogICAgICAgICBpZiAob3JpZ2lucy5jb250YWlucyhvcmlnaW5JZGVudGlmaWVy KSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIC8vIFRoaXMgb3JpZ2luIGRvZXNu J3QgaGF2ZSBhIGRhdGFiYXNlIGZpbGUsIGRlbGV0ZSBpdCBmcm9tIHRoZSBkYXRhYmFzZS4KLSAg ICAgICAgLy8gRklYTUU6IERvIHRoaXMuCisgICAgICAgIHJlbW92ZURhdGFiYXNlV2l0aE9yaWdp bklkZW50aWZpZXIob3JpZ2luSWRlbnRpZmllcik7CisgICAgfQorfQorCit2b2lkIExvY2FsU3Rv cmFnZURhdGFiYXNlVHJhY2tlcjo6YWRkRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihjb25z dCBTdHJpbmcmIG9yaWdpbklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKQor eworICAgIG9wZW5UcmFja2VyRGF0YWJhc2UoQ3JlYXRlSWZOb25FeGlzdGVudCk7CisgICAgaWYg KCFtX2RhdGFiYXNlLmlzT3BlbigpKQorICAgICAgICByZXR1cm47CisKKyAgICBTUUxpdGVTdGF0 ZW1lbnQgc3RhdGVtZW50KG1fZGF0YWJhc2UsICJJTlNFUlQgSU5UTyBPcmlnaW5zIFZBTFVFUyAo PywgPykiKTsKKyAgICBpZiAoc3RhdGVtZW50LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaykgewor ICAgICAgICBMT0dfRVJST1IoIlVuYWJsZSB0byBlc3RhYmxpc2ggb3JpZ2luICclcycgaW4gdGhl IHRyYWNrZXIiLCBvcmlnaW5JZGVudGlmaWVyLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICByZXR1 cm47CiAgICAgfQorCisgICAgc3RhdGVtZW50LmJpbmRUZXh0KDEsIG9yaWdpbklkZW50aWZpZXIp OworICAgIHN0YXRlbWVudC5iaW5kVGV4dCgyLCBkYXRhYmFzZVBhdGgpOworCisgICAgaWYgKHN0 YXRlbWVudC5zdGVwKCkgIT0gU1FMUmVzdWx0RG9uZSkKKyAgICAgICAgTE9HX0VSUk9SKCJVbmFi bGUgdG8gZXN0YWJsaXNoIG9yaWdpbiAnJXMnIGluIHRoZSB0cmFja2VyIiwgb3JpZ2luSWRlbnRp Zmllci51dGY4KCkuZGF0YSgpKTsKKworICAgIG1fb3JpZ2lucy5hZGQob3JpZ2luSWRlbnRpZmll cik7CisKKyAgICAvLyBGSVhNRTogVGVsbCBjbGllbnRzIHRoYXQgdGhlIG9yaWdpbiB3YXMgYWRk ZWQuCit9CisKK3ZvaWQgTG9jYWxTdG9yYWdlRGF0YWJhc2VUcmFja2VyOjpyZW1vdmVEYXRhYmFz ZVdpdGhPcmlnaW5JZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKK3sK KyAgICBvcGVuVHJhY2tlckRhdGFiYXNlKFNraXBJZk5vbkV4aXN0ZW50KTsKKyAgICBpZiAoIW1f ZGF0YWJhc2UuaXNPcGVuKCkpCisgICAgICAgIHJldHVybjsKKworICAgIFN0cmluZyBwYXRoID0g cGF0aEZvckRhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIob3JpZ2luSWRlbnRpZmllcik7Cisg ICAgaWYgKHBhdGguaXNFbXB0eSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBTUUxpdGVTdGF0 ZW1lbnQgZGVsZXRlU3RhdGVtZW50KG1fZGF0YWJhc2UsICJERUxFVEUgRlJPTSBPcmlnaW5zIHdo ZXJlIG9yaWdpbj0/Iik7CisgICAgaWYgKGRlbGV0ZVN0YXRlbWVudC5wcmVwYXJlKCkgIT0gU1FM UmVzdWx0T2spIHsKKyAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gcHJlcGFyZSBkZWxldGlv biBvZiBvcmlnaW4gJyVzJyIsIG9yaWdpbklkZW50aWZpZXIuYXNjaWkoKS5kYXRhKCkpOworICAg ICAgICByZXR1cm47CisgICAgfQorICAgIGRlbGV0ZVN0YXRlbWVudC5iaW5kVGV4dCgxLCBvcmln aW5JZGVudGlmaWVyKTsKKyAgICBpZiAoIWRlbGV0ZVN0YXRlbWVudC5leGVjdXRlQ29tbWFuZCgp KSB7CisgICAgICAgIExPR19FUlJPUigiVW5hYmxlIHRvIGV4ZWN1dGUgZGVsZXRpb24gb2Ygb3Jp Z2luICclcyciLCBvcmlnaW5JZGVudGlmaWVyLmFzY2lpKCkuZGF0YSgpKTsKKyAgICAgICAgcmV0 dXJuOworICAgIH0KKworICAgIGRlbGV0ZUZpbGUocGF0aCk7CisKKyAgICBtX29yaWdpbnMucmVt b3ZlKG9yaWdpbklkZW50aWZpZXIpOworICAgIGlmIChtX29yaWdpbnMuaXNFbXB0eSgpKSB7Cisg ICAgICAgIC8vIFRoZXJlIGFyZSBubyBvcmlnaW5zIGxlZnQsIGdvIGFoZWFkIGFuZCBkZWxldGUg dGhlIHRyYWNrZXIgZGF0YWJhc2UuCisgICAgICAgIG1fZGF0YWJhc2UuY2xvc2UoKTsKKyAgICAg ICAgZGVsZXRlRmlsZSh0cmFja2VyRGF0YWJhc2VQYXRoKCkpOworICAgICAgICBkZWxldGVFbXB0 eURpcmVjdG9yeShtX2xvY2FsU3RvcmFnZURpcmVjdG9yeSk7CisgICAgfQorCisgICAgLy8gRklY TUU6IFRlbGwgY2xpZW50cyB0aGF0IHRoZSBvcmlnaW4gd2FzIHJlbW92ZWQuCit9CisKK1N0cmlu ZyBMb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNrZXI6OnBhdGhGb3JEYXRhYmFzZVdpdGhPcmlnaW5J ZGVudGlmaWVyKGNvbnN0IFN0cmluZyYgb3JpZ2luSWRlbnRpZmllcikKK3sKKyAgICBpZiAoIW1f ZGF0YWJhc2UuaXNPcGVuKCkpCisgICAgICAgIHJldHVybiBTdHJpbmcoKTsKKworICAgIFNRTGl0 ZVN0YXRlbWVudCBwYXRoU3RhdGVtZW50KG1fZGF0YWJhc2UsICJTRUxFQ1QgcGF0aCBGUk9NIE9y aWdpbnMgV0hFUkUgb3JpZ2luPT8iKTsKKyAgICBpZiAocGF0aFN0YXRlbWVudC5wcmVwYXJlKCkg IT0gU1FMUmVzdWx0T2spIHsKKyAgICAgICAgTE9HX0VSUk9SKCJVbmFibGUgdG8gcHJlcGFyZSBz ZWxlY3Rpb24gb2YgcGF0aCBmb3Igb3JpZ2luICclcyciLCBvcmlnaW5JZGVudGlmaWVyLnV0Zjgo KS5kYXRhKCkpOworICAgICAgICByZXR1cm4gU3RyaW5nKCk7CisgICAgfQorCisgICAgcGF0aFN0 YXRlbWVudC5iaW5kVGV4dCgxLCBvcmlnaW5JZGVudGlmaWVyKTsKKworICAgIGludCByZXN1bHQg PSBwYXRoU3RhdGVtZW50LnN0ZXAoKTsKKyAgICBpZiAocmVzdWx0ICE9IFNRTFJlc3VsdFJvdykK KyAgICAgICAgcmV0dXJuIFN0cmluZygpOworCisgICAgcmV0dXJuIHBhdGhTdGF0ZW1lbnQuZ2V0 Q29sdW1uVGV4dCgwKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgV2ViS2l0CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvU3RvcmFnZS9Mb2NhbFN0b3JhZ2VEYXRhYmFzZVRyYWNr ZXIuaCBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFi YXNlVHJhY2tlci5oCmluZGV4IDc4MjUwZTE0NDAyNTM4MWRlYWZkOWUwZTMxNWExMjE0NzY3ZDIx Y2QuLjJlMTRlZTVmMjg1YjQxOWY0M2NlOGFhYTI0ODdmZTViNjNjY2E5MDMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFnZURhdGFiYXNlVHJh Y2tlci5oCisrKyBiL1NvdXJjZS9XZWJLaXQyL1VJUHJvY2Vzcy9TdG9yYWdlL0xvY2FsU3RvcmFn ZURhdGFiYXNlVHJhY2tlci5oCkBAIC00OCw3ICs0OCw3IEBAIHB1YmxpYzoKICAgICB+TG9jYWxT dG9yYWdlRGF0YWJhc2VUcmFja2VyKCk7CiAKICAgICB2b2lkIHNldExvY2FsU3RvcmFnZURpcmVj dG9yeShjb25zdCBTdHJpbmcmKTsKLSAgICBTdHJpbmcgZGF0YWJhc2VGaWxlbmFtZShXZWJDb3Jl OjpTZWN1cml0eU9yaWdpbiopIGNvbnN0OworICAgIFN0cmluZyBkYXRhYmFzZVBhdGgoV2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW4qKSBjb25zdDsKIAogICAgIHZvaWQgZGlkT3BlbkRhdGFiYXNlV2l0 aE9yaWdpbihXZWJDb3JlOjpTZWN1cml0eU9yaWdpbiopOwogICAgIHZvaWQgZGVsZXRlRW1wdHlE YXRhYmFzZVdpdGhPcmlnaW4oV2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4qKTsKQEAgLTU4LDcgKzU4 LDcgQEAgcHJpdmF0ZToKIAogICAgIHZvaWQgc2V0TG9jYWxTdG9yYWdlRGlyZWN0b3J5SW50ZXJu YWwoY29uc3QgU3RyaW5nJik7CiAKLSAgICBTdHJpbmcgZGF0YWJhc2VGaWxlbmFtZShjb25zdCBT dHJpbmcmKSBjb25zdDsKKyAgICBTdHJpbmcgZGF0YWJhc2VQYXRoKGNvbnN0IFN0cmluZyYgZmls ZW5hbWUpIGNvbnN0OwogICAgIFN0cmluZyB0cmFja2VyRGF0YWJhc2VQYXRoKCkgY29uc3Q7CiAK ICAgICBlbnVtIERhdGFiYXNlT3BlbmluZ1N0cmF0ZWd5IHsKQEAgLTcwLDYgKzcwLDEwIEBAIHBy aXZhdGU6CiAgICAgdm9pZCBpbXBvcnRPcmlnaW5JZGVudGlmaWVycygpOwogICAgIHZvaWQgdXBk YXRlVHJhY2tlckRhdGFiYXNlRnJvbUxvY2FsU3RvcmFnZURhdGFiYXNlRmlsZXMoKTsKIAorICAg IHZvaWQgYWRkRGF0YWJhc2VXaXRoT3JpZ2luSWRlbnRpZmllcihjb25zdCBTdHJpbmcmIG9yaWdp bklkZW50aWZpZXIsIGNvbnN0IFN0cmluZyYgZGF0YWJhc2VQYXRoKTsKKyAgICB2b2lkIHJlbW92 ZURhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIoY29uc3QgU3RyaW5nJiBvcmlnaW5JZGVudGlm aWVyKTsKKyAgICBTdHJpbmcgcGF0aEZvckRhdGFiYXNlV2l0aE9yaWdpbklkZW50aWZpZXIoY29u c3QgU3RyaW5nJiBvcmlnaW5JZGVudGlmaWVyKTsKKwogICAgIFJlZlB0cjxXb3JrUXVldWU+IG1f cXVldWU7CiAgICAgU3RyaW5nIG1fbG9jYWxTdG9yYWdlRGlyZWN0b3J5OwogCg==