152866 2016-01-07 15:03:59 -0800 Modern IDB: Various imported/w3c/indexeddb tests fail due to expecting the wrong exception 2016-01-07 16:20:23 -0800 1 1 1 Unclassified WebKit WebCore Misc. Safari 9 Unspecified Unspecified RESOLVED FIXED P2 Normal --- 149117 152554 1 beidson beidson alecflett commit-queue jsbell oldest_to_newest 1153633 0 beidson 2016-01-07 15:03:59 -0800 Modern IDB: Various imported/w3c/indexeddb tests fail due to expecting the wrong exception 1153635 1 beidson 2016-01-07 15:12:13 -0800 I've filed an issue in the W3C web apps test issue tracker: https://github.com/w3c/web-platform-tests/issues/2455 In the meantime, we should violate the spec to match Legacy IDB (Safari 9), Chrome, and Edge. 1153638 2 268499 beidson 2016-01-07 15:14:55 -0800 Created attachment 268499 Patch v1 1153643 3 beidson 2016-01-07 15:30:35 -0800 https://trac.webkit.org/changeset/194733 268499 2016-01-07 15:14:55 -0800 2016-01-07 15:18:10 -0800 Patch v1 patch text/plain 9375 beidson ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCAzNTA2YWIyLi4yN2IwY2ZhIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMTQgQEAKIDIwMTYtMDEt MDcgIEJyYWR5IEVpZHNvbiAgPGJlaWRzb25AYXBwbGUuY29tPgogCisgICAgICAgIE1vZGVybiBJ REI6IFZhcmlvdXMgaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYiB0ZXN0cyBmYWlsIGR1ZSB0byBleHBl Y3RpbmcgdGhlIHdyb25nIGV4Y2VwdGlvbi4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTE1Mjg2NgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zOgor CisyMDE2LTAxLTA3ICBCcmFkeSBFaWRzb24gIDxiZWlkc29uQGFwcGxlLmNvbT4KKwogICAgICAg ICBVbnJldmlld2VkIEluZGV4ZWREQiB0ZXN0IGdhcmRlbmluZy4KIAogICAgICAgICAqIHBsYXRm b3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9uczoKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL3Bs YXRmb3JtL21hYy13azEvVGVzdEV4cGVjdGF0aW9ucyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL21h Yy13azEvVGVzdEV4cGVjdGF0aW9ucwppbmRleCBmMTg1NjRiLi5iN2JkMThjIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9tYWMtd2sxL1Rlc3RFeHBlY3RhdGlvbnMKKysrIGIvTGF5 b3V0VGVzdHMvcGxhdGZvcm0vbWFjLXdrMS9UZXN0RXhwZWN0YXRpb25zCkBAIC03NCwxMSArNzQs NiBAQCBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL2ludGVyZmFjZXMuaHRtbCBbIFNraXAgXQogaW1w b3J0ZWQvdzNjL2luZGV4ZWRkYi9rZXlvcmRlci5odG0gWyBTa2lwIF0KIAogIyBXM0MgSURCIHRl c3RzIC0gTGVnYWN5IElEQiBwYXNzZXMsIE1vZGVybiBJREIgZmFpbHMKLWltcG9ydGVkL3czYy9p bmRleGVkZGIvaWRib2JqZWN0c3RvcmVfYWRkMTYuaHRtIFsgRmFpbHVyZSBdCi1pbXBvcnRlZC93 M2MvaW5kZXhlZGRiL2lkYm9iamVjdHN0b3JlX2NsZWFyNC5odG0gWyBGYWlsdXJlIF0KLWltcG9y dGVkL3czYy9pbmRleGVkZGIvaWRib2JqZWN0c3RvcmVfY291bnQ0Lmh0bSBbIEZhaWx1cmUgXQot aW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJvYmplY3RzdG9yZV9kZWxldGU3Lmh0bSBbIEZhaWx1 cmUgXQotaW1wb3J0ZWQvdzNjL2luZGV4ZWRkYi9pZGJvYmplY3RzdG9yZV9wdXQxNi5odG0gWyBG YWlsdXJlIF0KIGltcG9ydGVkL3czYy9pbmRleGVkZGIvcmVxdWVzdF9idWJibGUtYW5kLWNhcHR1 cmUuaHRtIFsgRmFpbHVyZSBdCiBpbXBvcnRlZC93M2MvaW5kZXhlZGRiL3RyYW5zYWN0aW9uX2J1 YmJsZS1hbmQtY2FwdHVyZS5odG0gWyBGYWlsdXJlIF0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IDdiYTUyN2Mu LjkzYjRmOGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3Vy Y2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxNi0wMS0wNyAgQnJhZHkg RWlkc29uICA8YmVpZHNvbkBhcHBsZS5jb20+CisKKyAgICAgICAgTW9kZXJuIElEQjogVmFyaW91 cyBpbXBvcnRlZC93M2MvaW5kZXhlZGRiIHRlc3RzIGZhaWwgZHVlIHRvIGV4cGVjdGluZyB0aGUg d3JvbmcgZXhjZXB0aW9uLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTUyODY2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgTm8gbmV3IHRlc3RzICg1IHNraXBwZWQgdGVzdHMgbm93IHBhc3MpLgorCisgICAg ICAgICogTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpJREJDbGllbnQ6OklEQk9iamVjdFN0b3JlOjpwdXRPckFkZCk6IFJl b3JkZXIgdGhlIGV4Y2VwdGlvbnMsIHZpb2xhdGluZyB0aGUgc3BlYyBidXQgbWF0Y2hpbmcKKyAg ICAgICAgICBhIHZhc3QgbWFqb3JpdHkgb2YgYnJvd3NlcnMuCisgICAgICAgIChXZWJDb3JlOjpJ REJDbGllbnQ6OklEQk9iamVjdFN0b3JlOjpkZWxldGVGdW5jdGlvbik6IERpdHRvLgorICAgICAg ICAoV2ViQ29yZTo6SURCQ2xpZW50OjpJREJPYmplY3RTdG9yZTo6Y2xlYXIpOiBEaXR0by4KKyAg ICAgICAgKFdlYkNvcmU6OklEQkNsaWVudDo6SURCT2JqZWN0U3RvcmU6OmRvQ291bnQpOiBEaXR0 by4KKwogMjAxNi0wMS0wNyAgTWljaGFlbCBDYXRhbnphcm8gIDxtY2F0YW56YXJvQGlnYWxpYS5j b20+CiAKICAgICAgICAgW1NPVVBdIENvbnNpZGVyIHJlZHVjaW5nIG1heCBzaW11bHRhbmVvdXMg Y29ubmVjdGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvaW5kZXhlZGRi L2NsaWVudC9JREJPYmplY3RTdG9yZUltcGwuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9p bmRleGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5jcHAKaW5kZXggNmY5ZThmNS4uYjI5 YzdmZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRleGVkZGIvY2xpZW50 L0lEQk9iamVjdFN0b3JlSW1wbC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9pbmRl eGVkZGIvY2xpZW50L0lEQk9iamVjdFN0b3JlSW1wbC5jcHAKQEAgLTI0NSw2ICsyNDUsMTcgQEAg UmVmUHRyPElEQlJlcXVlc3Q+IElEQk9iamVjdFN0b3JlOjpwdXRPckFkZChKU0M6OkV4ZWNTdGF0 ZSYgc3RhdGUsIEpTQzo6SlNWYWx1ZQogewogICAgIExPRyhJbmRleGVkREIsICJJREJPYmplY3RT dG9yZTo6cHV0T3JBZGQiKTsKIAorICAgIC8vIFRoZSBJREIgc3BlYyBmb3Igc2V2ZXJhbCBJREJP YmplY3RTdG9yZSBtZXRob2RzIHN0YXRlcyB0aGF0IHRyYW5zYWN0aW9uIHJlbGF0ZWQgZXhjZXB0 aW9ucyBzaG91bGQgZmlyZSBiZWZvcmUKKyAgICAvLyB0aGUgZXhjZXB0aW9uIGZvciBhbiBvYmpl Y3Qgc3RvcmUgYmVpbmcgZGVsZXRlZC4KKyAgICAvLyBIb3dldmVyLCBhIGhhbmRmdWwgb2YgVzND IElEQiB0ZXN0cyBleHBlY3QgdGhlIGRlbGV0ZWQgZXhjZXB0aW9uIGV2ZW4gdGhvdWdoIHRoZSB0 cmFuc2FjdGlvbiBpbmFjdGl2ZSBleGNlcHRpb24gYWxzbyBhcHBsaWVzLgorICAgIC8vIEFkZGl0 aW9uYWxseSwgQ2hyb21lIGFuZCBFZGdlIGFncmVlIHdpdGggdGhlIHRlc3QsIGFzIGRvZXMgTGVn YWN5IElEQiBpbiBXZWJLaXQuCisgICAgLy8gVW50aWwgdGhpcyBpcyBzb3J0ZWQgb3V0LCB3ZSds bCBhZ3JlZSB3aXRoIHRoZSB0ZXN0IGFuZCB0aGUgbWFqb3JpdHkgc2hhcmUgYnJvd3NlcnMuCisg ICAgaWYgKG1fZGVsZXRlZCkgeworICAgICAgICBlYy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRp b246OkludmFsaWRTdGF0ZUVycm9yOworICAgICAgICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFs KCJGYWlsZWQgdG8gc3RvcmUgcmVjb3JkIGluIGFuIElEQk9iamVjdFN0b3JlOiBUaGUgb2JqZWN0 IHN0b3JlIGhhcyBiZWVuIGRlbGV0ZWQuIik7CisgICAgICAgIHJldHVybiBudWxscHRyOworICAg IH0KKwogICAgIGlmICghbV90cmFuc2FjdGlvbi0+aXNBY3RpdmUoKSkgewogICAgICAgICBlYy5j b2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246OlRyYW5zYWN0aW9uSW5hY3RpdmVFcnJvcjsKICAg ICAgICAgZWMubWVzc2FnZSA9IEFTQ0lJTGl0ZXJhbCgiRmFpbGVkIHRvIHN0b3JlIHJlY29yZCBp biBhbiBJREJPYmplY3RTdG9yZTogVGhlIHRyYW5zYWN0aW9uIGlzIGluYWN0aXZlIG9yIGZpbmlz aGVkLiIpOwpAQCAtMjU3LDEyICsyNjgsNiBAQCBSZWZQdHI8SURCUmVxdWVzdD4gSURCT2JqZWN0 U3RvcmU6OnB1dE9yQWRkKEpTQzo6RXhlY1N0YXRlJiBzdGF0ZSwgSlNDOjpKU1ZhbHVlCiAgICAg ICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAotICAgIGlmIChtX2RlbGV0ZWQpIHsKLSAgICAg ICAgZWMuY29kZSA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpJbnZhbGlkU3RhdGVFcnJvcjsKLSAg ICAgICAgZWMubWVzc2FnZSA9IEFTQ0lJTGl0ZXJhbCgiRmFpbGVkIHRvIHN0b3JlIHJlY29yZCBp biBhbiBJREJPYmplY3RTdG9yZTogVGhlIG9iamVjdCBzdG9yZSBoYXMgYmVlbiBkZWxldGVkLiIp OwotICAgICAgICByZXR1cm4gbnVsbHB0cjsKLSAgICB9Ci0KICAgICBSZWZQdHI8U2VyaWFsaXpl ZFNjcmlwdFZhbHVlPiBzZXJpYWxpemVkVmFsdWUgPSBTZXJpYWxpemVkU2NyaXB0VmFsdWU6OmNy ZWF0ZSgmc3RhdGUsIHZhbHVlLCBudWxscHRyLCBudWxscHRyKTsKICAgICBpZiAoc3RhdGUuaGFk RXhjZXB0aW9uKCkpIHsKICAgICAgICAgLy8gQ2xlYXIgdGhlIERPTSBleGNlcHRpb24gZnJvbSB0 aGUgc2VyaWFsaXplciBzbyB3ZSBjYW4gZ2l2ZSBhIG1vcmUgdGFyZ2V0ZWQgZXhjZXB0aW9uLgpA QCAtMzQwLDYgKzM0NSwxNyBAQCBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0 U3RvcmU6OmRlbGV0ZUZ1bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleAogewogICAgIExPRyhJ bmRleGVkREIsICJJREJPYmplY3RTdG9yZTo6ZGVsZXRlRnVuY3Rpb24iKTsKIAorICAgIC8vIFRo ZSBJREIgc3BlYyBmb3Igc2V2ZXJhbCBJREJPYmplY3RTdG9yZSBtZXRob2RzIHN0YXRlcyB0aGF0 IHRyYW5zYWN0aW9uIHJlbGF0ZWQgZXhjZXB0aW9ucyBzaG91bGQgZmlyZSBiZWZvcmUKKyAgICAv LyB0aGUgZXhjZXB0aW9uIGZvciBhbiBvYmplY3Qgc3RvcmUgYmVpbmcgZGVsZXRlZC4KKyAgICAv LyBIb3dldmVyLCBhIGhhbmRmdWwgb2YgVzNDIElEQiB0ZXN0cyBleHBlY3QgdGhlIGRlbGV0ZWQg ZXhjZXB0aW9uIGV2ZW4gdGhvdWdoIHRoZSB0cmFuc2FjdGlvbiBpbmFjdGl2ZSBleGNlcHRpb24g YWxzbyBhcHBsaWVzLgorICAgIC8vIEFkZGl0aW9uYWxseSwgQ2hyb21lIGFuZCBFZGdlIGFncmVl IHdpdGggdGhlIHRlc3QsIGFzIGRvZXMgTGVnYWN5IElEQiBpbiBXZWJLaXQuCisgICAgLy8gVW50 aWwgdGhpcyBpcyBzb3J0ZWQgb3V0LCB3ZSdsbCBhZ3JlZSB3aXRoIHRoZSB0ZXN0IGFuZCB0aGUg bWFqb3JpdHkgc2hhcmUgYnJvd3NlcnMuCisgICAgaWYgKG1fZGVsZXRlZCkgeworICAgICAgICBl Yy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246OkludmFsaWRTdGF0ZUVycm9yOworICAgICAg ICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFsKCJGYWlsZWQgdG8gZXhlY3V0ZSAnZGVsZXRlJyBv biAnSURCT2JqZWN0U3RvcmUnOiBUaGUgb2JqZWN0IHN0b3JlIGhhcyBiZWVuIGRlbGV0ZWQuIik7 CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KKwogICAgIGlmICghbV90cmFuc2FjdGlv bi0+aXNBY3RpdmUoKSkgewogICAgICAgICBlYy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246 OlRyYW5zYWN0aW9uSW5hY3RpdmVFcnJvcjsKICAgICAgICAgZWMubWVzc2FnZSA9IEFTQ0lJTGl0 ZXJhbCgiRmFpbGVkIHRvIGV4ZWN1dGUgJ2RlbGV0ZScgb24gJ0lEQk9iamVjdFN0b3JlJzogVGhl IHRyYW5zYWN0aW9uIGlzIGluYWN0aXZlIG9yIGZpbmlzaGVkLiIpOwpAQCAtMzUyLDEyICszNjgs NiBAQCBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OmRlbGV0ZUZ1 bmN0aW9uKFNjcmlwdEV4ZWN1dGlvbkNvbnRleAogICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAg ICB9CiAKLSAgICBpZiAobV9kZWxldGVkKSB7Ci0gICAgICAgIGVjLmNvZGUgPSBJREJEYXRhYmFz ZUV4Y2VwdGlvbjo6SW52YWxpZFN0YXRlRXJyb3I7Ci0gICAgICAgIGVjLm1lc3NhZ2UgPSBBU0NJ SUxpdGVyYWwoIkZhaWxlZCB0byBleGVjdXRlICdkZWxldGUnIG9uICdJREJPYmplY3RTdG9yZSc6 IFRoZSBvYmplY3Qgc3RvcmUgaGFzIGJlZW4gZGVsZXRlZC4iKTsKLSAgICAgICAgcmV0dXJuIG51 bGxwdHI7Ci0gICAgfQotCiAgICAgSURCS2V5UmFuZ2VEYXRhIGtleVJhbmdlRGF0YShrZXlSYW5n ZSk7CiAgICAgaWYgKCFrZXlSYW5nZURhdGEuaXNWYWxpZCgpKSB7CiAgICAgICAgIGVjLmNvZGUg PSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6RGF0YUVycm9yOwpAQCAtMzkxLDYgKzQwMSwxNyBAQCBS ZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OmNsZWFyKFNjcmlwdEV4 ZWN1dGlvbkNvbnRleHQqIGNvbnRleAogewogICAgIExPRyhJbmRleGVkREIsICJJREJPYmplY3RT dG9yZTo6Y2xlYXIiKTsKIAorICAgIC8vIFRoZSBJREIgc3BlYyBmb3Igc2V2ZXJhbCBJREJPYmpl Y3RTdG9yZSBtZXRob2RzIHN0YXRlcyB0aGF0IHRyYW5zYWN0aW9uIHJlbGF0ZWQgZXhjZXB0aW9u cyBzaG91bGQgZmlyZSBiZWZvcmUKKyAgICAvLyB0aGUgZXhjZXB0aW9uIGZvciBhbiBvYmplY3Qg c3RvcmUgYmVpbmcgZGVsZXRlZC4KKyAgICAvLyBIb3dldmVyLCBhIGhhbmRmdWwgb2YgVzNDIElE QiB0ZXN0cyBleHBlY3QgdGhlIGRlbGV0ZWQgZXhjZXB0aW9uIGV2ZW4gdGhvdWdoIHRoZSB0cmFu c2FjdGlvbiBpbmFjdGl2ZSBleGNlcHRpb24gYWxzbyBhcHBsaWVzLgorICAgIC8vIEFkZGl0aW9u YWxseSwgQ2hyb21lIGFuZCBFZGdlIGFncmVlIHdpdGggdGhlIHRlc3QsIGFzIGRvZXMgTGVnYWN5 IElEQiBpbiBXZWJLaXQuCisgICAgLy8gVW50aWwgdGhpcyBpcyBzb3J0ZWQgb3V0LCB3ZSdsbCBh Z3JlZSB3aXRoIHRoZSB0ZXN0IGFuZCB0aGUgbWFqb3JpdHkgc2hhcmUgYnJvd3NlcnMuCisgICAg aWYgKG1fZGVsZXRlZCkgeworICAgICAgICBlYy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246 OkludmFsaWRTdGF0ZUVycm9yOworICAgICAgICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFsKCJG YWlsZWQgdG8gZXhlY3V0ZSAnY2xlYXInIG9uICdJREJPYmplY3RTdG9yZSc6IFRoZSBvYmplY3Qg c3RvcmUgaGFzIGJlZW4gZGVsZXRlZC4iKTsKKyAgICAgICAgcmV0dXJuIG51bGxwdHI7CisgICAg fQorCiAgICAgaWYgKCFtX3RyYW5zYWN0aW9uLT5pc0FjdGl2ZSgpKSB7CiAgICAgICAgIGVjLmNv ZGUgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6VHJhbnNhY3Rpb25JbmFjdGl2ZUVycm9yOwogICAg ICAgICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFsKCJGYWlsZWQgdG8gZXhlY3V0ZSAnY2xlYXIn IG9uICdJREJPYmplY3RTdG9yZSc6IFRoZSB0cmFuc2FjdGlvbiBpcyBpbmFjdGl2ZSBvciBmaW5p c2hlZC4iKTsKQEAgLTQwMywxMiArNDI0LDYgQEAgUmVmUHRyPFdlYkNvcmU6OklEQlJlcXVlc3Q+ IElEQk9iamVjdFN0b3JlOjpjbGVhcihTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBjb250ZXgKICAg ICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCi0gICAgaWYgKG1fZGVsZXRlZCkgewotICAg ICAgICBlYy5jb2RlID0gSURCRGF0YWJhc2VFeGNlcHRpb246OkludmFsaWRTdGF0ZUVycm9yOwot ICAgICAgICBlYy5tZXNzYWdlID0gQVNDSUlMaXRlcmFsKCJGYWlsZWQgdG8gZXhlY3V0ZSAnY2xl YXInIG9uICdJREJPYmplY3RTdG9yZSc6IFRoZSBvYmplY3Qgc3RvcmUgaGFzIGJlZW4gZGVsZXRl ZC4iKTsKLSAgICAgICAgcmV0dXJuIG51bGxwdHI7Ci0gICAgfQotCiAgICAgUmVmPElEQlJlcXVl c3Q+IHJlcXVlc3QgPSBtX3RyYW5zYWN0aW9uLT5yZXF1ZXN0Q2xlYXJPYmplY3RTdG9yZSgqY29u dGV4dCwgKnRoaXMpOwogICAgIHJldHVybiBhZG9wdFJlZihyZXF1ZXN0LmxlYWtSZWYoKSk7CiB9 CkBAIC01OTIsMTggKzYwNywyMyBAQCBSZWZQdHI8V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2Jq ZWN0U3RvcmU6OmNvdW50KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqIGNvbnRleAogCiBSZWZQdHI8 V2ViQ29yZTo6SURCUmVxdWVzdD4gSURCT2JqZWN0U3RvcmU6OmRvQ291bnQoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCYgY29udGV4dCwgY29uc3QgSURCS2V5UmFuZ2VEYXRhJiByYW5nZSwgRXhjZXB0 aW9uQ29kZVdpdGhNZXNzYWdlJiBlYykKIHsKLSAgICBpZiAoIW1fdHJhbnNhY3Rpb24tPmlzQWN0 aXZlKCkpIHsKLSAgICAgICAgZWMuY29kZSA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpUcmFuc2Fj dGlvbkluYWN0aXZlRXJyb3I7Ci0gICAgICAgIGVjLm1lc3NhZ2UgPSBBU0NJSUxpdGVyYWwoIkZh aWxlZCB0byBleGVjdXRlICdjb3VudCcgb24gJ0lEQk9iamVjdFN0b3JlJzogVGhlIHRyYW5zYWN0 aW9uIGlzIGluYWN0aXZlIG9yIGZpbmlzaGVkLiIpOwotICAgICAgICByZXR1cm4gbnVsbHB0cjsK LSAgICB9Ci0KKyAgICAvLyBUaGUgSURCIHNwZWMgZm9yIHNldmVyYWwgSURCT2JqZWN0U3RvcmUg bWV0aG9kcyBzdGF0ZXMgdGhhdCB0cmFuc2FjdGlvbiByZWxhdGVkIGV4Y2VwdGlvbnMgc2hvdWxk IGZpcmUgYmVmb3JlCisgICAgLy8gdGhlIGV4Y2VwdGlvbiBmb3IgYW4gb2JqZWN0IHN0b3JlIGJl aW5nIGRlbGV0ZWQuCisgICAgLy8gSG93ZXZlciwgYSBoYW5kZnVsIG9mIFczQyBJREIgdGVzdHMg ZXhwZWN0IHRoZSBkZWxldGVkIGV4Y2VwdGlvbiBldmVuIHRob3VnaCB0aGUgdHJhbnNhY3Rpb24g aW5hY3RpdmUgZXhjZXB0aW9uIGFsc28gYXBwbGllcy4KKyAgICAvLyBBZGRpdGlvbmFsbHksIENo cm9tZSBhbmQgRWRnZSBhZ3JlZSB3aXRoIHRoZSB0ZXN0LCBhcyBkb2VzIExlZ2FjeSBJREIgaW4g V2ViS2l0LgorICAgIC8vIFVudGlsIHRoaXMgaXMgc29ydGVkIG91dCwgd2UnbGwgYWdyZWUgd2l0 aCB0aGUgdGVzdCBhbmQgdGhlIG1ham9yaXR5IHNoYXJlIGJyb3dzZXJzLgogICAgIGlmIChtX2Rl bGV0ZWQpIHsKICAgICAgICAgZWMuY29kZSA9IElEQkRhdGFiYXNlRXhjZXB0aW9uOjpJbnZhbGlk U3RhdGVFcnJvcjsKICAgICAgICAgZWMubWVzc2FnZSA9IEFTQ0lJTGl0ZXJhbCgiRmFpbGVkIHRv IGV4ZWN1dGUgJ2NvdW50JyBvbiAnSURCT2JqZWN0U3RvcmUnOiBUaGUgb2JqZWN0IHN0b3JlIGhh cyBiZWVuIGRlbGV0ZWQuIik7CiAgICAgICAgIHJldHVybiBudWxscHRyOwogICAgIH0KIAorICAg IGlmICghbV90cmFuc2FjdGlvbi0+aXNBY3RpdmUoKSkgeworICAgICAgICBlYy5jb2RlID0gSURC RGF0YWJhc2VFeGNlcHRpb246OlRyYW5zYWN0aW9uSW5hY3RpdmVFcnJvcjsKKyAgICAgICAgZWMu bWVzc2FnZSA9IEFTQ0lJTGl0ZXJhbCgiRmFpbGVkIHRvIGV4ZWN1dGUgJ2NvdW50JyBvbiAnSURC T2JqZWN0U3RvcmUnOiBUaGUgdHJhbnNhY3Rpb24gaXMgaW5hY3RpdmUgb3IgZmluaXNoZWQuIik7 CisgICAgICAgIHJldHVybiBudWxscHRyOworICAgIH0KKwogICAgIGlmICghcmFuZ2UuaXNWYWxp ZCgpKSB7CiAgICAgICAgIGVjLmNvZGUgPSBJREJEYXRhYmFzZUV4Y2VwdGlvbjo6RGF0YUVycm9y OwogICAgICAgICByZXR1cm4gbnVsbHB0cjsK