47919 2010-10-19 12:21:18 -0700 Fix multiple index support in IndexedDB 2010-10-19 15:10:44 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 jorlow jorlow abarth andreip commit-queue japhet steveblock oldest_to_newest 296326 0 jorlow 2010-10-19 12:21:18 -0700 Fix multiple index support in IndexedDB 296334 1 71192 jorlow 2010-10-19 12:29:00 -0700 Created attachment 71192 Patch 296349 2 jorlow 2010-10-19 13:03:00 -0700 Nate, do you have time to look at this? I'm hoping to get it in for the next dev channel release. 296381 3 71192 commit-queue 2010-10-19 13:54:48 -0700 Comment on attachment 71192 Patch Rejecting patch 71192 from commit-queue. Failed to run "['./WebKitTools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '--bot-id=abarth-cq-sl', 'apply-attachment', '--force-clean', '--non-interactive', '--quiet', 71192]" exit_code: 2 Cleaning working directory Updating working directory Failed to run "['WebKitTools/Scripts/update-webkit']" exit_code: 2 Full output: http://queues.webkit.org/results/4517004 296423 4 abarth 2010-10-19 14:49:32 -0700 Adam's machine's checkout was wedged (eseidel) 296444 5 71192 jorlow 2010-10-19 15:08:53 -0700 Comment on attachment 71192 Patch Actually, I'll just land by hand. 296446 6 71192 jorlow 2010-10-19 15:10:33 -0700 Comment on attachment 71192 Patch Clearing flags on attachment: 71192 Committed r70093: <http://trac.webkit.org/changeset/70093> 296448 7 jorlow 2010-10-19 15:10:44 -0700 All reviewed patches have been landed. Closing bug. 71192 2010-10-19 12:29:00 -0700 2010-10-19 15:10:33 -0700 Patch bug-47919-20101019202857.patch text/plain 14795 jorlow ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBmYmFlZmFlZmY2ZWFiNGI3Zjk4ZTY1ZTFjZTA5YzIzNGFjNzU1NDdiLi5hMTk0ZjNi ZjY0MWY1Mjc4NjM0ZjhjYjNkYjFiOTQ0NjAzN2M0NzBlIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0 cy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTkgQEAK KzIwMTAtMTAtMTkgIEplcmVteSBPcmxvdyAgPGpvcmxvd0BjaHJvbWl1bS5vcmc+CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRml4IG11bHRpcGxlIGlu ZGV4IHN1cHBvcnQgaW4gSW5kZXhlZERCCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD00NzkxOQorCisgICAgICAgIE1vZGlmeSBhbiBleGlzdGluZyB0ZXN0 IHRvIHZlcmlmeSBiZWhhdmlvciBhbmQgYWRkIGFub3RoZXIgdGVzdCBmb3IKKyAgICAgICAgc29t ZXRoaW5nIEkgdGhvdWdodCBtaWdodCBoYXZlIGJlZW4gcmVsYXRlZCAoYnV0IHdhc24ndCwgYnV0 IGl0IHN0aWxsCisgICAgICAgIHNlZW1zIGxpa2UgYSBnb29kIHRlc3QpLgorCisgICAgICAgICog c3RvcmFnZS9pbmRleGVkZGIvaW5kZXgtYmFzaWNzLWV4cGVjdGVkLnR4dDoKKyAgICAgICAgKiBz dG9yYWdlL2luZGV4ZWRkYi9pbmRleC1iYXNpY3MuaHRtbDoKKyAgICAgICAgKiBzdG9yYWdlL2lu ZGV4ZWRkYi9xdWV1ZWQtY29tbWFuZHMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBz dG9yYWdlL2luZGV4ZWRkYi9xdWV1ZWQtY29tbWFuZHMuaHRtbDogQWRkZWQuCisKIDIwMTAtMTAt MTkgIEVyaWMgQ2FybHNvbiAgPGVyaWMuY2FybHNvbkBhcHBsZS5jb20+CiAKICAgICAgICAgUmV2 aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2lu ZGV4ZWRkYi9pbmRleC1iYXNpY3MtZXhwZWN0ZWQudHh0IGIvTGF5b3V0VGVzdHMvc3RvcmFnZS9p bmRleGVkZGIvaW5kZXgtYmFzaWNzLWV4cGVjdGVkLnR4dAppbmRleCBjY2I2OGEzMDVhODFhMjVi MmIxYjgyYjBlOGQ4ZWI4NTBmZWNhOTEwLi4wODY5ZDk1NWQ0NGQwM2E1NDg0NDFhNzM1ZjE1YjNk NjA4NmFjMGQwIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9pbmRl eC1iYXNpY3MtZXhwZWN0ZWQudHh0CisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRi L2luZGV4LWJhc2ljcy1leHBlY3RlZC50eHQKQEAgLTQ0LDYgKzQ0LDcgQEAgUEFTUyB0cmFucyAh PT0gbnVsbCBpcyB0cnVlCiBEZWxldGVkIGFsbCBvYmplY3Qgc3RvcmVzLgogZGIuY3JlYXRlT2Jq ZWN0U3RvcmUoJ3N0b3JlTmFtZScsIG51bGwpCiBzdG9yZS5jcmVhdGVJbmRleCgnaW5kZXhOYW1l JywgJ3gnKQorc3RvcmUuY3JlYXRlSW5kZXgoJ2luZGV4TmFtZTInLCAneScsIGZhbHNlKQogUEFT UyAnbmFtZScgaW4gaW5kZXhPYmplY3QgaXMgdHJ1ZQogUEFTUyBpbmRleE9iamVjdC5uYW1lIGlz ICJpbmRleE5hbWUiCiBQQVNTICdzdG9yZU5hbWUnIGluIGluZGV4T2JqZWN0IGlzIHRydWUKQEAg LTEwOCw2ICsxMDksMjQgQEAgUEFTUyAncmVhZHlTdGF0ZScgaW4gZXZlbnQudGFyZ2V0IGlzIHRy dWUKIFBBU1MgZXZlbnQudGFyZ2V0LnJlYWR5U3RhdGUgaXMgZXZlbnQudGFyZ2V0LkRPTkUKIAog UEFTUyBldmVudC5yZXN1bHQgaXMgImtleSIKK2luZGV4T2JqZWN0Mi5nZXRLZXkoJ3p6eicpCitQ QVNTICdvbnN1Y2Nlc3MnIGluIHJlc3VsdCBpcyB0cnVlCitQQVNTICdvbmVycm9yJyBpbiByZXN1 bHQgaXMgdHJ1ZQorUEFTUyAncmVhZHlTdGF0ZScgaW4gcmVzdWx0IGlzIHRydWUKK0FuIGV2ZW50 IHNob3VsZCBmaXJlIHNob3J0bHkuLi4KKworU3VjY2VzcyBldmVudCBmaXJlZDoKK1BBU1MgJ3Jl c3VsdCcgaW4gZXZlbnQgaXMgdHJ1ZQorUEFTUyAnY29kZScgaW4gZXZlbnQgaXMgZmFsc2UKK1BB U1MgJ21lc3NhZ2UnIGluIGV2ZW50IGlzIGZhbHNlCitQQVNTICdzb3VyY2UnIGluIGV2ZW50IGlz IHRydWUKK1BBU1MgZXZlbnQuc291cmNlICE9IG51bGwgaXMgdHJ1ZQorUEFTUyAnb25zdWNjZXNz JyBpbiBldmVudC50YXJnZXQgaXMgdHJ1ZQorUEFTUyAnb25lcnJvcicgaW4gZXZlbnQudGFyZ2V0 IGlzIHRydWUKK1BBU1MgJ3JlYWR5U3RhdGUnIGluIGV2ZW50LnRhcmdldCBpcyB0cnVlCitQQVNT IGV2ZW50LnRhcmdldC5yZWFkeVN0YXRlIGlzIGV2ZW50LnRhcmdldC5ET05FCisKK1BBU1MgZXZl bnQucmVzdWx0IGlzICJrZXkiCiBpbmRleE9iamVjdC5nZXQoJ3ZhbHVlJykKIFBBU1MgJ29uc3Vj Y2VzcycgaW4gcmVzdWx0IGlzIHRydWUKIFBBU1MgJ29uZXJyb3InIGluIHJlc3VsdCBpcyB0cnVl CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9pbmRleC1iYXNpY3Mu aHRtbCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sCmlu ZGV4IDQ5Y2FjMDAwMzgwYzFlMWIyZjI2MzI5ZTNmYjJkZDdmMDJmYThiNGIuLmY3MjU3ZjE2ODQ0 M2U1YTFiN2VmYjhmOTFmZmYxZWQ3NzM5NDIxN2UgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL3N0 b3JhZ2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sCisrKyBiL0xheW91dFRlc3RzL3N0b3Jh Z2UvaW5kZXhlZGRiL2luZGV4LWJhc2ljcy5odG1sCkBAIC00NSw5ICs0NSwxMCBAQCBmdW5jdGlv biBkZWxldGVFeGlzdGluZygpCiB9CiAKIGZ1bmN0aW9uIGNyZWF0ZUluZGV4KCkKLXsNCit7CiAg ICAgd2luZG93LnN0b3JlID0gZXZhbEFuZExvZygiZGIuY3JlYXRlT2JqZWN0U3RvcmUoJ3N0b3Jl TmFtZScsIG51bGwpIik7CiAgICAgd2luZG93LmluZGV4T2JqZWN0ID0gZXZhbEFuZExvZygic3Rv cmUuY3JlYXRlSW5kZXgoJ2luZGV4TmFtZScsICd4JykiKTsKKyAgICB3aW5kb3cuaW5kZXhPYmpl Y3QyID0gZXZhbEFuZExvZygic3RvcmUuY3JlYXRlSW5kZXgoJ2luZGV4TmFtZTInLCAneScsIGZh bHNlKSIpOwogICAgIGFkZERhdGEoKTsKIH0KIApAQCAtOTcsNiArOTgsMTcgQEAgZnVuY3Rpb24g Z2V0T2JqZWN0RGF0YSgpCiAgICAgdmVyaWZ5U3VjY2Vzc0V2ZW50KGV2ZW50KTsKICAgICBzaG91 bGRCZUVxdWFsVG9TdHJpbmcoImV2ZW50LnJlc3VsdCIsICJrZXkiKTsKIAorICAgIHJlc3VsdCA9 IGV2YWxBbmRMb2coImluZGV4T2JqZWN0Mi5nZXRLZXkoJ3p6eicpIik7CisgICAgdmVyaWZ5UmVz dWx0KHJlc3VsdCk7CisgICAgcmVzdWx0Lm9uc3VjY2VzcyA9IGdldE9iamVjdERhdGEyOworICAg IHJlc3VsdC5vbmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7Cit9CisKK2Z1bmN0aW9u IGdldE9iamVjdERhdGEyKCkKK3sKKyAgICB2ZXJpZnlTdWNjZXNzRXZlbnQoZXZlbnQpOworICAg IHNob3VsZEJlRXF1YWxUb1N0cmluZygiZXZlbnQucmVzdWx0IiwgImtleSIpOworCiAgICAgcmVz dWx0ID0gZXZhbEFuZExvZygiaW5kZXhPYmplY3QuZ2V0KCd2YWx1ZScpIik7CiAgICAgdmVyaWZ5 UmVzdWx0KHJlc3VsdCk7CiAgICAgcmVzdWx0Lm9uc3VjY2VzcyA9IGdldERhdGFGYWlsOwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvc3RvcmFnZS9pbmRleGVkZGIvcXVldWVkLWNvbW1hbmRzLWV4 cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhlZGRiL3F1ZXVlZC1jb21tYW5k cy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uZTJlMjBhZjZmZmFmNWE2MDA0MmEyNjkxNWE5ZGQ3 YTlhYmUwODQ1YgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3N0b3JhZ2UvaW5kZXhl ZGRiL3F1ZXVlZC1jb21tYW5kcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwxMDQgQEAKK1Zlcmlm eSB0aGF0IHF1ZXVpbmcgdXAgc2V2ZXJhbCBjb21tYW5kcyB3b3JrcyAoYW5kIHRoZXkgYWxsIGZp cmUpLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3Nh Z2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKword2Via2l0SW5kZXhlZERCLm9w ZW4oJ25hbWUnLCAnZGVzY3JpcHRpb24nKQorUEFTUyAnb25zdWNjZXNzJyBpbiByZXN1bHQgaXMg dHJ1ZQorUEFTUyAnb25lcnJvcicgaW4gcmVzdWx0IGlzIHRydWUKK1BBU1MgJ3JlYWR5U3RhdGUn IGluIHJlc3VsdCBpcyB0cnVlCitBbiBldmVudCBzaG91bGQgZmlyZSBzaG9ydGx5Li4uCisKK1N1 Y2Nlc3MgZXZlbnQgZmlyZWQ6CitQQVNTICdyZXN1bHQnIGluIGV2ZW50IGlzIHRydWUKK1BBU1Mg J2NvZGUnIGluIGV2ZW50IGlzIGZhbHNlCitQQVNTICdtZXNzYWdlJyBpbiBldmVudCBpcyBmYWxz ZQorUEFTUyAnc291cmNlJyBpbiBldmVudCBpcyB0cnVlCitQQVNTIGV2ZW50LnNvdXJjZSAhPSBu dWxsIGlzIHRydWUKK1BBU1MgJ29uc3VjY2VzcycgaW4gZXZlbnQudGFyZ2V0IGlzIHRydWUKK1BB U1MgJ29uZXJyb3InIGluIGV2ZW50LnRhcmdldCBpcyB0cnVlCitQQVNTICdyZWFkeVN0YXRlJyBp biBldmVudC50YXJnZXQgaXMgdHJ1ZQorUEFTUyBldmVudC50YXJnZXQucmVhZHlTdGF0ZSBpcyBl dmVudC50YXJnZXQuRE9ORQorCitkYiA9IGV2ZW50LnJlc3VsdAorZGIuc2V0VmVyc2lvbignbmV3 IHZlcnNpb24nKQorUEFTUyAnb25zdWNjZXNzJyBpbiByZXN1bHQgaXMgdHJ1ZQorUEFTUyAnb25l cnJvcicgaW4gcmVzdWx0IGlzIHRydWUKK1BBU1MgJ3JlYWR5U3RhdGUnIGluIHJlc3VsdCBpcyB0 cnVlCitBbiBldmVudCBzaG91bGQgZmlyZSBzaG9ydGx5Li4uCisKK3NldFZlcnNpb25TdWNjZXNz KCk6CitTdWNjZXNzIGV2ZW50IGZpcmVkOgorUEFTUyAncmVzdWx0JyBpbiBldmVudCBpcyB0cnVl CitQQVNTICdjb2RlJyBpbiBldmVudCBpcyBmYWxzZQorUEFTUyAnbWVzc2FnZScgaW4gZXZlbnQg aXMgZmFsc2UKK1BBU1MgJ3NvdXJjZScgaW4gZXZlbnQgaXMgdHJ1ZQorUEFTUyBldmVudC5zb3Vy Y2UgIT0gbnVsbCBpcyB0cnVlCitQQVNTICdvbnN1Y2Nlc3MnIGluIGV2ZW50LnRhcmdldCBpcyB0 cnVlCitQQVNTICdvbmVycm9yJyBpbiBldmVudC50YXJnZXQgaXMgdHJ1ZQorUEFTUyAncmVhZHlT dGF0ZScgaW4gZXZlbnQudGFyZ2V0IGlzIHRydWUKK1BBU1MgZXZlbnQudGFyZ2V0LnJlYWR5U3Rh dGUgaXMgZXZlbnQudGFyZ2V0LkRPTkUKKwordHJhbnMgPSBldmVudC5yZXN1bHQKK1BBU1MgdHJh bnMgIT09IG51bGwgaXMgdHJ1ZQorRGVsZXRlZCBhbGwgb2JqZWN0IHN0b3Jlcy4KK2RiLmNyZWF0 ZU9iamVjdFN0b3JlKCdzdG9yZU5hbWUnLCBudWxsKQorc3RvcmUuY3JlYXRlSW5kZXgoJ2luZGV4 TmFtZScsICd4JykKK3N0b3JlLmFkZCh7eDogJ3ZhbHVlJywgeTogJ3p6eid9LCAna2V5JykKK1BB U1MgJ29uc3VjY2VzcycgaW4gcmVzdWx0IGlzIHRydWUKK1BBU1MgJ29uZXJyb3InIGluIHJlc3Vs dCBpcyB0cnVlCitQQVNTICdyZWFkeVN0YXRlJyBpbiByZXN1bHQgaXMgdHJ1ZQorQW4gZXZlbnQg c2hvdWxkIGZpcmUgc2hvcnRseS4uLgorCitzdG9yZS5hZGQoe3g6ICd2YWx1ZTInLCB5OiAnenp6 Mid9LCAna2V5MicpCitQQVNTICdvbnN1Y2Nlc3MnIGluIHJlc3VsdCBpcyB0cnVlCitQQVNTICdv bmVycm9yJyBpbiByZXN1bHQgaXMgdHJ1ZQorUEFTUyAncmVhZHlTdGF0ZScgaW4gcmVzdWx0IGlz IHRydWUKK0FuIGV2ZW50IHNob3VsZCBmaXJlIHNob3J0bHkuLi4KKworc3RvcmUucHV0KHt4OiAn dmFsdTInLCB5OiAnenoyJ30sICdreTInKQorUEFTUyAnb25zdWNjZXNzJyBpbiByZXN1bHQgaXMg dHJ1ZQorUEFTUyAnb25lcnJvcicgaW4gcmVzdWx0IGlzIHRydWUKK1BBU1MgJ3JlYWR5U3RhdGUn IGluIHJlc3VsdCBpcyB0cnVlCitBbiBldmVudCBzaG91bGQgZmlyZSBzaG9ydGx5Li4uCisKK1N1 Y2Nlc3MgZXZlbnQgZmlyZWQ6CitQQVNTICdyZXN1bHQnIGluIGV2ZW50IGlzIHRydWUKK1BBU1Mg J2NvZGUnIGluIGV2ZW50IGlzIGZhbHNlCitQQVNTICdtZXNzYWdlJyBpbiBldmVudCBpcyBmYWxz ZQorUEFTUyAnc291cmNlJyBpbiBldmVudCBpcyB0cnVlCitQQVNTIGV2ZW50LnNvdXJjZSAhPSBu dWxsIGlzIHRydWUKK1BBU1MgJ29uc3VjY2VzcycgaW4gZXZlbnQudGFyZ2V0IGlzIHRydWUKK1BB U1MgJ29uZXJyb3InIGluIGV2ZW50LnRhcmdldCBpcyB0cnVlCitQQVNTICdyZWFkeVN0YXRlJyBp biBldmVudC50YXJnZXQgaXMgdHJ1ZQorUEFTUyBldmVudC50YXJnZXQucmVhZHlTdGF0ZSBpcyBl dmVudC50YXJnZXQuRE9ORQorCitQQVNTIDAgaXMgMAorU3VjY2VzcyBldmVudCBmaXJlZDoKK1BB U1MgJ3Jlc3VsdCcgaW4gZXZlbnQgaXMgdHJ1ZQorUEFTUyAnY29kZScgaW4gZXZlbnQgaXMgZmFs c2UKK1BBU1MgJ21lc3NhZ2UnIGluIGV2ZW50IGlzIGZhbHNlCitQQVNTICdzb3VyY2UnIGluIGV2 ZW50IGlzIHRydWUKK1BBU1MgZXZlbnQuc291cmNlICE9IG51bGwgaXMgdHJ1ZQorUEFTUyAnb25z dWNjZXNzJyBpbiBldmVudC50YXJnZXQgaXMgdHJ1ZQorUEFTUyAnb25lcnJvcicgaW4gZXZlbnQu dGFyZ2V0IGlzIHRydWUKK1BBU1MgJ3JlYWR5U3RhdGUnIGluIGV2ZW50LnRhcmdldCBpcyB0cnVl CitQQVNTIGV2ZW50LnRhcmdldC5yZWFkeVN0YXRlIGlzIGV2ZW50LnRhcmdldC5ET05FCisKK1BB U1MgMSBpcyAxCitTdWNjZXNzIGV2ZW50IGZpcmVkOgorUEFTUyAncmVzdWx0JyBpbiBldmVudCBp cyB0cnVlCitQQVNTICdjb2RlJyBpbiBldmVudCBpcyBmYWxzZQorUEFTUyAnbWVzc2FnZScgaW4g ZXZlbnQgaXMgZmFsc2UKK1BBU1MgJ3NvdXJjZScgaW4gZXZlbnQgaXMgdHJ1ZQorUEFTUyBldmVu dC5zb3VyY2UgIT0gbnVsbCBpcyB0cnVlCitQQVNTICdvbnN1Y2Nlc3MnIGluIGV2ZW50LnRhcmdl dCBpcyB0cnVlCitQQVNTICdvbmVycm9yJyBpbiBldmVudC50YXJnZXQgaXMgdHJ1ZQorUEFTUyAn cmVhZHlTdGF0ZScgaW4gZXZlbnQudGFyZ2V0IGlzIHRydWUKK1BBU1MgZXZlbnQudGFyZ2V0LnJl YWR5U3RhdGUgaXMgZXZlbnQudGFyZ2V0LkRPTkUKKworUEFTUyAyIGlzIDIKK1BBU1Mgc3VjY2Vz c2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9xdWV1ZWQtY29tbWFuZHMuaHRtbCBiL0xheW91dFRl c3RzL3N0b3JhZ2UvaW5kZXhlZGRiL3F1ZXVlZC1jb21tYW5kcy5odG1sCm5ldyBmaWxlIG1vZGUg MTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjdk Yzk0YzNkMjNjMzA3MDhmYTI1MGYxMTc0ODJmM2Q0NTUyMWIwM2UKLS0tIC9kZXYvbnVsbAorKysg Yi9MYXlvdXRUZXN0cy9zdG9yYWdlL2luZGV4ZWRkYi9xdWV1ZWQtY29tbWFuZHMuaHRtbApAQCAt MCwwICsxLDg3IEBACis8aHRtbD4KKzxoZWFkPgorPGxpbmsgcmVsPSJzdHlsZXNoZWV0IiBocmVm PSIuLi8uLi9mYXN0L2pzL3Jlc291cmNlcy9qcy10ZXN0LXN0eWxlLmNzcyI+Cis8c2NyaXB0IHNy Yz0iLi4vLi4vZmFzdC9qcy9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPHNj cmlwdCBzcmM9Ii4uLy4uL2Zhc3QvanMvcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC1mdW5jdGlvbi5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0icmVzb3VyY2VzL3NoYXJlZC5qcyI+PC9zY3JpcHQ+ Cis8L2hlYWQ+Cis8Ym9keT4KKzxwIGlkPSJkZXNjcmlwdGlvbiI+PC9wPgorPGRpdiBpZD0iY29u c29sZSI+PC9kaXY+Cis8c2NyaXB0PgorCitkZXNjcmlwdGlvbigiVmVyaWZ5IHRoYXQgcXVldWlu ZyB1cCBzZXZlcmFsIGNvbW1hbmRzIHdvcmtzIChhbmQgdGhleSBhbGwgZmlyZSkuIik7CitpZiAo d2luZG93LmxheW91dFRlc3RDb250cm9sbGVyKSAKKyAgICBsYXlvdXRUZXN0Q29udHJvbGxlci53 YWl0VW50aWxEb25lKCk7CisKK2Z1bmN0aW9uIHRlc3QoKQoreworICAgIHJlc3VsdCA9IGV2YWxB bmRMb2coIndlYmtpdEluZGV4ZWREQi5vcGVuKCduYW1lJywgJ2Rlc2NyaXB0aW9uJykiKTsKKyAg ICB2ZXJpZnlSZXN1bHQocmVzdWx0KTsKKyAgICByZXN1bHQub25zdWNjZXNzID0gc2V0VmVyc2lv bjsKKyAgICByZXN1bHQub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOworfQorCitm dW5jdGlvbiBzZXRWZXJzaW9uKCkKK3sKKyAgICB2ZXJpZnlTdWNjZXNzRXZlbnQoZXZlbnQpOwor ICAgIGRiID0gZXZhbEFuZExvZygiZGIgPSBldmVudC5yZXN1bHQiKTsKKworICAgIHJlc3VsdCA9 IGV2YWxBbmRMb2coImRiLnNldFZlcnNpb24oJ25ldyB2ZXJzaW9uJykiKTsKKyAgICB2ZXJpZnlS ZXN1bHQocmVzdWx0KTsKKyAgICByZXN1bHQub25zdWNjZXNzID0gZGVsZXRlRXhpc3Rpbmc7Cisg ICAgcmVzdWx0Lm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JDYWxsYmFjazsKK30KKworZnVuY3Rp b24gZGVsZXRlRXhpc3RpbmcoKQoreworICAgIGRlYnVnKCJzZXRWZXJzaW9uU3VjY2VzcygpOiIp OworICAgIHZlcmlmeVN1Y2Nlc3NFdmVudChldmVudCk7CisgICAgd2luZG93LnRyYW5zID0gZXZh bEFuZExvZygidHJhbnMgPSBldmVudC5yZXN1bHQiKTsKKyAgICBzaG91bGRCZVRydWUoInRyYW5z ICE9PSBudWxsIik7CisgICAgdHJhbnMub25hYm9ydCA9IHVuZXhwZWN0ZWRBYm9ydENhbGxiYWNr OworCisgICAgZGVsZXRlQWxsT2JqZWN0U3RvcmVzKGRiLCBjcmVhdGVJbmRleCk7Cit9CisKK2Z1 bmN0aW9uIGNyZWF0ZUluZGV4KCkKK3sKKyAgICB3aW5kb3cuc3RvcmUgPSBldmFsQW5kTG9nKCJk Yi5jcmVhdGVPYmplY3RTdG9yZSgnc3RvcmVOYW1lJywgbnVsbCkiKTsKKyAgICB3aW5kb3cuaW5k ZXhPYmplY3QgPSBldmFsQW5kTG9nKCJzdG9yZS5jcmVhdGVJbmRleCgnaW5kZXhOYW1lJywgJ3gn KSIpOworCisgICAgcmVzdWx0ID0gZXZhbEFuZExvZygic3RvcmUuYWRkKHt4OiAndmFsdWUnLCB5 OiAnenp6J30sICdrZXknKSIpOworICAgIHZlcmlmeVJlc3VsdChyZXN1bHQpOworICAgIHJlc3Vs dC5vbnN1Y2Nlc3MgPSBmdW5jdGlvbigpIHsgdmVyaWZ5QWRkKDApOyB9OworICAgIHJlc3VsdC5v bmVycm9yID0gdW5leHBlY3RlZEVycm9yQ2FsbGJhY2s7CisKKyAgICByZXN1bHQgPSBldmFsQW5k TG9nKCJzdG9yZS5hZGQoe3g6ICd2YWx1ZTInLCB5OiAnenp6Mid9LCAna2V5MicpIik7CisgICAg dmVyaWZ5UmVzdWx0KHJlc3VsdCk7CisgICAgcmVzdWx0Lm9uc3VjY2VzcyA9IGZ1bmN0aW9uKCkg eyB2ZXJpZnlBZGQoMSk7IH07CisgICAgcmVzdWx0Lm9uZXJyb3IgPSB1bmV4cGVjdGVkRXJyb3JD YWxsYmFjazsKKworICAgIHJlc3VsdCA9IGV2YWxBbmRMb2coInN0b3JlLnB1dCh7eDogJ3ZhbHUy JywgeTogJ3p6Mid9LCAna3kyJykiKTsKKyAgICB2ZXJpZnlSZXN1bHQocmVzdWx0KTsKKyAgICBy ZXN1bHQub25zdWNjZXNzID0gZnVuY3Rpb24oKSB7IHZlcmlmeUFkZCgyKTsgfTsKKyAgICByZXN1 bHQub25lcnJvciA9IHVuZXhwZWN0ZWRFcnJvckNhbGxiYWNrOworCisgICAgd2luZG93LmFkZENv dW50ID0gMDsKK30KKworZnVuY3Rpb24gdmVyaWZ5QWRkKGV4cGVjdGVkKQoreworICAgIHZlcmlm eVN1Y2Nlc3NFdmVudChldmVudCk7CisgICAgc2hvdWxkQmUoIiIgKyBhZGRDb3VudCsrLCAiIiAr IGV4cGVjdGVkKTsKKworICAgIGlmIChhZGRDb3VudCA9PSAzKQorICAgICAgICBkb25lKCk7Cisg ICAgaWYgKGFkZENvdW50ID4gMykKKyAgICAgICAgdGVzdEZhaWxlZCgiVW5leHBlY3RlZCBjYWxs IHRvIHZlcmlmeUFkZCEiKTsKK30KKwordGVzdCgpOworCit2YXIgc3VjY2Vzc2Z1bGx5UGFyc2Vk ID0gdHJ1ZTsKKworPC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9XZWJD b3JlL0NoYW5nZUxvZyBiL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGQ1MmQ3ZDIwMjk1ODYxMmQx NGZlODM3Zjg2ZmU3NTNlZGFlYTNjYzQuLmQ3MjEyYTA2MTNmNjNmMTY1NDIzYjIxYmEyNjdhN2Fl OTg5ZjQ1NTAgMTAwNjQ0Ci0tLSBhL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1dlYkNvcmUvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMjcgQEAKKzIwMTAtMTAtMTkgIEplcmVteSBPcmxvdyAgPGpvcmxv d0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgRml4IG11bHRpcGxlIGluZGV4IHN1cHBvcnQgaW4gSW5kZXhlZERCCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD00NzkxOQorCisgICAgICAg IEZpeCAyIGJ1Z3MgdGhhdCBjYXVzZWQgdGhlIEluZGV4RGF0YSBvZiBhbGwgYnV0IHRoZSBsYXN0 IGluZGV4IHRvIGJlCisgICAgICAgIHByb3Blcmx5IHVwZGF0ZWQ6CisgICAgICAgICogVGhlIG9i amVjdFN0b3JlRGF0YUlkIGlzIE5PVCB1bmlxdWUgaWYgdGhlcmUgYXJlIG11bHRpcGxlIGluZGV4 ZXMuIFNvCisgICAgICAgICAgcmVtb3ZlIHRoZSBjb25zdHJhaW50LgorICAgICAgICAqIERvIG5v dCBkZWxldGUgYWxsIGV4aXN0aW5nIGVudHJpZXMgd2l0aCB0aGF0IG9iamVjdFN0b3JlRGF0YUlk IGJlZm9yZQorICAgICAgICAgIGFkZGluZyBhbiBlbnRyeSBmb3IgZWFjaCBpbmRleC4gT25seSBk byBpdCBvbmNlIGF0IHRoZSBiZWdpbm5pbmcuCisKKyAgICAgICAgVGVzdDogc3RvcmFnZS9pbmRl eGVkZGIvcXVldWVkLWNvbW1hbmRzLmh0bWwKKyAgICAgICAgICAgICsgaW5kZXgtYmFzaWNzLmh0 bWwgbW9kaWZpZWQKKworICAgICAgICAqIHN0b3JhZ2UvSURCRmFjdG9yeUJhY2tlbmRJbXBsLmNw cDoKKyAgICAgICAgKFdlYkNvcmU6OmNyZWF0ZVRhYmxlcyk6CisgICAgICAgICogc3RvcmFnZS9J REJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmRlbGV0ZUlu ZGV4RGF0YSk6CisgICAgICAgIChXZWJDb3JlOjpwdXRJbmRleERhdGEpOgorICAgICAgICAoV2Vi Q29yZTo6SURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbDo6cHV0SW50ZXJuYWwpOgorCiAyMDEwLTEw LTE5ICBFcmljIENhcmxzb24gIDxlcmljLmNhcmxzb25AYXBwbGUuY29tPgogCiAgICAgICAgIE5v dCByZXZpZXdlZC4gQnVpbGQgZml4LgpkaWZmIC0tZ2l0IGEvV2ViQ29yZS9zdG9yYWdlL0lEQkZh Y3RvcnlCYWNrZW5kSW1wbC5jcHAgYi9XZWJDb3JlL3N0b3JhZ2UvSURCRmFjdG9yeUJhY2tlbmRJ bXBsLmNwcAppbmRleCAzMDYzYjQxNTA0YTQ1YTIxNzk3MmZiNGIyODA2YmNhZmY4NDM3M2I3Li5j MTgyOTRkNzdhNjk5MzgxNDc4N2VjNjljYWQ0ZjUwM2QwM2NkMTdhIDEwMDY0NAotLS0gYS9XZWJD b3JlL3N0b3JhZ2UvSURCRmFjdG9yeUJhY2tlbmRJbXBsLmNwcAorKysgYi9XZWJDb3JlL3N0b3Jh Z2UvSURCRmFjdG9yeUJhY2tlbmRJbXBsLmNwcApAQCAtOTksNyArOTksNyBAQCBzdGF0aWMgYm9v bCBjcmVhdGVUYWJsZXMoU1FMaXRlRGF0YWJhc2UqIHNxbGl0ZURhdGFiYXNlKQogICAgICAgICAi Q1JFQVRFIFVOSVFVRSBJTkRFWCBJRiBOT1QgRVhJU1RTIE9iamVjdFN0b3JlRGF0YV9jb21wb3Np dCBPTiBPYmplY3RTdG9yZURhdGEoa2V5U3RyaW5nLCBrZXlEYXRlLCBrZXlOdW1iZXIsIG9iamVj dFN0b3JlSWQpIiwKIAogICAgICAgICAiRFJPUCBUQUJMRSBJRiBFWElTVFMgSW5kZXhEYXRhIiwK LSAgICAgICAgIkNSRUFURSBUQUJMRSBJRiBOT1QgRVhJU1RTIEluZGV4RGF0YSAoaWQgSU5URUdF UiBQUklNQVJZIEtFWSwgaW5kZXhJZCBJTlRFR0VSIE5PVCBOVUxMIFJFRkVSRU5DRVMgSW5kZXhl cyhpZCksIGtleVN0cmluZyBURVhULCBrZXlEYXRlIElOVEVHRVIsIGtleU51bWJlciBJTlRFR0VS LCBvYmplY3RTdG9yZURhdGFJZCBJTlRFR0VSIE5PVCBOVUxMIFVOSVFVRSBSRUZFUkVOQ0VTIE9i amVjdFN0b3JlRGF0YShpZCkpIiwKKyAgICAgICAgIkNSRUFURSBUQUJMRSBJRiBOT1QgRVhJU1RT IEluZGV4RGF0YSAoaWQgSU5URUdFUiBQUklNQVJZIEtFWSwgaW5kZXhJZCBJTlRFR0VSIE5PVCBO VUxMIFJFRkVSRU5DRVMgSW5kZXhlcyhpZCksIGtleVN0cmluZyBURVhULCBrZXlEYXRlIElOVEVH RVIsIGtleU51bWJlciBJTlRFR0VSLCBvYmplY3RTdG9yZURhdGFJZCBJTlRFR0VSIE5PVCBOVUxM IFJFRkVSRU5DRVMgT2JqZWN0U3RvcmVEYXRhKGlkKSkiLAogICAgICAgICAiRFJPUCBJTkRFWCBJ RiBFWElTVFMgSW5kZXhEYXRhX2NvbXBvc2l0IiwKICAgICAgICAgIkNSRUFURSBJTkRFWCBJRiBO T1QgRVhJU1RTIEluZGV4RGF0YV9jb21wb3NpdCBPTiBJbmRleERhdGEoa2V5U3RyaW5nLCBrZXlE YXRlLCBrZXlOdW1iZXIsIGluZGV4SWQpIiwKICAgICAgICAgIkRST1AgSU5ERVggSUYgRVhJU1RT IEluZGV4RGF0YV9vYmplY3RTdG9yZURhdGFJZCIsCmRpZmYgLS1naXQgYS9XZWJDb3JlL3N0b3Jh Z2UvSURCT2JqZWN0U3RvcmVCYWNrZW5kSW1wbC5jcHAgYi9XZWJDb3JlL3N0b3JhZ2UvSURCT2Jq ZWN0U3RvcmVCYWNrZW5kSW1wbC5jcHAKaW5kZXggMWY5ODYxMmI0MGFlZmNhOWJhN2EwZmM0MDBi MjI4NmViNTg2NmU4Yi4uZjNhZWU5MWQyMzk5ZDczNWMyYTk0OTBlNTgyN2VkNTEzYTM1MjdkYSAx MDA2NDQKLS0tIGEvV2ViQ29yZS9zdG9yYWdlL0lEQk9iamVjdFN0b3JlQmFja2VuZEltcGwuY3Bw CisrKyBiL1dlYkNvcmUvc3RvcmFnZS9JREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsLmNwcApAQCAt MTU0LDE1ICsxNTQsMTggQEAgc3RhdGljIGJvb2wgcHV0T2JqZWN0U3RvcmVEYXRhKFNRTGl0ZURh dGFiYXNlJiBkYiwgSURCS2V5KiBrZXksIFNlcmlhbGl6ZWRTY3JpcHQKICAgICByZXR1cm4gdHJ1 ZTsKIH0KIAotc3RhdGljIGludCBwdXRJbmRleERhdGEoU1FMaXRlRGF0YWJhc2UmIGRiLCBJREJL ZXkqIGtleSwgaW50NjRfdCBpbmRleElkLCBpbnQ2NF90IG9iamVjdFN0b3JlRGF0YUlkKQorc3Rh dGljIGJvb2wgZGVsZXRlSW5kZXhEYXRhKFNRTGl0ZURhdGFiYXNlJiBkYiwgaW50NjRfdCBvYmpl Y3RTdG9yZURhdGFJZCkKIHsKICAgICBTUUxpdGVTdGF0ZW1lbnQgZGVsZXRlUXVlcnkoZGIsICJE RUxFVEUgRlJPTSBJbmRleERhdGEgV0hFUkUgb2JqZWN0U3RvcmVEYXRhSWQgPSA/Iik7CiAgICAg aWYgKGRlbGV0ZVF1ZXJ5LnByZXBhcmUoKSAhPSBTUUxSZXN1bHRPaykKICAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIGRlbGV0ZVF1ZXJ5LmJpbmRJbnQ2NCgxLCBvYmplY3RTdG9yZURhdGFJZCk7 Ci0gICAgaWYgKGRlbGV0ZVF1ZXJ5LnN0ZXAoKSAhPSBTUUxSZXN1bHREb25lKQotICAgICAgICBy ZXR1cm4gZmFsc2U7CiAKKyAgICByZXR1cm4gZGVsZXRlUXVlcnkuc3RlcCgpID09IFNRTFJlc3Vs dERvbmU7Cit9CisKK3N0YXRpYyBib29sIHB1dEluZGV4RGF0YShTUUxpdGVEYXRhYmFzZSYgZGIs IElEQktleSoga2V5LCBpbnQ2NF90IGluZGV4SWQsIGludDY0X3Qgb2JqZWN0U3RvcmVEYXRhSWQp Cit7CiAgICAgU1FMaXRlU3RhdGVtZW50IHB1dFF1ZXJ5KGRiLCAiSU5TRVJUIElOVE8gSW5kZXhE YXRhIChrZXlTdHJpbmcsIGtleURhdGUsIGtleU51bWJlciwgaW5kZXhJZCwgb2JqZWN0U3RvcmVE YXRhSWQpIFZBTFVFUyAoPywgPywgPywgPywgPykiKTsKICAgICBpZiAocHV0UXVlcnkucHJlcGFy ZSgpICE9IFNRTFJlc3VsdE9rKQogICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xOTEsNiArMTk0 LDggQEAgdm9pZCBJREJPYmplY3RTdG9yZUJhY2tlbmRJbXBsOjpwdXRJbnRlcm5hbChTY3JpcHRF eGVjdXRpb25Db250ZXh0KiwgUGFzc1JlZlB0cjwKICAgICBSZWZQdHI8U2VyaWFsaXplZFNjcmlw dFZhbHVlPiB2YWx1ZSA9IHBycFZhbHVlOwogICAgIFJlZlB0cjxJREJLZXk+IGtleSA9IHBycEtl eTsKIAorICAgIC8vIEZJWE1FOiBTdXBwb3J0IGF1dG8taW5jcmVtZW50LgorCiAgICAgaWYgKCFv YmplY3RTdG9yZS0+bV9rZXlQYXRoLmlzTnVsbCgpKSB7CiAgICAgICAgIGlmIChrZXkpIHsKICAg ICAgICAgICAgIGNhbGxiYWNrcy0+b25FcnJvcihJREJEYXRhYmFzZUVycm9yOjpjcmVhdGUoSURC RGF0YWJhc2VFeGNlcHRpb246OlVOS05PV05fRVJSLCAiQSBrZXkgd2FzIHN1cHBsaWVkIGZvciBh biBvYmplY3RTdG9yZSB0aGF0IGhhcyBhIGtleVBhdGguIikpOwpAQCAtMjQxLDYgKzI0NiwxMyBA QCB2b2lkIElEQk9iamVjdFN0b3JlQmFja2VuZEltcGw6OnB1dEludGVybmFsKFNjcmlwdEV4ZWN1 dGlvbkNvbnRleHQqLCBQYXNzUmVmUHRyPAogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAg aWYgKCFkZWxldGVJbmRleERhdGEob2JqZWN0U3RvcmUtPnNxbGl0ZURhdGFiYXNlKCksIGRhdGFS b3dJZCkpIHsKKyAgICAgICAgLy8gRklYTUU6IFRoZSBJbmRleGVkIERhdGFiYXNlIHNwZWNpZmlj YXRpb24gZG9lcyBub3QgaGF2ZSBhbiBlcnJvciBjb2RlIGRlZGljYXRlZCB0byBJL08gZXJyb3Jz LgorICAgICAgICBjYWxsYmFja3MtPm9uRXJyb3IoSURCRGF0YWJhc2VFcnJvcjo6Y3JlYXRlKElE QkRhdGFiYXNlRXhjZXB0aW9uOjpVTktOT1dOX0VSUiwgIkVycm9yIHdyaXRpbmcgZGF0YSB0byBz dGFibGUgc3RvcmFnZS4iKSk7CisgICAgICAgIHRyYW5zYWN0aW9uLT5hYm9ydCgpOworICAgICAg ICByZXR1cm47CisgICAgfQorCiAgICAgaW50IGkgPSAwOwogICAgIGZvciAoSW5kZXhNYXA6Oml0 ZXJhdG9yIGl0ID0gb2JqZWN0U3RvcmUtPm1faW5kZXhlcy5iZWdpbigpOyBpdCAhPSBvYmplY3RT dG9yZS0+bV9pbmRleGVzLmVuZCgpOyArK2l0LCArK2kpIHsKICAgICAgICAgaWYgKCFwdXRJbmRl eERhdGEob2JqZWN0U3RvcmUtPnNxbGl0ZURhdGFiYXNlKCksIGluZGV4S2V5c1tpXS5nZXQoKSwg aXQtPnNlY29uZC0+aWQoKSwgZGF0YVJvd0lkKSkgewo=