42787 2010-07-21 14:25:45 -0700 The transaction callback parameter of db.changeVersion() should be optional 2010-09-24 07:35:17 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 dumi dumi abarth hausmann michaeln oldest_to_newest 254523 0 dumi 2010-07-21 14:25:45 -0700 The spec says that the third parameter of db.changeVersion() (the transaction callback) is optional. It is currently mandatory in WebCore. 254552 1 62239 dumi 2010-07-21 15:25:25 -0700 Created attachment 62239 patch 254553 2 62240 dumi 2010-07-21 15:30:30 -0700 Created attachment 62240 patch same patch, forgot to make some minor changes to the v8 bindings. 254970 3 dumi 2010-07-22 13:57:27 -0700 landed: r63910. 284370 4 hausmann 2010-09-24 07:34:33 -0700 <cherry-pick-for-backport: r63910> 284371 5 hausmann 2010-09-24 07:35:07 -0700 Revision r63910 cherry-picked into qtwebkit-2.1 with commit 8e0cd1b <http://gitorious.org/webkit/qtwebkit/commit/8e0cd1b> 62239 2010-07-21 15:25:25 -0700 2010-07-21 15:30:30 -0700 patch patch text/plain 9117 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzg1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTAtMDctMjEgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlIGRiLmNoYW5nZVZlcnNpb24oKSdzIHRoaXJkIHBhcmFtZXRlciBvcHRpb25hbCwgYXMg cmVxdWlyZWQgYnkgdGhlIHNwZWMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00Mjc4NworCisgICAgICAgICogYmluZGluZ3MvanMvSlNEYXRhYmFzZUN1 c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RhdGFiYXNlOjpjaGFuZ2VWZXJzaW9uKToK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RhdGFiYXNlU3luY0N1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU0RhdGFiYXNlU3luYzo6Y2hhbmdlVmVyc2lvbik6CisgICAgICAgICogc3Rv cmFnZS9TUUxUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlv bjo6ZGVsaXZlclRyYW5zYWN0aW9uQ2FsbGJhY2spOgorICAgICAgICAqIHN0b3JhZ2UvU1FMVHJh bnNhY3Rpb25TeW5jLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uU3luYzo6 ZXhlY3V0ZSk6CisKIDIwMTAtMDctMjEgIEJvIExpdSAgPGJvbGl1QGNocm9taXVtLm9yZz4KIAog ICAgICAgICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdz L2pzL0pTRGF0YWJhc2VDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3Mv anMvSlNEYXRhYmFzZUN1c3RvbS5jcHAJKHJldmlzaW9uIDYzODU5KQorKysgV2ViQ29yZS9iaW5k aW5ncy9qcy9KU0RhdGFiYXNlQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsMTcgKzU3 LDIwIEBAIEpTVmFsdWUgSlNEYXRhYmFzZTo6Y2hhbmdlVmVyc2lvbihFeGVjU3QKICAgICBpZiAo ZXhlYy0+aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCi0g ICAgSlNPYmplY3QqIG9iamVjdCA9IGV4ZWMtPmFyZ3VtZW50KDIpLmdldE9iamVjdCgpOwotICAg IGlmICghb2JqZWN0KSB7Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01B VENIX0VSUik7Ci0gICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwotICAgIH0KKyAgICBSZWZQ dHI8U1FMVHJhbnNhY3Rpb25DYWxsYmFjaz4gY2FsbGJhY2s7CisgICAgaWYgKGV4ZWMtPmFyZ3Vt ZW50Q291bnQoKSA+IDIgJiYgIWV4ZWMtPmFyZ3VtZW50KDIpLmlzTnVsbCgpKSB7CisgICAgICAg IEpTT2JqZWN0KiBvYmplY3QgPSBleGVjLT5hcmd1bWVudCgyKS5nZXRPYmplY3QoKTsKKyAgICAg ICAgaWYgKCFvYmplY3QpIHsKKyAgICAgICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBF X01JU01BVENIX0VSUik7CisgICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKKyAgICAg ICAgfQogCi0gICAgUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+IGNhbGxiYWNrKEpTU1FM VHJhbnNhY3Rpb25DYWxsYmFjazo6Y3JlYXRlKG9iamVjdCwgc3RhdGljX2Nhc3Q8SlNET01HbG9i YWxPYmplY3QqPihnbG9iYWxPYmplY3QoKSkpKTsKKyAgICAgICAgY2FsbGJhY2sgPSBKU1NRTFRy YW5zYWN0aW9uQ2FsbGJhY2s6OmNyZWF0ZShvYmplY3QsIHN0YXRpY19jYXN0PEpTRE9NR2xvYmFs T2JqZWN0Kj4oZ2xvYmFsT2JqZWN0KCkpKTsKKyAgICB9CiAKICAgICBSZWZQdHI8U1FMVHJhbnNh Y3Rpb25FcnJvckNhbGxiYWNrPiBlcnJvckNhbGxiYWNrOwotICAgIGlmICghZXhlYy0+YXJndW1l bnQoMykuaXNOdWxsKCkpIHsKLSAgICAgICAgb2JqZWN0ID0gZXhlYy0+YXJndW1lbnQoMykuZ2V0 T2JqZWN0KCk7CisgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA+IDMgJiYgIWV4ZWMtPmFy Z3VtZW50KDMpLmlzTnVsbCgpKSB7CisgICAgICAgIEpTT2JqZWN0KiBvYmplY3QgPSBleGVjLT5h cmd1bWVudCgzKS5nZXRPYmplY3QoKTsKICAgICAgICAgaWYgKCFvYmplY3QpIHsKICAgICAgICAg ICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01BVENIX0VSUik7CiAgICAgICAgICAg ICByZXR1cm4ganNVbmRlZmluZWQoKTsKQEAgLTc3LDggKzgwLDggQEAgSlNWYWx1ZSBKU0RhdGFi YXNlOjpjaGFuZ2VWZXJzaW9uKEV4ZWNTdAogICAgIH0KIAogICAgIFJlZlB0cjxWb2lkQ2FsbGJh Y2s+IHN1Y2Nlc3NDYWxsYmFjazsKLSAgICBpZiAoIWV4ZWMtPmFyZ3VtZW50KDQpLmlzTnVsbCgp KSB7Ci0gICAgICAgIG9iamVjdCA9IGV4ZWMtPmFyZ3VtZW50KDQpLmdldE9iamVjdCgpOworICAg IGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPiA0ICYmICFleGVjLT5hcmd1bWVudCg0KS5pc051 bGwoKSkgeworICAgICAgICBKU09iamVjdCogb2JqZWN0ID0gZXhlYy0+YXJndW1lbnQoNCkuZ2V0 T2JqZWN0KCk7CiAgICAgICAgIGlmICghb2JqZWN0KSB7CiAgICAgICAgICAgICBzZXRET01FeGNl cHRpb24oZXhlYywgVFlQRV9NSVNNQVRDSF9FUlIpOwogICAgICAgICAgICAgcmV0dXJuIGpzVW5k ZWZpbmVkKCk7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRGF0YWJhc2VTeW5jQ3VzdG9t LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRGF0YWJhc2VTeW5jQ3Vz dG9tLmNwcAkocmV2aXNpb24gNjM4NTkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRGF0YWJh c2VTeW5jQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsMTMgKzUyLDE2IEBAIEpTVmFs dWUgSlNEYXRhYmFzZVN5bmM6OmNoYW5nZVZlcnNpb24oRXgKICAgICBpZiAoZXhlYy0+aGFkRXhj ZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCi0gICAgSlNPYmplY3Qq IG9iamVjdCA9IGV4ZWMtPmFyZ3VtZW50KDIpLmdldE9iamVjdCgpOwotICAgIGlmICghb2JqZWN0 KSB7Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01BVENIX0VSUik7Ci0g ICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwotICAgIH0KKyAgICBSZWZQdHI8U1FMVHJhbnNh Y3Rpb25TeW5jQ2FsbGJhY2s+IGNhbGxiYWNrOworICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50 KCkgPiAyICYmICFleGVjLT5hcmd1bWVudCgyKS5pc051bGwoKSkgeworICAgICAgICBKU09iamVj dCogb2JqZWN0ID0gZXhlYy0+YXJndW1lbnQoMikuZ2V0T2JqZWN0KCk7CisgICAgICAgIGlmICgh b2JqZWN0KSB7CisgICAgICAgICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgVFlQRV9NSVNNQVRD SF9FUlIpOworICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisgICAgICAgIH0KIAot ICAgIFJlZlB0cjxTUUxUcmFuc2FjdGlvblN5bmNDYWxsYmFjaz4gY2FsbGJhY2soSlNTUUxUcmFu c2FjdGlvblN5bmNDYWxsYmFjazo6Y3JlYXRlKG9iamVjdCwgc3RhdGljX2Nhc3Q8SlNET01HbG9i YWxPYmplY3QqPihnbG9iYWxPYmplY3QoKSkpKTsKKyAgICAgICAgY2FsbGJhY2sgPSBKU1NRTFRy YW5zYWN0aW9uU3luY0NhbGxiYWNrOjpjcmVhdGUob2JqZWN0LCBzdGF0aWNfY2FzdDxKU0RPTUds b2JhbE9iamVjdCo+KGdsb2JhbE9iamVjdCgpKSk7CisgICAgfQogCiAgICAgRXhjZXB0aW9uQ29k ZSBlYyA9IDA7CiAgICAgbV9pbXBsLT5jaGFuZ2VWZXJzaW9uKG9sZFZlcnNpb24sIG5ld1ZlcnNp b24sIGNhbGxiYWNrLnJlbGVhc2UoKSwgZWMpOwpJbmRleDogV2ViQ29yZS9zdG9yYWdlL1NRTFRy YW5zYWN0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL3N0b3JhZ2UvU1FMVHJhbnNhY3Rp b24uY3BwCShyZXZpc2lvbiA2Mzg1OSkKKysrIFdlYkNvcmUvc3RvcmFnZS9TUUxUcmFuc2FjdGlv bi5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTI5Miw4ICsyOTIsNyBAQCB2b2lkIFNRTFRyYW5zYWN0 aW9uOjpkZWxpdmVyVHJhbnNhY3Rpb25DCiAgICAgICAgIG1fZXhlY3V0ZVNxbEFsbG93ZWQgPSB0 cnVlOwogICAgICAgICBzaG91bGREZWxpdmVyRXJyb3JDYWxsYmFjayA9ICFtX2NhbGxiYWNrLT5o YW5kbGVFdmVudChtX2RhdGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMpOwog ICAgICAgICBtX2V4ZWN1dGVTcWxBbGxvd2VkID0gZmFsc2U7Ci0gICAgfSBlbHNlCi0gICAgICAg IHNob3VsZERlbGl2ZXJFcnJvckNhbGxiYWNrID0gdHJ1ZTsKKyAgICB9CiAKICAgICAvLyBUcmFu c2FjdGlvbiBTdGVwIDUgLSBJZiB0aGUgdHJhbnNhY3Rpb24gY2FsbGJhY2sgd2FzIG51bGwgb3Ig cmFpc2VkIGFuIGV4Y2VwdGlvbiwganVtcCB0byB0aGUgZXJyb3IgY2FsbGJhY2sKICAgICBpZiAo c2hvdWxkRGVsaXZlckVycm9yQ2FsbGJhY2spIHsKSW5kZXg6IFdlYkNvcmUvc3RvcmFnZS9TUUxU cmFuc2FjdGlvblN5bmMuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9TUUxUcmFu c2FjdGlvblN5bmMuY3BwCShyZXZpc2lvbiA2Mzg1OSkKKysrIFdlYkNvcmUvc3RvcmFnZS9TUUxU cmFuc2FjdGlvblN5bmMuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTAsNyArMTUwLDcgQEAgRXhj ZXB0aW9uQ29kZSBTUUxUcmFuc2FjdGlvblN5bmM6OmJlZ2luKAogRXhjZXB0aW9uQ29kZSBTUUxU cmFuc2FjdGlvblN5bmM6OmV4ZWN1dGUoKQogewogICAgIEFTU0VSVChtX2RhdGFiYXNlLT5zY3Jp cHRFeGVjdXRpb25Db250ZXh0KCktPmlzQ29udGV4dFRocmVhZCgpKTsKLSAgICBpZiAoIW1fZGF0 YWJhc2UtPm9wZW5lZCgpIHx8ICFtX2NhbGxiYWNrIHx8ICFtX2NhbGxiYWNrLT5oYW5kbGVFdmVu dChtX2RhdGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMpKSB7CisgICAgaWYg KCFtX2RhdGFiYXNlLT5vcGVuZWQoKSB8fCAobV9jYWxsYmFjayAmJiAhbV9jYWxsYmFjay0+aGFu ZGxlRXZlbnQobV9kYXRhYmFzZS0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCB0aGlzKSkpIHsK ICAgICAgICAgbV9jYWxsYmFjayA9IDA7CiAgICAgICAgIHJldHVybiBTUUxFeGNlcHRpb246OlVO S05PV05fRVJSOwogICAgIH0KSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDYzODU5KQorKysgTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTQgQEAKKzIwMTAtMDctMjEg IER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9taXVtLm9yZz4KKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBTaW1wbGlmeSBzb21lIHRlc3RzLCBhbmQg bWFrZSBzdXJlIGRiLmNoYW5nZVZlcnNpb24oKSdzIHRoaXJkIHBhcmFtZXRlciBpcyBvcHRpb25h bC4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTQyNzg3 CisKKyAgICAgICAgKiBmYXN0L3dvcmtlcnMvc3RvcmFnZS9yZXNvdXJjZXMvY2hhbmdlLXZlcnNp b24tc3luYy0xLmpzOgorICAgICAgICAqIGZhc3Qvd29ya2Vycy9zdG9yYWdlL3Jlc291cmNlcy9j aGFuZ2UtdmVyc2lvbi1zeW5jLTIuanM6CisgICAgICAgICogc3RvcmFnZS9jaGFuZ2UtdmVyc2lv bi5odG1sOgorCiAyMDEwLTA3LTIxICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgRXJpYyBTZWlkZWwuCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0 L3dvcmtlcnMvc3RvcmFnZS9yZXNvdXJjZXMvY2hhbmdlLXZlcnNpb24tc3luYy0xLmpzCj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvd29ya2Vycy9zdG9yYWdlL3Jlc291cmNlcy9jaGFu Z2UtdmVyc2lvbi1zeW5jLTEuanMJKHJldmlzaW9uIDYzODU5KQorKysgTGF5b3V0VGVzdHMvZmFz dC93b3JrZXJzL3N0b3JhZ2UvcmVzb3VyY2VzL2NoYW5nZS12ZXJzaW9uLXN5bmMtMS5qcwkod29y a2luZyBjb3B5KQpAQCAtMSwxMyArMSwxMSBAQAogdmFyIEVYUEVDVEVEX1ZFUlNJT05fQUZURVJf SElYSUVfVEVTVCA9ICIyIjsKIHZhciBFWFBFQ1RFRF9WRVJTSU9OX0FGVEVSX1JFTE9BRCA9ICIz IjsKIAotZnVuY3Rpb24gZW1wdHlGdW5jdGlvbigpIHsgfQotCiB2YXIgZGIxID0gb3BlbkRhdGFi YXNlU3luYygiQ2hhbmdlVmVyc2lvblRlc3QiLCAiMSIsICJUZXN0IGZvciB0aGUgZGF0YWJhc2Uu Y2hhbmdlVmVyc2lvbigpIGZ1bmN0aW9uIiwgMSk7CiB2YXIgZGIyID0gb3BlbkRhdGFiYXNlU3lu YygiQ2hhbmdlVmVyc2lvblRlc3QiLCAiMSIsICJUZXN0IGZvciB0aGUgZGF0YWJhc2UuY2hhbmdl VmVyc2lvbigpIGZ1bmN0aW9uIiwgMSk7CiAKIC8vIEZpcnN0IHJ1biBIaXhpZSdzIHRlc3QgdG8g ZW5zdXJlIGJhc2ljIGNoYW5nZVZlcnNpb24oKSBmdW5jdGlvbmFsaXR5IHdvcmtzIChzZWUgYnVn IDI4NDE4KS4KLWRiMS5jaGFuZ2VWZXJzaW9uKCIxIiwgRVhQRUNURURfVkVSU0lPTl9BRlRFUl9I SVhJRV9URVNULCBlbXB0eUZ1bmN0aW9uKTsKK2RiMS5jaGFuZ2VWZXJzaW9uKCIxIiwgRVhQRUNU RURfVkVSU0lPTl9BRlRFUl9ISVhJRV9URVNUKTsKIGlmIChkYjIudmVyc2lvbiAhPSBkYjEudmVy c2lvbikgewogICAgIHBvc3RNZXNzYWdlKCJGQUlMOiBjaGFuZ2luZyBkYjEncyB2ZXJzaW9uICgi ICsgZGIxLnZlcnNpb24gKyAiKSBkaWQgbm90IGNoYW5nZSBkYjIncyB2ZXJzaW9uICgiICsgZGIy LnZlcnNpb24gKyAiKSBhcyBleHBlY3RlZC4iKTsKICAgICBwb3N0TWVzc2FnZSgiZmFpbCIpOwpJ bmRleDogTGF5b3V0VGVzdHMvZmFzdC93b3JrZXJzL3N0b3JhZ2UvcmVzb3VyY2VzL2NoYW5nZS12 ZXJzaW9uLXN5bmMtMi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L3dvcmtlcnMv c3RvcmFnZS9yZXNvdXJjZXMvY2hhbmdlLXZlcnNpb24tc3luYy0yLmpzCShyZXZpc2lvbiA2Mzg1 OSkKKysrIExheW91dFRlc3RzL2Zhc3Qvd29ya2Vycy9zdG9yYWdlL3Jlc291cmNlcy9jaGFuZ2Ut dmVyc2lvbi1zeW5jLTIuanMJKHdvcmtpbmcgY29weSkKQEAgLTcsNiArNyw2IEBAIGVsc2UKICAg ICBwb3N0TWVzc2FnZSgiRkFJTDogZGIudmVyc2lvbiBpcyAiICsgZGIudmVyc2lvbiArICI7IGV4 cGVjdGVkICIgKyBFWFBFQ1RFRF9WRVJTSU9OX0FGVEVSX1JFTE9BRCk7CiAKIC8vIFJlc2V0IHRo ZSB2ZXJzaW9uOyBvdGhlcndpc2UgdGhpcyB0ZXN0IHdpbGwgZmFpbCB0aGUgbmV4dCB0aW1lIGl0 J3MgcnVuCi1kYi5jaGFuZ2VWZXJzaW9uKGRiLnZlcnNpb24sICIxIiwgZnVuY3Rpb24odHgpIHsg fSk7CitkYi5jaGFuZ2VWZXJzaW9uKGRiLnZlcnNpb24sICIxIik7CiAKIHBvc3RNZXNzYWdlKCJk b25lIik7CkluZGV4OiBMYXlvdXRUZXN0cy9zdG9yYWdlL2NoYW5nZS12ZXJzaW9uLmh0bWwKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gTGF5b3V0VGVzdHMvc3RvcmFnZS9jaGFuZ2UtdmVyc2lvbi5odG1sCShyZXZp c2lvbiA2Mzg1OSkKKysrIExheW91dFRlc3RzL3N0b3JhZ2UvY2hhbmdlLXZlcnNpb24uaHRtbAko d29ya2luZyBjb3B5KQpAQCAtNDQsNiArNDQsMTAgQEAgZnVuY3Rpb24gcnVuVGVzdCgpCiAgICAg aWYgKHdpbmRvdy5sb2NhdGlvbi5zZWFyY2ggPT0gIj8yIikgewogICAgICAgICBkYjEgPSB3aW5k b3cub3BlbkRhdGFiYXNlKCJjaGFuZ2V2ZXJzaW9uLXRlc3QiLCAiIiwgIlRlc3QgZm9yIHRoZSBk YXRhYmFzZS5jaGFuZ2VWZXJzaW9uKCkgZnVuY3Rpb24iLCAxMDI0KTsKICAgICAgICAgbG9nKCJG aW5pc2hlZCB0ZXN0cyB3aXRoIHZlcnNpb24gIiArIGRiMS52ZXJzaW9uICsgIjsgZXhwZWN0ZWQg dmVyc2lvbjogIiArIEVYUEVDVEVEX1ZFUlNJT05fQUZURVJfUkVMT0FEKTsKKworICAgICAgICAv LyBSZXNldCB0aGUgREIgdmVyc2lvbiBvciB0aGUgbmV4dCBydW4gbWlnaHQgZmFpbAorICAgICAg ICBkYjEuY2hhbmdlVmVyc2lvbihkYjEudmVyc2lvbiwgIjEiKTsKKwogICAgICAgICBmaW5pc2hU ZXN0KCk7CiAgICAgfSBlbHNlCiAgICAgICAgIHRlc3RQYXJ0MSgpOwpAQCAtNjAsNyArNjQsNyBA QCBmdW5jdGlvbiB0ZXN0UGFydDEoKSB7CiAgICAgdmFyIGRiMiA9IHdpbmRvdy5vcGVuRGF0YWJh c2UoImNoYW5nZXZlcnNpb24tdGVzdCIsICIxIiwgIlRlc3QgZm9yIHRoZSBkYXRhYmFzZS5jaGFu Z2VWZXJzaW9uKCkgZnVuY3Rpb24iLCAxMDI0KTsKIAogICAgIC8vIEZpcnN0IHJ1biBIaXhpZSdz IHRlc3QgdG8gZW5zdXJlIGJhc2ljIGNoYW5nZVZlcnNpb24gZnVuY3Rpb25hbGl0eSB3b3JrcyAo c2VlIGJ1ZyAyODQxOCkuCi0gICAgZGIxLmNoYW5nZVZlcnNpb24oIjEiLCBFWFBFQ1RFRF9WRVJT SU9OX0FGVEVSX0hJWElFX1RFU1QsIGVtcHR5RnVuY3Rpb24sIGZ1bmN0aW9uIChlKSB7CisgICAg ZGIxLmNoYW5nZVZlcnNpb24oIjEiLCBFWFBFQ1RFRF9WRVJTSU9OX0FGVEVSX0hJWElFX1RFU1Qs IG51bGwsIGZ1bmN0aW9uIChlKSB7CiAgICAgICAgIGxvZygiRkFJTCBpbiBjaGFuZ2VWZXJzaW9u OiIgKyBlKTsKICAgICAgICAgZmluaXNoVGVzdCgpOwogICAgIH0sIGZ1bmN0aW9uICgpIHsK 62240 2010-07-21 15:30:30 -0700 2010-07-22 12:35:50 -0700 patch patch text/plain 11156 dumi SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA2Mzg1OSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDctMjEgIER1bWl0cnUgRGFuaWxpdWMgIDxkdW1pQGNocm9t aXVtLm9yZz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBNYWtlIGRiLmNoYW5nZVZlcnNpb24oKSdzIHRoaXJkIHBhcmFtZXRlciBvcHRpb25hbCwgYXMg cmVxdWlyZWQgYnkgdGhlIHNwZWMuCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD00Mjc4NworCisgICAgICAgICogYmluZGluZ3MvanMvSlNEYXRhYmFzZUN1 c3RvbS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpKU0RhdGFiYXNlOjpjaGFuZ2VWZXJzaW9uKToK KyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0RhdGFiYXNlU3luY0N1c3RvbS5jcHA6CisgICAgICAg IChXZWJDb3JlOjpKU0RhdGFiYXNlU3luYzo6Y2hhbmdlVmVyc2lvbik6CisgICAgICAgICogYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YWJhc2VDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6 VjhEYXRhYmFzZTo6Y2hhbmdlVmVyc2lvbkNhbGxiYWNrKToKKyAgICAgICAgKiBiaW5kaW5ncy92 OC9jdXN0b20vVjhEYXRhYmFzZVN5bmNDdXN0b20uY3BwOgorICAgICAgICAoV2ViQ29yZTo6VjhE YXRhYmFzZVN5bmM6OmNoYW5nZVZlcnNpb25DYWxsYmFjayk6CisgICAgICAgICogc3RvcmFnZS9T UUxUcmFuc2FjdGlvbi5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTUUxUcmFuc2FjdGlvbjo6ZGVs aXZlclRyYW5zYWN0aW9uQ2FsbGJhY2spOgorICAgICAgICAqIHN0b3JhZ2UvU1FMVHJhbnNhY3Rp b25TeW5jLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNRTFRyYW5zYWN0aW9uU3luYzo6ZXhlY3V0 ZSk6CisKIDIwMTAtMDctMjEgIEJvIExpdSAgPGJvbGl1QGNocm9taXVtLm9yZz4KIAogICAgICAg ICBSZXZpZXdlZCBieSBEYXJpbiBGaXNoZXIuCkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pT RGF0YWJhc2VDdXN0b20uY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYmluZGluZ3MvanMvSlNE YXRhYmFzZUN1c3RvbS5jcHAJKHJldmlzaW9uIDYzODU5KQorKysgV2ViQ29yZS9iaW5kaW5ncy9q cy9KU0RhdGFiYXNlQ3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTcsMTcgKzU3LDIwIEBA IEpTVmFsdWUgSlNEYXRhYmFzZTo6Y2hhbmdlVmVyc2lvbihFeGVjU3QKICAgICBpZiAoZXhlYy0+ aGFkRXhjZXB0aW9uKCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCi0gICAgSlNP YmplY3QqIG9iamVjdCA9IGV4ZWMtPmFyZ3VtZW50KDIpLmdldE9iamVjdCgpOwotICAgIGlmICgh b2JqZWN0KSB7Ci0gICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01BVENIX0VS Uik7Ci0gICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwotICAgIH0KKyAgICBSZWZQdHI8U1FM VHJhbnNhY3Rpb25DYWxsYmFjaz4gY2FsbGJhY2s7CisgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291 bnQoKSA+IDIgJiYgIWV4ZWMtPmFyZ3VtZW50KDIpLmlzTnVsbCgpKSB7CisgICAgICAgIEpTT2Jq ZWN0KiBvYmplY3QgPSBleGVjLT5hcmd1bWVudCgyKS5nZXRPYmplY3QoKTsKKyAgICAgICAgaWYg KCFvYmplY3QpIHsKKyAgICAgICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01B VENIX0VSUik7CisgICAgICAgICAgICByZXR1cm4ganNVbmRlZmluZWQoKTsKKyAgICAgICAgfQog Ci0gICAgUmVmUHRyPFNRTFRyYW5zYWN0aW9uQ2FsbGJhY2s+IGNhbGxiYWNrKEpTU1FMVHJhbnNh Y3Rpb25DYWxsYmFjazo6Y3JlYXRlKG9iamVjdCwgc3RhdGljX2Nhc3Q8SlNET01HbG9iYWxPYmpl Y3QqPihnbG9iYWxPYmplY3QoKSkpKTsKKyAgICAgICAgY2FsbGJhY2sgPSBKU1NRTFRyYW5zYWN0 aW9uQ2FsbGJhY2s6OmNyZWF0ZShvYmplY3QsIHN0YXRpY19jYXN0PEpTRE9NR2xvYmFsT2JqZWN0 Kj4oZ2xvYmFsT2JqZWN0KCkpKTsKKyAgICB9CiAKICAgICBSZWZQdHI8U1FMVHJhbnNhY3Rpb25F cnJvckNhbGxiYWNrPiBlcnJvckNhbGxiYWNrOwotICAgIGlmICghZXhlYy0+YXJndW1lbnQoMyku aXNOdWxsKCkpIHsKLSAgICAgICAgb2JqZWN0ID0gZXhlYy0+YXJndW1lbnQoMykuZ2V0T2JqZWN0 KCk7CisgICAgaWYgKGV4ZWMtPmFyZ3VtZW50Q291bnQoKSA+IDMgJiYgIWV4ZWMtPmFyZ3VtZW50 KDMpLmlzTnVsbCgpKSB7CisgICAgICAgIEpTT2JqZWN0KiBvYmplY3QgPSBleGVjLT5hcmd1bWVu dCgzKS5nZXRPYmplY3QoKTsKICAgICAgICAgaWYgKCFvYmplY3QpIHsKICAgICAgICAgICAgIHNl dERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01BVENIX0VSUik7CiAgICAgICAgICAgICByZXR1 cm4ganNVbmRlZmluZWQoKTsKQEAgLTc3LDggKzgwLDggQEAgSlNWYWx1ZSBKU0RhdGFiYXNlOjpj aGFuZ2VWZXJzaW9uKEV4ZWNTdAogICAgIH0KIAogICAgIFJlZlB0cjxWb2lkQ2FsbGJhY2s+IHN1 Y2Nlc3NDYWxsYmFjazsKLSAgICBpZiAoIWV4ZWMtPmFyZ3VtZW50KDQpLmlzTnVsbCgpKSB7Ci0g ICAgICAgIG9iamVjdCA9IGV4ZWMtPmFyZ3VtZW50KDQpLmdldE9iamVjdCgpOworICAgIGlmIChl eGVjLT5hcmd1bWVudENvdW50KCkgPiA0ICYmICFleGVjLT5hcmd1bWVudCg0KS5pc051bGwoKSkg eworICAgICAgICBKU09iamVjdCogb2JqZWN0ID0gZXhlYy0+YXJndW1lbnQoNCkuZ2V0T2JqZWN0 KCk7CiAgICAgICAgIGlmICghb2JqZWN0KSB7CiAgICAgICAgICAgICBzZXRET01FeGNlcHRpb24o ZXhlYywgVFlQRV9NSVNNQVRDSF9FUlIpOwogICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVk KCk7CkluZGV4OiBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRGF0YWJhc2VTeW5jQ3VzdG9tLmNwcAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRGF0YWJhc2VTeW5jQ3VzdG9tLmNw cAkocmV2aXNpb24gNjM4NTkpCisrKyBXZWJDb3JlL2JpbmRpbmdzL2pzL0pTRGF0YWJhc2VTeW5j Q3VzdG9tLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNTIsMTMgKzUyLDE2IEBAIEpTVmFsdWUgSlNE YXRhYmFzZVN5bmM6OmNoYW5nZVZlcnNpb24oRXgKICAgICBpZiAoZXhlYy0+aGFkRXhjZXB0aW9u KCkpCiAgICAgICAgIHJldHVybiBqc1VuZGVmaW5lZCgpOwogCi0gICAgSlNPYmplY3QqIG9iamVj dCA9IGV4ZWMtPmFyZ3VtZW50KDIpLmdldE9iamVjdCgpOwotICAgIGlmICghb2JqZWN0KSB7Ci0g ICAgICAgIHNldERPTUV4Y2VwdGlvbihleGVjLCBUWVBFX01JU01BVENIX0VSUik7Ci0gICAgICAg IHJldHVybiBqc1VuZGVmaW5lZCgpOwotICAgIH0KKyAgICBSZWZQdHI8U1FMVHJhbnNhY3Rpb25T eW5jQ2FsbGJhY2s+IGNhbGxiYWNrOworICAgIGlmIChleGVjLT5hcmd1bWVudENvdW50KCkgPiAy ICYmICFleGVjLT5hcmd1bWVudCgyKS5pc051bGwoKSkgeworICAgICAgICBKU09iamVjdCogb2Jq ZWN0ID0gZXhlYy0+YXJndW1lbnQoMikuZ2V0T2JqZWN0KCk7CisgICAgICAgIGlmICghb2JqZWN0 KSB7CisgICAgICAgICAgICBzZXRET01FeGNlcHRpb24oZXhlYywgVFlQRV9NSVNNQVRDSF9FUlIp OworICAgICAgICAgICAgcmV0dXJuIGpzVW5kZWZpbmVkKCk7CisgICAgICAgIH0KIAotICAgIFJl ZlB0cjxTUUxUcmFuc2FjdGlvblN5bmNDYWxsYmFjaz4gY2FsbGJhY2soSlNTUUxUcmFuc2FjdGlv blN5bmNDYWxsYmFjazo6Y3JlYXRlKG9iamVjdCwgc3RhdGljX2Nhc3Q8SlNET01HbG9iYWxPYmpl Y3QqPihnbG9iYWxPYmplY3QoKSkpKTsKKyAgICAgICAgY2FsbGJhY2sgPSBKU1NRTFRyYW5zYWN0 aW9uU3luY0NhbGxiYWNrOjpjcmVhdGUob2JqZWN0LCBzdGF0aWNfY2FzdDxKU0RPTUdsb2JhbE9i amVjdCo+KGdsb2JhbE9iamVjdCgpKSk7CisgICAgfQogCiAgICAgRXhjZXB0aW9uQ29kZSBlYyA9 IDA7CiAgICAgbV9pbXBsLT5jaGFuZ2VWZXJzaW9uKG9sZFZlcnNpb24sIG5ld1ZlcnNpb24sIGNh bGxiYWNrLnJlbGVhc2UoKSwgZWMpOwpJbmRleDogV2ViQ29yZS9iaW5kaW5ncy92OC9jdXN0b20v VjhEYXRhYmFzZUN1c3RvbS5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9iaW5kaW5ncy92OC9j dXN0b20vVjhEYXRhYmFzZUN1c3RvbS5jcHAJKHJldmlzaW9uIDYzODU5KQorKysgV2ViQ29yZS9i aW5kaW5ncy92OC9jdXN0b20vVjhEYXRhYmFzZUN1c3RvbS5jcHAJKHdvcmtpbmcgY29weSkKQEAg LTYxLDcgKzYxLDcgQEAgdjg6OkhhbmRsZTx2ODo6VmFsdWU+IFY4RGF0YWJhc2U6OmNoYW5nZQog ICAgICAgICByZXR1cm4gdjg6OlVuZGVmaW5lZCgpOwogCiAgICAgUmVmUHRyPFY4U1FMVHJhbnNh Y3Rpb25DYWxsYmFjaz4gY2FsbGJhY2s7Ci0gICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAyKSB7Cisg ICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiAyICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzJdKSkg ewogICAgICAgICBpZiAoIWFyZ3NbMl0tPklzT2JqZWN0KCkpCiAgICAgICAgICAgICByZXR1cm4g dGhyb3dFcnJvcihUWVBFX01JU01BVENIX0VSUik7CiAKQEAgLTY5LDcgKzY5LDcgQEAgdjg6Okhh bmRsZTx2ODo6VmFsdWU+IFY4RGF0YWJhc2U6OmNoYW5nZQogICAgIH0KIAogICAgIFJlZlB0cjxW OFNRTFRyYW5zYWN0aW9uRXJyb3JDYWxsYmFjaz4gZXJyb3JDYWxsYmFjazsKLSAgICBpZiAoYXJn cy5MZW5ndGgoKSA+IDMpIHsKKyAgICBpZiAoYXJncy5MZW5ndGgoKSA+IDMgJiYgIWlzVW5kZWZp bmVkT3JOdWxsKGFyZ3NbM10pKSB7CiAgICAgICAgIGlmICghYXJnc1szXS0+SXNPYmplY3QoKSkK ICAgICAgICAgICAgIHJldHVybiB0aHJvd0Vycm9yKFRZUEVfTUlTTUFUQ0hfRVJSKTsKIApAQCAt NzcsNyArNzcsNyBAQCB2ODo6SGFuZGxlPHY4OjpWYWx1ZT4gVjhEYXRhYmFzZTo6Y2hhbmdlCiAg ICAgfQogCiAgICAgUmVmUHRyPFY4Q3VzdG9tVm9pZENhbGxiYWNrPiBzdWNjZXNzQ2FsbGJhY2s7 Ci0gICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiA0KSB7CisgICAgaWYgKGFyZ3MuTGVuZ3RoKCkgPiA0 ICYmICFpc1VuZGVmaW5lZE9yTnVsbChhcmdzWzRdKSkgewogICAgICAgICBpZiAoIWFyZ3NbNF0t PklzT2JqZWN0KCkpCiAgICAgICAgICAgICByZXR1cm4gdGhyb3dFcnJvcihUWVBFX01JU01BVENI X0VSUik7CiAKSW5kZXg6IFdlYkNvcmUvYmluZGluZ3MvdjgvY3VzdG9tL1Y4RGF0YWJhc2VTeW5j Q3VzdG9tLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL2JpbmRpbmdzL3Y4L2N1c3RvbS9WOERh dGFiYXNlU3luY0N1c3RvbS5jcHAJKHJldmlzaW9uIDYzODU5KQorKysgV2ViQ29yZS9iaW5kaW5n cy92OC9jdXN0b20vVjhEYXRhYmFzZVN5bmNDdXN0b20uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01 NSw3ICs1NSw3IEBAIHY4OjpIYW5kbGU8djg6OlZhbHVlPiBWOERhdGFiYXNlU3luYzo6Y2gKICAg ICBEYXRhYmFzZVN5bmMqIGRhdGFiYXNlID0gVjhEYXRhYmFzZVN5bmM6OnRvTmF0aXZlKGFyZ3Mu SG9sZGVyKCkpOwogCiAgICAgUmVmUHRyPFY4U1FMVHJhbnNhY3Rpb25TeW5jQ2FsbGJhY2s+IGNh bGxiYWNrOwotICAgIGlmIChhcmdzLkxlbmd0aCgpID4gMikgeworICAgIGlmIChhcmdzLkxlbmd0 aCgpID4gMiAmJiAhaXNVbmRlZmluZWRPck51bGwoYXJnc1syXSkpIHsKICAgICAgICAgaWYgKCFh cmdzWzJdLT5Jc09iamVjdCgpKQogICAgICAgICAgICAgcmV0dXJuIHRocm93RXJyb3IoVFlQRV9N SVNNQVRDSF9FUlIpOwogCkluZGV4OiBXZWJDb3JlL3N0b3JhZ2UvU1FMVHJhbnNhY3Rpb24uY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFdlYkNvcmUvc3RvcmFnZS9TUUxUcmFuc2FjdGlvbi5jcHAJKHJldmlz aW9uIDYzODU5KQorKysgV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9uLmNwcAkod29ya2lu ZyBjb3B5KQpAQCAtMjkyLDggKzI5Miw3IEBAIHZvaWQgU1FMVHJhbnNhY3Rpb246OmRlbGl2ZXJU cmFuc2FjdGlvbkMKICAgICAgICAgbV9leGVjdXRlU3FsQWxsb3dlZCA9IHRydWU7CiAgICAgICAg IHNob3VsZERlbGl2ZXJFcnJvckNhbGxiYWNrID0gIW1fY2FsbGJhY2stPmhhbmRsZUV2ZW50KG1f ZGF0YWJhc2UtPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgdGhpcyk7CiAgICAgICAgIG1fZXhl Y3V0ZVNxbEFsbG93ZWQgPSBmYWxzZTsKLSAgICB9IGVsc2UKLSAgICAgICAgc2hvdWxkRGVsaXZl ckVycm9yQ2FsbGJhY2sgPSB0cnVlOworICAgIH0KIAogICAgIC8vIFRyYW5zYWN0aW9uIFN0ZXAg NSAtIElmIHRoZSB0cmFuc2FjdGlvbiBjYWxsYmFjayB3YXMgbnVsbCBvciByYWlzZWQgYW4gZXhj ZXB0aW9uLCBqdW1wIHRvIHRoZSBlcnJvciBjYWxsYmFjawogICAgIGlmIChzaG91bGREZWxpdmVy RXJyb3JDYWxsYmFjaykgewpJbmRleDogV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9uU3lu Yy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9uU3luYy5j cHAJKHJldmlzaW9uIDYzODU5KQorKysgV2ViQ29yZS9zdG9yYWdlL1NRTFRyYW5zYWN0aW9uU3lu Yy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTE1MCw3ICsxNTAsNyBAQCBFeGNlcHRpb25Db2RlIFNR TFRyYW5zYWN0aW9uU3luYzo6YmVnaW4oCiBFeGNlcHRpb25Db2RlIFNRTFRyYW5zYWN0aW9uU3lu Yzo6ZXhlY3V0ZSgpCiB7CiAgICAgQVNTRVJUKG1fZGF0YWJhc2UtPnNjcmlwdEV4ZWN1dGlvbkNv bnRleHQoKS0+aXNDb250ZXh0VGhyZWFkKCkpOwotICAgIGlmICghbV9kYXRhYmFzZS0+b3BlbmVk KCkgfHwgIW1fY2FsbGJhY2sgfHwgIW1fY2FsbGJhY2stPmhhbmRsZUV2ZW50KG1fZGF0YWJhc2Ut PnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgdGhpcykpIHsKKyAgICBpZiAoIW1fZGF0YWJhc2Ut Pm9wZW5lZCgpIHx8IChtX2NhbGxiYWNrICYmICFtX2NhbGxiYWNrLT5oYW5kbGVFdmVudChtX2Rh dGFiYXNlLT5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCksIHRoaXMpKSkgewogICAgICAgICBtX2Nh bGxiYWNrID0gMDsKICAgICAgICAgcmV0dXJuIFNRTEV4Y2VwdGlvbjo6VU5LTk9XTl9FUlI7CiAg ICAgfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRl c3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNjM4NTkpCisrKyBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAxMC0wNy0yMSAgRHVtaXRydSBEYW5p bGl1YyAgPGR1bWlAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgIFNpbXBsaWZ5IHNvbWUgdGVzdHMsIGFuZCBtYWtlIHN1cmUgZGIu Y2hhbmdlVmVyc2lvbigpJ3MgdGhpcmQgcGFyYW1ldGVyIGlzIG9wdGlvbmFsLgorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NDI3ODcKKworICAgICAgICAq IGZhc3Qvd29ya2Vycy9zdG9yYWdlL3Jlc291cmNlcy9jaGFuZ2UtdmVyc2lvbi1zeW5jLTEuanM6 CisgICAgICAgICogZmFzdC93b3JrZXJzL3N0b3JhZ2UvcmVzb3VyY2VzL2NoYW5nZS12ZXJzaW9u LXN5bmMtMi5qczoKKyAgICAgICAgKiBzdG9yYWdlL2NoYW5nZS12ZXJzaW9uLmh0bWw6CisKIDIw MTAtMDctMjEgIEFkYW0gQmFydGggIDxhYmFydGhAd2Via2l0Lm9yZz4KIAogICAgICAgICBSZXZp ZXdlZCBieSBFcmljIFNlaWRlbC4KSW5kZXg6IExheW91dFRlc3RzL2Zhc3Qvd29ya2Vycy9zdG9y YWdlL3Jlc291cmNlcy9jaGFuZ2UtdmVyc2lvbi1zeW5jLTEuanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvZmFzdC93b3JrZXJzL3N0b3JhZ2UvcmVzb3VyY2VzL2NoYW5nZS12ZXJzaW9uLXN5 bmMtMS5qcwkocmV2aXNpb24gNjM4NTkpCisrKyBMYXlvdXRUZXN0cy9mYXN0L3dvcmtlcnMvc3Rv cmFnZS9yZXNvdXJjZXMvY2hhbmdlLXZlcnNpb24tc3luYy0xLmpzCSh3b3JraW5nIGNvcHkpCkBA IC0xLDEzICsxLDExIEBACiB2YXIgRVhQRUNURURfVkVSU0lPTl9BRlRFUl9ISVhJRV9URVNUID0g IjIiOwogdmFyIEVYUEVDVEVEX1ZFUlNJT05fQUZURVJfUkVMT0FEID0gIjMiOwogCi1mdW5jdGlv biBlbXB0eUZ1bmN0aW9uKCkgeyB9Ci0KIHZhciBkYjEgPSBvcGVuRGF0YWJhc2VTeW5jKCJDaGFu Z2VWZXJzaW9uVGVzdCIsICIxIiwgIlRlc3QgZm9yIHRoZSBkYXRhYmFzZS5jaGFuZ2VWZXJzaW9u KCkgZnVuY3Rpb24iLCAxKTsKIHZhciBkYjIgPSBvcGVuRGF0YWJhc2VTeW5jKCJDaGFuZ2VWZXJz aW9uVGVzdCIsICIxIiwgIlRlc3QgZm9yIHRoZSBkYXRhYmFzZS5jaGFuZ2VWZXJzaW9uKCkgZnVu Y3Rpb24iLCAxKTsKIAogLy8gRmlyc3QgcnVuIEhpeGllJ3MgdGVzdCB0byBlbnN1cmUgYmFzaWMg Y2hhbmdlVmVyc2lvbigpIGZ1bmN0aW9uYWxpdHkgd29ya3MgKHNlZSBidWcgMjg0MTgpLgotZGIx LmNoYW5nZVZlcnNpb24oIjEiLCBFWFBFQ1RFRF9WRVJTSU9OX0FGVEVSX0hJWElFX1RFU1QsIGVt cHR5RnVuY3Rpb24pOworZGIxLmNoYW5nZVZlcnNpb24oIjEiLCBFWFBFQ1RFRF9WRVJTSU9OX0FG VEVSX0hJWElFX1RFU1QpOwogaWYgKGRiMi52ZXJzaW9uICE9IGRiMS52ZXJzaW9uKSB7CiAgICAg cG9zdE1lc3NhZ2UoIkZBSUw6IGNoYW5naW5nIGRiMSdzIHZlcnNpb24gKCIgKyBkYjEudmVyc2lv biArICIpIGRpZCBub3QgY2hhbmdlIGRiMidzIHZlcnNpb24gKCIgKyBkYjIudmVyc2lvbiArICIp IGFzIGV4cGVjdGVkLiIpOwogICAgIHBvc3RNZXNzYWdlKCJmYWlsIik7CkluZGV4OiBMYXlvdXRU ZXN0cy9mYXN0L3dvcmtlcnMvc3RvcmFnZS9yZXNvdXJjZXMvY2hhbmdlLXZlcnNpb24tc3luYy0y LmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2Zhc3Qvd29ya2Vycy9zdG9yYWdlL3Jlc291 cmNlcy9jaGFuZ2UtdmVyc2lvbi1zeW5jLTIuanMJKHJldmlzaW9uIDYzODU5KQorKysgTGF5b3V0 VGVzdHMvZmFzdC93b3JrZXJzL3N0b3JhZ2UvcmVzb3VyY2VzL2NoYW5nZS12ZXJzaW9uLXN5bmMt Mi5qcwkod29ya2luZyBjb3B5KQpAQCAtNyw2ICs3LDYgQEAgZWxzZQogICAgIHBvc3RNZXNzYWdl KCJGQUlMOiBkYi52ZXJzaW9uIGlzICIgKyBkYi52ZXJzaW9uICsgIjsgZXhwZWN0ZWQgIiArIEVY UEVDVEVEX1ZFUlNJT05fQUZURVJfUkVMT0FEKTsKIAogLy8gUmVzZXQgdGhlIHZlcnNpb247IG90 aGVyd2lzZSB0aGlzIHRlc3Qgd2lsbCBmYWlsIHRoZSBuZXh0IHRpbWUgaXQncyBydW4KLWRiLmNo YW5nZVZlcnNpb24oZGIudmVyc2lvbiwgIjEiLCBmdW5jdGlvbih0eCkgeyB9KTsKK2RiLmNoYW5n ZVZlcnNpb24oZGIudmVyc2lvbiwgIjEiKTsKIAogcG9zdE1lc3NhZ2UoImRvbmUiKTsKSW5kZXg6 IExheW91dFRlc3RzL3N0b3JhZ2UvY2hhbmdlLXZlcnNpb24uaHRtbAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBM YXlvdXRUZXN0cy9zdG9yYWdlL2NoYW5nZS12ZXJzaW9uLmh0bWwJKHJldmlzaW9uIDYzODU5KQor KysgTGF5b3V0VGVzdHMvc3RvcmFnZS9jaGFuZ2UtdmVyc2lvbi5odG1sCSh3b3JraW5nIGNvcHkp CkBAIC00NCw2ICs0NCwxMCBAQCBmdW5jdGlvbiBydW5UZXN0KCkKICAgICBpZiAod2luZG93Lmxv Y2F0aW9uLnNlYXJjaCA9PSAiPzIiKSB7CiAgICAgICAgIGRiMSA9IHdpbmRvdy5vcGVuRGF0YWJh c2UoImNoYW5nZXZlcnNpb24tdGVzdCIsICIiLCAiVGVzdCBmb3IgdGhlIGRhdGFiYXNlLmNoYW5n ZVZlcnNpb24oKSBmdW5jdGlvbiIsIDEwMjQpOwogICAgICAgICBsb2coIkZpbmlzaGVkIHRlc3Rz IHdpdGggdmVyc2lvbiAiICsgZGIxLnZlcnNpb24gKyAiOyBleHBlY3RlZCB2ZXJzaW9uOiAiICsg RVhQRUNURURfVkVSU0lPTl9BRlRFUl9SRUxPQUQpOworCisgICAgICAgIC8vIFJlc2V0IHRoZSBE QiB2ZXJzaW9uIG9yIHRoZSBuZXh0IHJ1biBtaWdodCBmYWlsCisgICAgICAgIGRiMS5jaGFuZ2VW ZXJzaW9uKGRiMS52ZXJzaW9uLCAiMSIpOworCiAgICAgICAgIGZpbmlzaFRlc3QoKTsKICAgICB9 IGVsc2UKICAgICAgICAgdGVzdFBhcnQxKCk7CkBAIC02MCw3ICs2NCw3IEBAIGZ1bmN0aW9uIHRl c3RQYXJ0MSgpIHsKICAgICB2YXIgZGIyID0gd2luZG93Lm9wZW5EYXRhYmFzZSgiY2hhbmdldmVy c2lvbi10ZXN0IiwgIjEiLCAiVGVzdCBmb3IgdGhlIGRhdGFiYXNlLmNoYW5nZVZlcnNpb24oKSBm dW5jdGlvbiIsIDEwMjQpOwogCiAgICAgLy8gRmlyc3QgcnVuIEhpeGllJ3MgdGVzdCB0byBlbnN1 cmUgYmFzaWMgY2hhbmdlVmVyc2lvbiBmdW5jdGlvbmFsaXR5IHdvcmtzIChzZWUgYnVnIDI4NDE4 KS4KLSAgICBkYjEuY2hhbmdlVmVyc2lvbigiMSIsIEVYUEVDVEVEX1ZFUlNJT05fQUZURVJfSElY SUVfVEVTVCwgZW1wdHlGdW5jdGlvbiwgZnVuY3Rpb24gKGUpIHsKKyAgICBkYjEuY2hhbmdlVmVy c2lvbigiMSIsIEVYUEVDVEVEX1ZFUlNJT05fQUZURVJfSElYSUVfVEVTVCwgbnVsbCwgZnVuY3Rp b24gKGUpIHsKICAgICAgICAgbG9nKCJGQUlMIGluIGNoYW5nZVZlcnNpb246IiArIGUpOwogICAg ICAgICBmaW5pc2hUZXN0KCk7CiAgICAgfSwgZnVuY3Rpb24gKCkgewo=