58859 2011-04-18 19:04:27 -0700 test-webkitpy should run the ActiveWorkItems tests 2011-04-18 20:11:43 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED FIXED P2 Normal --- 1 eric eric abarth commit-queue mihaip oldest_to_newest 388217 0 eric 2011-04-18 19:04:27 -0700 test-webkitpy should run the ActiveWorkItems tests 388229 1 90131 eric 2011-04-18 19:11:27 -0700 Created attachment 90131 patch (Had to upload this by hand since webkit-patch doesn't work with renamed files on git: bug 48075.) 388255 2 commit-queue 2011-04-18 20:08:52 -0700 The commit-queue encountered the following flaky tests while processing attachment 90131: http/tests/misc/favicon-loads-with-icon-loading-override.html bug 58412 (author: alice.liu@apple.com) The commit-queue is continuing to process your patch. 388256 3 90131 commit-queue 2011-04-18 20:11:39 -0700 Comment on attachment 90131 patch Clearing flags on attachment: 90131 Committed r84216: <http://trac.webkit.org/changeset/84216> 388257 4 commit-queue 2011-04-18 20:11:43 -0700 All reviewed patches have been landed. Closing bug. 90131 2011-04-18 19:11:27 -0700 2011-04-18 20:11:39 -0700 patch ready.patch text/plain 9121 eric ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBjOGUz M2RiLi40M2MxYTg3IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hh bmdlTG9nCkBAIC0xLDUgKzEsMTggQEAKIDIwMTEtMDQtMTggIEVyaWMgU2VpZGVsICA8ZXJpY0B3 ZWJraXQub3JnPgogCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIHRlc3Qtd2Via2l0cHkgc2hvdWxkIHJ1biB0aGUgQWN0aXZlV29ya0l0ZW1zIHRlc3RzCisg ICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01ODg1OQorCisg ICAgICAgIEFsc28gbWFrZSB0aGUgdW5pdCB0ZXN0cyBwYXNzLiA6KQorCisgICAgICAgICogUXVl dWVTdGF0dXNTZXJ2ZXIvbW9kZWwvYWN0aXZld29ya2l0ZW1zLnB5OgorICAgICAgICAqIFF1ZXVl U3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlLnB5OgorICAgICAgICAqIFF1ZXVlU3RhdHVzU2VydmVy L21vZGVsL3dvcmtpdGVtcy5weToKKworMjAxMS0wNC0xOCAgRXJpYyBTZWlkZWwgIDxlcmljQHdl YmtpdC5vcmc+CisKICAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KIAogICAgICAgICBx dWV1ZXMud2Via2l0Lm9yZyBzaG91bGQgc2hvdyB0cmFpbGluZy1kYXlzIHBhc3MgY291bnRzIGZv ciBxdWV1ZXMKZGlmZiAtLWdpdCBhL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL2FjdGl2 ZXdvcmtpdGVtcy5weSBiL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL2FjdGl2ZXdvcmtp dGVtcy5weQppbmRleCBhYjVkN2E2Li4wMjMyNThhIDEwMDY0NAotLS0gYS9Ub29scy9RdWV1ZVN0 YXR1c1NlcnZlci9tb2RlbC9hY3RpdmV3b3JraXRlbXMucHkKKysrIGIvVG9vbHMvUXVldWVTdGF0 dXNTZXJ2ZXIvbW9kZWwvYWN0aXZld29ya2l0ZW1zLnB5CkBAIC02MSw2ICs2MSwxNCBAQCBjbGFz cyBBY3RpdmVXb3JrSXRlbXMoZGIuTW9kZWwsIFF1ZXVlUHJvcGVydHlNaXhpbik6CiAgICAgICAg IG5vbmV4cGlyZWRfcGFpcnMgPSBbcGFpciBmb3IgcGFpciBpbiBzZWxmLl9pdGVtX3RpbWVfcGFp cnMoKSBpZiBwYWlyWzBdICE9IGl0ZW1faWRdCiAgICAgICAgIHNlbGYuX3NldF9pdGVtX3RpbWVf cGFpcnMobm9uZXhwaXJlZF9wYWlycykKIAorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBrZXlf Zm9yX3F1ZXVlKGNscywgcXVldWVfbmFtZSk6CisgICAgICAgIHJldHVybiAiYWN0aXZlLXdvcmst aXRlbXMtJXMiICUgKHF1ZXVlX25hbWUpCisKKyAgICBAY2xhc3NtZXRob2QKKyAgICBkZWYgbG9v a3VwX2J5X3F1ZXVlKGNscywgcXVldWVfbmFtZSk6CisgICAgICAgIHJldHVybiBjbHMuZ2V0X29y X2luc2VydChrZXlfbmFtZT1jbHMua2V5X2Zvcl9xdWV1ZShxdWV1ZV9uYW1lKSwgcXVldWVfbmFt ZT1xdWV1ZV9uYW1lKQorCiAgICAgQHN0YXRpY21ldGhvZAogICAgIGRlZiBfZXhwaXJlX2l0ZW0o a2V5LCBpdGVtX2lkKToKICAgICAgICAgYWN0aXZlX3dvcmtfaXRlbXMgPSBkYi5nZXQoa2V5KQpk aWZmIC0tZ2l0IGEvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvYWN0aXZld29ya2l0ZW1z X3VuaXRlc3QucHkgYi9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9hY3RpdmV3b3JraXRl bXNfdW5pdGVzdC5weQpkZWxldGVkIGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggNmQ5MTVhMS4uMDAw MDAwMAotLS0gYS9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9hY3RpdmV3b3JraXRlbXNf dW5pdGVzdC5weQorKysgL2Rldi9udWxsCkBAIC0xLDUyICswLDAgQEAKLSMgQ29weXJpZ2h0IChD KSAyMDEwIEdvb2dsZSwgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgotIwotIyBSZWRpc3RyaWJ1 dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQK LSMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zIGFyZQotIyBtZXQ6Ci0jCi0jICAgICogUmVkaXN0cmlidXRpb25zIG9mIHNv dXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKLSMgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgotIyAgICAq IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUK LSMgY29weXJpZ2h0IG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lcgotIyBpbiB0aGUgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlCi0jIGRpc3RyaWJ1dGlvbi4KLSMgICAgKiBOZWl0aGVy IHRoZSBuYW1lIG9mIFJlc2VhcmNoIGluIE1vdGlvbiBMdGQuIG5vciB0aGUgbmFtZXMgb2YgaXRz Ci0jIGNvbnRyaWJ1dG9ycyBtYXkgYmUgdXNlZCB0byBlbmRvcnNlIG9yIHByb21vdGUgcHJvZHVj dHMgZGVyaXZlZCBmcm9tCi0jIHRoaXMgc29mdHdhcmUgd2l0aG91dCBzcGVjaWZpYyBwcmlvciB3 cml0dGVuIHBlcm1pc3Npb24uCi0jCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IENPUFlSSUdIVCBIT0xERVJTIEFORCBDT05UUklCVVRPUlMKLSMgIkFTIElTIiBBTkQgQU5ZIEVY UFJFU1MgT1IgSU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QKLSMgTElNSVRF RCBUTywgVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SCi0jIEEgUEFSVElDVUxBUiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBFVkVO VCBTSEFMTCBUSEUgQ09QWVJJR0hUCi0jIE9XTkVSIE9SIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUg Rk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLAotIyBTUEVDSUFMLCBFWEVNUExB UlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UCi0jIExJTUlU RUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRVVEUgR09PRFMgT1IgU0VSVklDRVM7IExPU1Mg T0YgVVNFLAotIyBEQVRBLCBPUiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkKLSMgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJ TiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAotIyAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElOIEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKLSMg T0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBT VUNIIERBTUFHRS4KLQotaW1wb3J0IHVuaXR0ZXN0Ci1mcm9tIGRhdGV0aW1lIGltcG9ydCBkYXRl dGltZQotCi1mcm9tIG1vZGVsLmFjdGl2ZXdvcmtpdGVtcyBpbXBvcnQgQWN0aXZlV29ya0l0ZW1z Ci0KLQotY2xhc3MgQWN0aXZlV29ya0l0ZW1zVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6Ci0gICAg ZGVmIHRlc3RfYmFzaWMoc2VsZik6Ci0gICAgICAgIGl0ZW1zID0gQWN0aXZlV29ya0l0ZW1zKCkK LSAgICAgICAgcXVldWVkX2l0ZW1zID0gWzEsIDJdCi0gICAgICAgIHRpbWUgPSBkYXRldGltZS5u b3coKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLm5leHRfaXRlbShxdWV1ZWRfaXRl bXMsIHRpbWUpLCAxKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLm5leHRfaXRlbShb MV0sIHRpbWUpLCBOb25lKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLm5leHRfaXRl bShbXSwgdGltZSksIE5vbmUpCi0KLSAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpdGVtcy50aW1l X2Zvcl9pdGVtKDEpLCB0aW1lKQotICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLnRpbWVf Zm9yX2l0ZW0oMiksIE5vbmUpCi0KLSAgICAgICAgaXRlbXMuZXhwaXJlX2l0ZW0oMSkKLSAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChpdGVtcy50aW1lX2Zvcl9pdGVtKDEpLCBOb25lKQotCi0KLWlm IF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgdW5pdHRlc3QubWFpbigpCmRpZmYgLS1naXQg YS9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9hY3RpdmV3b3JraXRlbXNfdW5pdHRlc3Qu cHkgYi9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC9hY3RpdmV3b3JraXRlbXNfdW5pdHRl c3QucHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uYjhjNjIwYQotLS0gL2Rl di9udWxsCisrKyBiL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21vZGVsL2FjdGl2ZXdvcmtpdGVt c191bml0dGVzdC5weQpAQCAtMCwwICsxLDY0IEBACisjIENvcHlyaWdodCAoQykgMjAxMCBHb29n bGUsIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNh dGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9u cyBhcmUKKyMgbWV0OgorIworIyAgICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisjIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNv bmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyMgICAgKiBSZWRpc3RyaWJ1 dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlCisjIGNvcHlyaWdo dCBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2Ns YWltZXIKKyMgaW4gdGhlIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92 aWRlZCB3aXRoIHRoZQorIyBkaXN0cmlidXRpb24uCisjICAgICogTmVpdGhlciB0aGUgbmFtZSBv ZiBSZXNlYXJjaCBpbiBNb3Rpb24gTHRkLiBub3IgdGhlIG5hbWVzIG9mIGl0cworIyBjb250cmli dXRvcnMgbWF5IGJlIHVzZWQgdG8gZW5kb3JzZSBvciBwcm9tb3RlIHByb2R1Y3RzIGRlcml2ZWQg ZnJvbQorIyB0aGlzIHNvZnR3YXJlIHdpdGhvdXQgc3BlY2lmaWMgcHJpb3Igd3JpdHRlbiBwZXJt aXNzaW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQg SE9MREVSUyBBTkQgQ09OVFJJQlVUT1JTCisjICJBUyBJUyIgQU5EIEFOWSBFWFBSRVNTIE9SIElN UExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UCisjIExJTUlURUQgVE8sIFRIRSBJ TVBMSUVEIFdBUlJBTlRJRVMgT0YgTUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUgorIyBB IFBBUlRJQ1VMQVIgUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgVEhF IENPUFlSSUdIVAorIyBPV05FUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUiBBTlkgRElS RUNULCBJTkRJUkVDVCwgSU5DSURFTlRBTCwKKyMgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05T RVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVAorIyBMSU1JVEVEIFRPLCBQUk9D VVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwKKyMg REFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSIENBVVNF RCBBTkQgT04gQU5ZCisjIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyMgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9U SEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09G VFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0Uu CisKK2ltcG9ydCB1bml0dGVzdAorZnJvbSBkYXRldGltZSBpbXBvcnQgZGF0ZXRpbWUKK2Zyb20g Z29vZ2xlLmFwcGVuZ2luZS5leHQgaW1wb3J0IHRlc3RiZWQKKworZnJvbSBtb2RlbC5hY3RpdmV3 b3JraXRlbXMgaW1wb3J0IEFjdGl2ZVdvcmtJdGVtcworCisKK2NsYXNzIEFjdGl2ZVdvcmtJdGVt c1Rlc3QodW5pdHRlc3QuVGVzdENhc2UpOgorCisgICAgZGVmIHNldFVwKHNlbGYpOgorICAgICAg ICBzZWxmLnRlc3RiZWQgPSB0ZXN0YmVkLlRlc3RiZWQoKQorICAgICAgICBzZWxmLnRlc3RiZWQu YWN0aXZhdGUoKQorICAgICAgICBzZWxmLnRlc3RiZWQuaW5pdF9kYXRhc3RvcmVfdjNfc3R1Yigp CisgICAgICAgIHNlbGYudGVzdGJlZC5pbml0X21lbWNhY2hlX3N0dWIoKQorCisgICAgZGVmIHRl YXJEb3duKHNlbGYpOgorICAgICAgICBzZWxmLnRlc3RiZWQuZGVhY3RpdmF0ZSgpCisKKyAgICBk ZWYgdGVzdF9iYXNpYyhzZWxmKToKKyAgICAgICAgaXRlbXMgPSBBY3RpdmVXb3JrSXRlbXMubG9v a3VwX2J5X3F1ZXVlKCJ0ZXN0LXF1ZXVlIikKKyAgICAgICAgcXVldWVkX2l0ZW1zID0gWzEsIDJd CisgICAgICAgICMgZGIuTW9kZWwgb25seSBzdG9yZXMgZGF0ZXMgdG8gc2Vjb25kIHJlc29sdXRp b24sIHNvIHdlIHVzZSBhbiBleHBsaWNpdCBkYXRldGltZSB3aXRob3V0IG1pbGxpc2Vjb25kcy4K KyAgICAgICAgdGltZSA9IGRhdGV0aW1lKDIwMTEsIDQsIDE4LCAxOCwgNTAsIDQ0KQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLm5leHRfaXRlbShxdWV1ZWRfaXRlbXMsIHRpbWUpLCAx KQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLm5leHRfaXRlbShbMV0sIHRpbWUpLCBO b25lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLm5leHRfaXRlbShbXSwgdGltZSks IE5vbmUpCisKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChpdGVtcy50aW1lX2Zvcl9pdGVtKDEp LCB0aW1lKQorICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGl0ZW1zLnRpbWVfZm9yX2l0ZW0oMiks IE5vbmUpCisKKyAgICAgICAgaXRlbXMuZXhwaXJlX2l0ZW0oMSkKKyAgICAgICAgIyBleHBpcmVf aXRlbSB1c2VzIGEgdHJhbnNhY3Rpb24gc28gaXQgZG9lc24ndCB0YWtlIGVmZmVjdCBvbiB0aGUg Y3VycmVudCBvYmplY3QuCisgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoaXRlbXMudGltZV9mb3Jf aXRlbSgxKSwgdGltZSkKKyAgICAgICAgIyBJZiB3ZSBsb29rIHVwIHRoZSBzYXZlZCBvYmplY3Qs IHdlIHNlZSBpdCdzIGJlZW4gdXBkYXRlZC4KKyAgICAgICAgaXRlbXMgPSBBY3RpdmVXb3JrSXRl bXMubG9va3VwX2J5X3F1ZXVlKCJ0ZXN0LXF1ZXVlIikKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChpdGVtcy50aW1lX2Zvcl9pdGVtKDEpLCBOb25lKQpkaWZmIC0tZ2l0IGEvVG9vbHMvUXVldWVT dGF0dXNTZXJ2ZXIvbW9kZWwvcXVldWVzLnB5IGIvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9k ZWwvcXVldWVzLnB5CmluZGV4IDFkNDZmODkuLmJkNWU3ZWQgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1F1 ZXVlU3RhdHVzU2VydmVyL21vZGVsL3F1ZXVlcy5weQorKysgYi9Ub29scy9RdWV1ZVN0YXR1c1Nl cnZlci9tb2RlbC9xdWV1ZXMucHkKQEAgLTcwLDEzICs3MCwxMSBAQCBjbGFzcyBRdWV1ZShvYmpl Y3QpOgogICAgICAgICByZXR1cm4gc2VsZi5fbmFtZQogCiAgICAgZGVmIHdvcmtfaXRlbXMoc2Vs Zik6Ci0gICAgICAgIGtleV9uYW1lID0gIndvcmstaXRlbXMtJXMiICUgKHNlbGYuX25hbWUpCi0g ICAgICAgIHJldHVybiBXb3JrSXRlbXMuZ2V0X29yX2luc2VydChrZXlfbmFtZT1rZXlfbmFtZSwg cXVldWVfbmFtZT1zZWxmLl9uYW1lKQorICAgICAgICByZXR1cm4gV29ya0l0ZW1zLmxvb2t1cF9i eV9xdWV1ZShzZWxmLl9uYW1lKQogCiAgICAgIyBGSVhNRTogYWN0aXZlX3dvcmtfaXRlbXMgaXMg YSBiYWQgbmFtZSBmb3IgdGhpcyBsb2NrLXRhYmxlLgogICAgIGRlZiBhY3RpdmVfd29ya19pdGVt cyhzZWxmKToKLSAgICAgICAga2V5X25hbWUgPSAiYWN0aXZlLXdvcmstaXRlbXMtJXMiICUgKHNl bGYuX25hbWUpCi0gICAgICAgIHJldHVybiBBY3RpdmVXb3JrSXRlbXMuZ2V0X29yX2luc2VydChr ZXlfbmFtZT1rZXlfbmFtZSwgcXVldWVfbmFtZT1zZWxmLl9uYW1lKQorICAgICAgICByZXR1cm4g QWN0aXZlV29ya0l0ZW1zLmxvb2t1cF9ieV9xdWV1ZShzZWxmLl9uYW1lKQogCiAgICAgZGVmIF9j YXBsaXRhbGl6ZV9hZnRlcl9kYXNoKHNlbGYsIHN0cmluZyk6CiAgICAgICAgIHJldHVybiAiLSIu am9pbihbd29yZFswXS51cHBlcigpICsgd29yZFsxOl0gZm9yIHdvcmQgaW4gc3RyaW5nLnNwbGl0 KCItIildKQpkaWZmIC0tZ2l0IGEvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvd29ya2l0 ZW1zLnB5IGIvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvbW9kZWwvd29ya2l0ZW1zLnB5CmluZGV4 IDc3MmZjMzkuLmI3NGY1ZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1F1ZXVlU3RhdHVzU2VydmVyL21v ZGVsL3dvcmtpdGVtcy5weQorKysgYi9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9tb2RlbC93b3Jr aXRlbXMucHkKQEAgLTM2LDYgKzM2LDE0IEBAIGNsYXNzIFdvcmtJdGVtcyhkYi5Nb2RlbCwgUXVl dWVQcm9wZXJ0eU1peGluKToKICAgICBpdGVtX2lkcyA9IGRiLkxpc3RQcm9wZXJ0eShpbnQpCiAg ICAgZGF0ZSA9IGRiLkRhdGVUaW1lUHJvcGVydHkoYXV0b19ub3dfYWRkPVRydWUpCiAKKyAgICBA Y2xhc3NtZXRob2QKKyAgICBkZWYga2V5X2Zvcl9xdWV1ZShjbHMsIHF1ZXVlX25hbWUpOgorICAg ICAgICByZXR1cm4gIndvcmstaXRlbXMtJXMiICUgKHF1ZXVlX25hbWUpCisKKyAgICBAY2xhc3Nt ZXRob2QKKyAgICBkZWYgbG9va3VwX2J5X3F1ZXVlKGNscywgcXVldWVfbmFtZSk6CisgICAgICAg IHJldHVybiBjbHMuZ2V0X29yX2luc2VydChrZXlfbmFtZT1jbHMua2V5X2Zvcl9xdWV1ZShxdWV1 ZV9uYW1lKSwgcXVldWVfbmFtZT1xdWV1ZV9uYW1lKQorCiAgICAgZGVmIGRpc3BsYXlfcG9zaXRp b25fZm9yX2F0dGFjaG1lbnQoc2VsZiwgYXR0YWNobWVudF9pZCk6CiAgICAgICAgICIiIlJldHVy bnMgYSAxLWJhc2VkIGluZGV4IGNvcnJlc3BvbmRpbmcgdG8gdGhlIHBvc2l0aW9uCiAgICAgICAg IG9mIHRoZSBhdHRhY2htZW50X2lkIGluIHRoZSBxdWV1ZS4gIElmIHRoZSBhdHRhY2htZW50IGlz Cg==