101375 2012-11-06 10:59:31 -0800 Some cookie code cleanup 2012-11-06 13:37:45 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 ap ap beidson jberlin webkit.review.bot oldest_to_newest 759875 0 ap 2012-11-06 10:59:31 -0800 Doing it in small steps. 759886 1 172621 ap 2012-11-06 11:08:24 -0800 Created attachment 172621 proposed patch 759898 2 172621 mitz 2012-11-06 11:15:06 -0800 Comment on attachment 172621 proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=172621&action=review > Source/WebCore/ChangeLog:13 > + (WebCore): Removed special code for isHTTPOnly, it's present Foundation in all Typo: “present Foundation” > Source/WebCore/ChangeLog:19 > + Set-Cookie header, document.cookie can only be used to saet one cookie at a time. Typo: “saet” > Source/WebCore/platform/CookieJar.h:40 > +// These two methods implement document.cookie API, with special rules for HttpOnly cookies. “(member) functions” rather than “methods”? 759961 3 172631 ap 2012-11-06 12:37:24 -0800 Created attachment 172631 patch for landing 759992 4 172631 webkit.review.bot 2012-11-06 13:25:04 -0800 Comment on attachment 172631 patch for landing Clearing flags on attachment: 172631 Committed r133664: <http://trac.webkit.org/changeset/133664> 172621 2012-11-06 11:08:24 -0800 2012-11-06 11:15:06 -0800 proposed patch Cookies1.txt text/plain 9535 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzYzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTExLTA2ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgY29va2llIGNvZGUg Y2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAxMzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9Db29raWVKYXIuaDogRml4ZWQgc3R5bGUuIEdyb3VwZWQgZnVuY3Rpb25zIGJ5 IHdoaWNoIHN0b3JhZ2UgdGhleSBvcGVyYXRlCisgICAgICAgIG9uIGluIE1hYyBwb3J0LCBidXQg ZGlkbid0IGFkZCBleHBsYW5hdG9yeSBjb21tZW50cyB5ZXQsIGJlY2F1c2UgdGhpcyBpcyBkaWZm ZXJlbnQKKyAgICAgICAgaW4gc29tZSBwb3J0cy4KKworICAgICAgICAqIHBsYXRmb3JtL21hYy9D b29raWVKYXIubW06CisgICAgICAgIChXZWJDb3JlKTogUmVtb3ZlZCBzcGVjaWFsIGNvZGUgZm9y IGlzSFRUUE9ubHksIGl0J3MgcHJlc2VudCBGb3VuZGF0aW9uIGluIGFsbAorICAgICAgICBzdXBw b3J0ZWQgT1MgWCB2ZXJzaW9ucy4KKyAgICAgICAgKFdlYkNvcmU6OmZpbHRlckNvb2tpZXMpOiBV c2UgLWlzSFRUUE9ubHkgZGlyZWN0bHkuCisgICAgICAgIChXZWJDb3JlOjpjb29raWVzKTogR2V0 IHJpZCBvZiBhIHZhcmlhYmxlIGZvciBVUkwsIGltcGxpY2l0IGNvbnZlcnNpb24gd29ya3MganVz dCBhcyB3ZWxsLgorICAgICAgICAoV2ViQ29yZTo6Y29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFs dWUpOiBEaXR0by4KKyAgICAgICAgKFdlYkNvcmU6OnNldENvb2tpZXMpOiBBc3NlcnQgdGhhdCBu byBtb3JlIHRoYW4gb25lIGNvb2tpZSB3YXMgY3JlYXRlZCBmcm9tIG9uZQorICAgICAgICBTZXQt Q29va2llIGhlYWRlciwgZG9jdW1lbnQuY29va2llIGNhbiBvbmx5IGJlIHVzZWQgdG8gc2FldCBv bmUgY29va2llIGF0IGEgdGltZS4KKyAgICAgICAgKFdlYkNvcmU6OmdldFJhd0Nvb2tpZXMpOiBS ZW1vdmVkIHVzZWxlc3MgbG9jYWwgdmFyaWFibGVzLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0 d29yay9Db29raWVTdG9yYWdlLmg6IFJlbW92ZWQgYW4gdW5uZWVkZWQgaW5jbHVkZSwgY2xhcmlm aWVkIGEgY29tbWVudC4KKworICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvSFRUUEhlYWRlck1h cC5oOiBBZGRlZCBhIEZJWE1FLgorCiAyMDEyLTExLTA2ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdl YmtpdC5vcmc+CiAKICAgICAgICAgU2NyaXB0V3JhcHBhYmxlIHNob3VsZCB3b3JrIGZvciBtb3Jl IHRoYW4ganVzdCBOb2RlCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db29raWVKYXIu aAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Db29raWVKYXIuaAkocmV2 aXNpb24gMTMzNTQ5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29va2llSmFyLmgJKHdv cmtpbmcgY29weSkKQEAgLTMzLDIyICszMywyMiBAQAogCiBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK LSAgICBjbGFzcyBEb2N1bWVudDsKLSAgICBjbGFzcyBLVVJMOwotCi0gICAgc3RydWN0IENvb2tp ZTsKLQotICAgIC8vIGNvb2tpZXMgb21pdHMgSHR0cE9ubHkgY29va2llcy4KLSAgICBTdHJpbmcg Y29va2llcyhjb25zdCBEb2N1bWVudCosIGNvbnN0IEtVUkwmKTsKLSAgICBTdHJpbmcgY29va2ll UmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoY29uc3QgRG9jdW1lbnQqLCBjb25zdCBLVVJMJik7Ci0g ICAgdm9pZCBzZXRDb29raWVzKERvY3VtZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYp OwotICAgIGJvb2wgY29va2llc0VuYWJsZWQoY29uc3QgRG9jdW1lbnQqKTsKLSAgICBib29sIGdl dFJhd0Nvb2tpZXMoY29uc3QgRG9jdW1lbnQqLCBjb25zdCBLVVJMJiwgVmVjdG9yPENvb2tpZT4m KTsKLSAgICB2b2lkIGRlbGV0ZUNvb2tpZShjb25zdCBEb2N1bWVudCosIGNvbnN0IEtVUkwmLCBj b25zdCBTdHJpbmcmKTsKLQotICAgIHZvaWQgZ2V0SG9zdG5hbWVzV2l0aENvb2tpZXMoSGFzaFNl dDxTdHJpbmc+JiBob3N0bmFtZXMpOwotICAgIHZvaWQgZGVsZXRlQ29va2llc0Zvckhvc3RuYW1l KGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpOwotICAgIHZvaWQgZGVsZXRlQWxsQ29va2llcygpOwor Y2xhc3MgRG9jdW1lbnQ7CitjbGFzcyBLVVJMOworc3RydWN0IENvb2tpZTsKKworLy8gVGhlc2Ug dHdvIG1ldGhvZHMgaW1wbGVtZW50IGRvY3VtZW50LmNvb2tpZSBBUEksIHdpdGggc3BlY2lhbCBy dWxlcyBmb3IgSHR0cE9ubHkgY29va2llcy4KK1N0cmluZyBjb29raWVzKGNvbnN0IERvY3VtZW50 KiwgY29uc3QgS1VSTCYpOwordm9pZCBzZXRDb29raWVzKERvY3VtZW50KiwgY29uc3QgS1VSTCYs IGNvbnN0IFN0cmluZyYpOworCitib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50Kik7 CitTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoY29uc3QgRG9jdW1lbnQqLCBj b25zdCBLVVJMJik7Citib29sIGdldFJhd0Nvb2tpZXMoY29uc3QgRG9jdW1lbnQqLCBjb25zdCBL VVJMJiwgVmVjdG9yPENvb2tpZT4mKTsKK3ZvaWQgZGVsZXRlQ29va2llKGNvbnN0IERvY3VtZW50 KiwgY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYpOworCit2b2lkIGdldEhvc3RuYW1lc1dpdGhD b29raWVzKEhhc2hTZXQ8U3RyaW5nPiYgaG9zdG5hbWVzKTsKK3ZvaWQgZGVsZXRlQ29va2llc0Zv ckhvc3RuYW1lKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpOwordm9pZCBkZWxldGVBbGxDb29raWVz KCk7CiAKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Nvb2tpZUphci5t bQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29va2llSmFyLm1t CShyZXZpc2lvbiAxMzM1NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29va2ll SmFyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAo QykgMjAwMywgMjAwNiwgMjAwOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBD b3B5cmlnaHQgKEMpIDIwMDMsIDIwMDYsIDIwMDgsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMywyNSArMzMs MTAgQEAKICNpbXBvcnQgIkNvb2tpZVN0b3JhZ2UuaCIKICNpbXBvcnQgIkNvb2tpZVN0b3JhZ2VD Rk5ldC5oIgogI2ltcG9ydCAiRG9jdW1lbnQuaCIKLSNpbXBvcnQgIktVUkwuaCIKICNpbXBvcnQg IldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKLSNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4KLQot Ci1AaW50ZXJmYWNlIE5TSFRUUENvb2tpZSAoV2ViQ29yZUhUVFBPbmx5Q29va2llcykKLS0gKEJP T0wpaXNIVFRQT25seTsKLUBlbmQKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMgYm9v bCBpc0hUVFBPbmx5KE5TSFRUUENvb2tpZSAqY29va2llKQotewotICAgIC8vIE9uY2Ugd2UgcmVx dWlyZSBhIG5ld2VyIHZlcnNpb24gb2YgRm91bmRhdGlvbiB3aXRoIHRoZSBpc0hUVFBPbmx5IG1l dGhvZCwKLSAgICAvLyB3ZSBjYW4gZWxpbWluYXRlIHRoZSBpbnN0YW5jZXNSZXNwb25kVG9TZWxl Y3RvcjogY2hlY2suCi0gICAgc3RhdGljIGJvb2wgc3VwcG9ydHNIVFRQT25seUNvb2tpZXMgPSBb TlNIVFRQQ29va2llIGluc3RhbmNlc1Jlc3BvbmRUb1NlbGVjdG9yOkBzZWxlY3Rvcihpc0hUVFBP bmx5KV07Ci0gICAgcmV0dXJuIHN1cHBvcnRzSFRUUE9ubHlDb29raWVzICYmIFtjb29raWUgaXNI VFRQT25seV07Ci19Ci0KIHN0YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZmlsdGVyQ29va2llcyhO U0FycmF5ICp1bmZpbHRlcmVkQ29va2llcykKIHsKICAgICBOU1VJbnRlZ2VyIGNvdW50ID0gW3Vu ZmlsdGVyZWRDb29raWVzIGNvdW50XTsKQEAgLTY3LDcgKzUyLDcgQEAgc3RhdGljIFJldGFpblB0 cjxOU0FycmF5PiBmaWx0ZXJDb29raWVzKAogICAgICAgICBpZiAoIVtbY29va2llIG5hbWVdIGxl bmd0aF0pCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAoaXNIVFRQT25seShj b29raWUpKQorICAgICAgICBpZiAoW2Nvb2tpZSBpc0hUVFBPbmx5XSkKICAgICAgICAgICAgIGNv bnRpbnVlOwogCiAgICAgICAgIFtmaWx0ZXJlZENvb2tpZXMuZ2V0KCkgYWRkT2JqZWN0OmNvb2tp ZV07CkBAIC04MCwxMiArNjUsMTEgQEAgU3RyaW5nIGNvb2tpZXMoY29uc3QgRG9jdW1lbnQqLCBj b25zdCBLVQogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIAotICAgIE5TVVJM ICpjb29raWVVUkwgPSB1cmw7CiAgICAgTlNBcnJheSAqY29va2llczsKICAgICBpZiAoUmV0YWlu UHRyPENGSFRUUENvb2tpZVN0b3JhZ2VSZWY+IGNmQ29va2llU3RvcmFnZSA9IGN1cnJlbnRDRkhU VFBDb29raWVTdG9yYWdlKCkpCi0gICAgICAgIGNvb2tpZXMgPSB3a0hUVFBDb29raWVzRm9yVVJM KGNmQ29va2llU3RvcmFnZS5nZXQoKSwgY29va2llVVJMKTsKKyAgICAgICAgY29va2llcyA9IHdr SFRUUENvb2tpZXNGb3JVUkwoY2ZDb29raWVTdG9yYWdlLmdldCgpLCB1cmwpOwogICAgIGVsc2UK LSAgICAgICAgY29va2llcyA9IFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQQ29va2ll U3RvcmFnZV0gY29va2llc0ZvclVSTDpjb29raWVVUkxdOworICAgICAgICBjb29raWVzID0gW1tO U0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29raWVzRm9yVVJM OnVybF07CiAKICAgICByZXR1cm4gW1tOU0hUVFBDb29raWUgcmVxdWVzdEhlYWRlckZpZWxkc1dp dGhDb29raWVzOmZpbHRlckNvb2tpZXMoY29va2llcykuZ2V0KCldIG9iamVjdEZvcktleTpAIkNv b2tpZSJdOwogCkBAIC05NywxMiArODEsMTEgQEAgU3RyaW5nIGNvb2tpZVJlcXVlc3RIZWFkZXJG aWVsZFZhbHVlKGNvbgogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIAotICAg IE5TVVJMICpjb29raWVVUkwgPSB1cmw7CiAgICAgTlNBcnJheSAqY29va2llczsKICAgICBpZiAo UmV0YWluUHRyPENGSFRUUENvb2tpZVN0b3JhZ2VSZWY+IGNmQ29va2llU3RvcmFnZSA9IGN1cnJl bnRDRkhUVFBDb29raWVTdG9yYWdlKCkpCi0gICAgICAgIGNvb2tpZXMgPSB3a0hUVFBDb29raWVz Rm9yVVJMKGNmQ29va2llU3RvcmFnZS5nZXQoKSwgY29va2llVVJMKTsKKyAgICAgICAgY29va2ll cyA9IHdrSFRUUENvb2tpZXNGb3JVUkwoY2ZDb29raWVTdG9yYWdlLmdldCgpLCB1cmwpOwogICAg IGVsc2UKLSAgICAgICAgY29va2llcyA9IFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQ Q29va2llU3RvcmFnZV0gY29va2llc0ZvclVSTDpjb29raWVVUkxdOworICAgICAgICBjb29raWVz ID0gW1tOU0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29raWVz Rm9yVVJMOnVybF07CiAKICAgICByZXR1cm4gW1tOU0hUVFBDb29raWUgcmVxdWVzdEhlYWRlckZp ZWxkc1dpdGhDb29raWVzOmNvb2tpZXNdIG9iamVjdEZvcktleTpAIkNvb2tpZSJdOwogCkBAIC0x MjMsOCArMTA2LDkgQEAgdm9pZCBzZXRDb29raWVzKERvY3VtZW50KiBkb2N1bWVudCwgY29ucwog ICAgIC8vIGNvb2tpZXNXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBjb29r aWVzIHdpdGhvdXQgYSB2YWx1ZQogICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSBjb29raWVTdHIu Y29udGFpbnMoJz0nKSA/IGNvb2tpZVN0ciA6IGNvb2tpZVN0ciArICI9IjsKIAotICAgIE5TVVJM ICpjb29raWVVUkwgPSB1cmw7ICAgIAorICAgIE5TVVJMICpjb29raWVVUkwgPSB1cmw7CiAgICAg UmV0YWluUHRyPE5TQXJyYXk+IGZpbHRlcmVkQ29va2llcyA9IGZpbHRlckNvb2tpZXMoW05TSFRU UENvb2tpZSBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzOltOU0RpY3Rpb25hcnkgZGlj dGlvbmFyeVdpdGhPYmplY3Q6Y29va2llU3RyaW5nIGZvcktleTpAIlNldC1Db29raWUiXSBmb3JV Ukw6Y29va2llVVJMXSk7CisgICAgQVNTRVJUKFtmaWx0ZXJlZENvb2tpZXMuZ2V0KCkgY291bnRd IDw9IDEpOwogCiAgICAgaWYgKFJldGFpblB0cjxDRkhUVFBDb29raWVTdG9yYWdlUmVmPiBjZkNv b2tpZVN0b3JhZ2UgPSBjdXJyZW50Q0ZIVFRQQ29va2llU3RvcmFnZSgpKQogICAgICAgICB3a1Nl dEhUVFBDb29raWVzRm9yVVJMKGNmQ29va2llU3RvcmFnZS5nZXQoKSwgZmlsdGVyZWRDb29raWVz LmdldCgpLCBjb29raWVVUkwsIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpKTsKQEAg LTE1NSwyNiArMTM5LDE5IEBAIGJvb2wgZ2V0UmF3Q29va2llcyhjb25zdCBEb2N1bWVudCosIGNv bnMKICAgICByYXdDb29raWVzLmNsZWFyKCk7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENFUFRJ T05TOwogCi0gICAgTlNVUkwgKmNvb2tpZVVSTCA9IHVybDsKICAgICBOU0FycmF5ICpjb29raWVz OwogICAgIGlmIChSZXRhaW5QdHI8Q0ZIVFRQQ29va2llU3RvcmFnZVJlZj4gY2ZDb29raWVTdG9y YWdlID0gY3VycmVudENGSFRUUENvb2tpZVN0b3JhZ2UoKSkKLSAgICAgICAgY29va2llcyA9IHdr SFRUUENvb2tpZXNGb3JVUkwoY2ZDb29raWVTdG9yYWdlLmdldCgpLCBjb29raWVVUkwpOworICAg ICAgICBjb29raWVzID0gd2tIVFRQQ29va2llc0ZvclVSTChjZkNvb2tpZVN0b3JhZ2UuZ2V0KCks IHVybCk7CiAgICAgZWxzZQotICAgICAgICBjb29raWVzID0gW1tOU0hUVFBDb29raWVTdG9yYWdl IHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29raWVzRm9yVVJMOmNvb2tpZVVSTF07CisgICAg ICAgIGNvb2tpZXMgPSBbW05TSFRUUENvb2tpZVN0b3JhZ2Ugc2hhcmVkSFRUUENvb2tpZVN0b3Jh Z2VdIGNvb2tpZXNGb3JVUkw6dXJsXTsKIAogICAgIE5TVUludGVnZXIgY291bnQgPSBbY29va2ll cyBjb3VudF07CiAgICAgcmF3Q29va2llcy5yZXNlcnZlQ2FwYWNpdHkoY291bnQpOwogICAgIGZv ciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKICAgICAgICAgTlNIVFRQQ29v a2llICpjb29raWUgPSAoTlNIVFRQQ29va2llICopW2Nvb2tpZXMgb2JqZWN0QXRJbmRleDppXTsK LSAgICAgICAgTlNTdHJpbmcgKm5hbWUgPSBbY29va2llIG5hbWVdOwotICAgICAgICBOU1N0cmlu ZyAqdmFsdWUgPSBbY29va2llIHZhbHVlXTsKLSAgICAgICAgTlNTdHJpbmcgKmRvbWFpbiA9IFtj b29raWUgZG9tYWluXTsKLSAgICAgICAgTlNTdHJpbmcgKnBhdGggPSBbY29va2llIHBhdGhdOwog ICAgICAgICBOU1RpbWVJbnRlcnZhbCBleHBpcmVzID0gW1tjb29raWUgZXhwaXJlc0RhdGVdIHRp bWVJbnRlcnZhbFNpbmNlMTk3MF0gKiAxMDAwOwotICAgICAgICBib29sIGh0dHBPbmx5ID0gW2Nv b2tpZSBpc0hUVFBPbmx5XTsKLSAgICAgICAgYm9vbCBzZWN1cmUgPSBbY29va2llIGlzU2VjdXJl XTsKLSAgICAgICAgYm9vbCBzZXNzaW9uID0gW2Nvb2tpZSBpc1Nlc3Npb25Pbmx5XTsKLSAgICAg ICAgcmF3Q29va2llcy51bmNoZWNrZWRBcHBlbmQoQ29va2llKG5hbWUsIHZhbHVlLCBkb21haW4s IHBhdGgsIGV4cGlyZXMsIGh0dHBPbmx5LCBzZWN1cmUsIHNlc3Npb24pKTsKKyAgICAgICAgcmF3 Q29va2llcy51bmNoZWNrZWRBcHBlbmQoQ29va2llKFtjb29raWUgbmFtZV0sIFtjb29raWUgdmFs dWVdLCBbY29va2llIGRvbWFpbl0sIFtjb29raWUgcGF0aF0sIGV4cGlyZXMsCisgICAgICAgICAg ICBbY29va2llIGlzSFRUUE9ubHldLCBbY29va2llIGlzU2VjdXJlXSwgW2Nvb2tpZSBpc1Nlc3Np b25Pbmx5XSkpOwogICAgIH0KIAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Nvb2tpZVN0b3JhZ2UuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Nvb2tpZVN0b3JhZ2UuaAko cmV2aXNpb24gMTMzNTQ5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Db29r aWVTdG9yYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDExICsyNiw5IEBACiAjaWZuZGVmIENv b2tpZVN0b3JhZ2VfaAogI2RlZmluZSBDb29raWVTdG9yYWdlX2gKIAotI2luY2x1ZGUgPHd0Zi9S ZXRhaW5QdHIuaD4KLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0vLyBUaGVzZSBhcmUgYWx3YXlz IG9ic2VydmluZyB0aGUgbWFpbiBjb29raWUgc3RvcmFnZSwgZXZlbiB3aGVuIGluIHByaXZhdGUg YnJvd3NpbmcgbW9kZS4KKy8vIFRoZXNlIGFyZSBhbHdheXMgb2JzZXJ2aW5nIHRoZSBzaGFyZWQg Y29va2llIHN0b3JhZ2UsIGV2ZW4gd2hlbiBpbiBwcml2YXRlIGJyb3dzaW5nIG1vZGUuCiB2b2lk IHN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogdm9pZCBzdG9wT2JzZXJ2aW5nQ29va2ll Q2hhbmdlcygpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hUVFBI ZWFkZXJNYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L0hUVFBIZWFkZXJNYXAuaAkocmV2aXNpb24gMTMzNTQ5KQorKysgU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYgKzM5 LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgdHlwZWRlZiBWZWN0b3I8c3RkOjpwYWly PFN0cmluZywgU3RyaW5nPiA+IENyb3NzVGhyZWFkSFRUUEhlYWRlck1hcERhdGE7CiAKKyAgICAv LyBGSVhNRTogTm90IGV2ZXJ5IGhlYWRlciBmaXRzIGludG8gYSBtYXAuIE5vdGFibHksIG11bHRp cGxlIFNldC1Db29raWUgaGVhZGVyIGZpZWxkcyBhcmUgbmVlZGVkIHRvIHNldCBtdWx0aXBsZSBj b29raWVzLgogICAgIGNsYXNzIEhUVFBIZWFkZXJNYXAgOiBwdWJsaWMgSGFzaE1hcDxBdG9taWNT dHJpbmcsIFN0cmluZywgQ2FzZUZvbGRpbmdIYXNoPiB7CiAgICAgcHVibGljOgogICAgICAgICBI VFRQSGVhZGVyTWFwKCk7Cg== 172631 2012-11-06 12:37:24 -0800 2012-11-06 13:25:04 -0800 patch for landing Cookies1.txt text/plain 9538 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDEzMzYzOSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI4IEBACisyMDEyLTExLTA2ICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIFNvbWUgY29va2llIGNvZGUg Y2xlYW51cAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MTAxMzc1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFuIEJlcm5zdGVpbi4KKworICAgICAgICAq IHBsYXRmb3JtL0Nvb2tpZUphci5oOiBGaXhlZCBzdHlsZS4gR3JvdXBlZCBmdW5jdGlvbnMgYnkg d2hpY2ggc3RvcmFnZSB0aGV5IG9wZXJhdGUKKyAgICAgICAgb24gaW4gTWFjIHBvcnQsIGJ1dCBk aWRuJ3QgYWRkIGV4cGxhbmF0b3J5IGNvbW1lbnRzIHlldCwgYmVjYXVzZSB0aGlzIGlzIGRpZmZl cmVudAorICAgICAgICBpbiBzb21lIHBvcnRzLgorCisgICAgICAgICogcGxhdGZvcm0vbWFjL0Nv b2tpZUphci5tbToKKyAgICAgICAgKFdlYkNvcmUpOiBSZW1vdmVkIHNwZWNpYWwgY29kZSBmb3Ig aXNIVFRQT25seSwgaXQncyBwcmVzZW50IGluIEZvdW5kYXRpb24gaW4gYWxsCisgICAgICAgIHN1 cHBvcnRlZCBPUyBYIHZlcnNpb25zLgorICAgICAgICAoV2ViQ29yZTo6ZmlsdGVyQ29va2llcyk6 IFVzZSAtaXNIVFRQT25seSBkaXJlY3RseS4KKyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZXMpOiBH ZXQgcmlkIG9mIGEgdmFyaWFibGUgZm9yIFVSTCwgaW1wbGljaXQgY29udmVyc2lvbiB3b3JrcyBq dXN0IGFzIHdlbGwuCisgICAgICAgIChXZWJDb3JlOjpjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRW YWx1ZSk6IERpdHRvLgorICAgICAgICAoV2ViQ29yZTo6c2V0Q29va2llcyk6IEFzc2VydCB0aGF0 IG5vIG1vcmUgdGhhbiBvbmUgY29va2llIHdhcyBjcmVhdGVkIGZyb20gb25lCisgICAgICAgIFNl dC1Db29raWUgaGVhZGVyLCBkb2N1bWVudC5jb29raWUgY2FuIG9ubHkgYmUgdXNlZCB0byBzZXQg b25lIGNvb2tpZSBhdCBhIHRpbWUuCisgICAgICAgIChXZWJDb3JlOjpnZXRSYXdDb29raWVzKTog UmVtb3ZlZCB1c2VsZXNzIGxvY2FsIHZhcmlhYmxlcy4KKworICAgICAgICAqIHBsYXRmb3JtL25l dHdvcmsvQ29va2llU3RvcmFnZS5oOiBSZW1vdmVkIGFuIHVubmVlZGVkIGluY2x1ZGUsIGNsYXJp ZmllZCBhIGNvbW1lbnQuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL0hUVFBIZWFkZXJN YXAuaDogQWRkZWQgYSBGSVhNRS4KKwogMjAxMi0xMS0wNiAgQWRhbSBCYXJ0aCAgPGFiYXJ0aEB3 ZWJraXQub3JnPgogCiAgICAgICAgIFNjcmlwdFdyYXBwYWJsZSBzaG91bGQgd29yayBmb3IgbW9y ZSB0aGFuIGp1c3QgTm9kZQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29va2llSmFy LmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vQ29va2llSmFyLmgJKHJl dmlzaW9uIDEzMzU0OSkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL0Nvb2tpZUphci5oCSh3 b3JraW5nIGNvcHkpCkBAIC0zMywyMiArMzMsMjIgQEAKIAogbmFtZXNwYWNlIFdlYkNvcmUgewog Ci0gICAgY2xhc3MgRG9jdW1lbnQ7Ci0gICAgY2xhc3MgS1VSTDsKLQotICAgIHN0cnVjdCBDb29r aWU7Ci0KLSAgICAvLyBjb29raWVzIG9taXRzIEh0dHBPbmx5IGNvb2tpZXMuCi0gICAgU3RyaW5n IGNvb2tpZXMoY29uc3QgRG9jdW1lbnQqLCBjb25zdCBLVVJMJik7Ci0gICAgU3RyaW5nIGNvb2tp ZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKGNvbnN0IERvY3VtZW50KiwgY29uc3QgS1VSTCYpOwot ICAgIHZvaWQgc2V0Q29va2llcyhEb2N1bWVudCosIGNvbnN0IEtVUkwmLCBjb25zdCBTdHJpbmcm KTsKLSAgICBib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50Kik7Ci0gICAgYm9vbCBn ZXRSYXdDb29raWVzKGNvbnN0IERvY3VtZW50KiwgY29uc3QgS1VSTCYsIFZlY3RvcjxDb29raWU+ Jik7Ci0gICAgdm9pZCBkZWxldGVDb29raWUoY29uc3QgRG9jdW1lbnQqLCBjb25zdCBLVVJMJiwg Y29uc3QgU3RyaW5nJik7Ci0KLSAgICB2b2lkIGdldEhvc3RuYW1lc1dpdGhDb29raWVzKEhhc2hT ZXQ8U3RyaW5nPiYgaG9zdG5hbWVzKTsKLSAgICB2b2lkIGRlbGV0ZUNvb2tpZXNGb3JIb3N0bmFt ZShjb25zdCBTdHJpbmcmIGhvc3RuYW1lKTsKLSAgICB2b2lkIGRlbGV0ZUFsbENvb2tpZXMoKTsK K2NsYXNzIERvY3VtZW50OworY2xhc3MgS1VSTDsKK3N0cnVjdCBDb29raWU7CisKKy8vIFRoZXNl IHR3byBmdW5jdGlvbnMgaW1wbGVtZW50IGRvY3VtZW50LmNvb2tpZSBBUEksIHdpdGggc3BlY2lh bCBydWxlcyBmb3IgSHR0cE9ubHkgY29va2llcy4KK1N0cmluZyBjb29raWVzKGNvbnN0IERvY3Vt ZW50KiwgY29uc3QgS1VSTCYpOwordm9pZCBzZXRDb29raWVzKERvY3VtZW50KiwgY29uc3QgS1VS TCYsIGNvbnN0IFN0cmluZyYpOworCitib29sIGNvb2tpZXNFbmFibGVkKGNvbnN0IERvY3VtZW50 Kik7CitTdHJpbmcgY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoY29uc3QgRG9jdW1lbnQq LCBjb25zdCBLVVJMJik7Citib29sIGdldFJhd0Nvb2tpZXMoY29uc3QgRG9jdW1lbnQqLCBjb25z dCBLVVJMJiwgVmVjdG9yPENvb2tpZT4mKTsKK3ZvaWQgZGVsZXRlQ29va2llKGNvbnN0IERvY3Vt ZW50KiwgY29uc3QgS1VSTCYsIGNvbnN0IFN0cmluZyYpOworCit2b2lkIGdldEhvc3RuYW1lc1dp dGhDb29raWVzKEhhc2hTZXQ8U3RyaW5nPiYgaG9zdG5hbWVzKTsKK3ZvaWQgZGVsZXRlQ29va2ll c0Zvckhvc3RuYW1lKGNvbnN0IFN0cmluZyYgaG9zdG5hbWUpOwordm9pZCBkZWxldGVBbGxDb29r aWVzKCk7CiAKIH0KIApJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL0Nvb2tpZUph ci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29va2llSmFy Lm1tCShyZXZpc2lvbiAxMzM1NDkpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvQ29v a2llSmFyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xLDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdo dCAoQykgMjAwMywgMjAwNiwgMjAwOCBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisg KiBDb3B5cmlnaHQgKEMpIDIwMDMsIDIwMDYsIDIwMDgsIDIwMTIgQXBwbGUgSW5jLiBBbGwgcmln aHRzIHJlc2VydmVkLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFu ZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVy bWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0zMywyNSAr MzMsMTAgQEAKICNpbXBvcnQgIkNvb2tpZVN0b3JhZ2UuaCIKICNpbXBvcnQgIkNvb2tpZVN0b3Jh Z2VDRk5ldC5oIgogI2ltcG9ydCAiRG9jdW1lbnQuaCIKLSNpbXBvcnQgIktVUkwuaCIKICNpbXBv cnQgIldlYkNvcmVTeXN0ZW1JbnRlcmZhY2UuaCIKLSNpbXBvcnQgPHd0Zi9SZXRhaW5QdHIuaD4K LQotCi1AaW50ZXJmYWNlIE5TSFRUUENvb2tpZSAoV2ViQ29yZUhUVFBPbmx5Q29va2llcykKLS0g KEJPT0wpaXNIVFRQT25seTsKLUBlbmQKIAogbmFtZXNwYWNlIFdlYkNvcmUgewogCi1zdGF0aWMg Ym9vbCBpc0hUVFBPbmx5KE5TSFRUUENvb2tpZSAqY29va2llKQotewotICAgIC8vIE9uY2Ugd2Ug cmVxdWlyZSBhIG5ld2VyIHZlcnNpb24gb2YgRm91bmRhdGlvbiB3aXRoIHRoZSBpc0hUVFBPbmx5 IG1ldGhvZCwKLSAgICAvLyB3ZSBjYW4gZWxpbWluYXRlIHRoZSBpbnN0YW5jZXNSZXNwb25kVG9T ZWxlY3RvcjogY2hlY2suCi0gICAgc3RhdGljIGJvb2wgc3VwcG9ydHNIVFRQT25seUNvb2tpZXMg PSBbTlNIVFRQQ29va2llIGluc3RhbmNlc1Jlc3BvbmRUb1NlbGVjdG9yOkBzZWxlY3Rvcihpc0hU VFBPbmx5KV07Ci0gICAgcmV0dXJuIHN1cHBvcnRzSFRUUE9ubHlDb29raWVzICYmIFtjb29raWUg aXNIVFRQT25seV07Ci19Ci0KIHN0YXRpYyBSZXRhaW5QdHI8TlNBcnJheT4gZmlsdGVyQ29va2ll cyhOU0FycmF5ICp1bmZpbHRlcmVkQ29va2llcykKIHsKICAgICBOU1VJbnRlZ2VyIGNvdW50ID0g W3VuZmlsdGVyZWRDb29raWVzIGNvdW50XTsKQEAgLTY3LDcgKzUyLDcgQEAgc3RhdGljIFJldGFp blB0cjxOU0FycmF5PiBmaWx0ZXJDb29raWVzKAogICAgICAgICBpZiAoIVtbY29va2llIG5hbWVd IGxlbmd0aF0pCiAgICAgICAgICAgICBjb250aW51ZTsKIAotICAgICAgICBpZiAoaXNIVFRQT25s eShjb29raWUpKQorICAgICAgICBpZiAoW2Nvb2tpZSBpc0hUVFBPbmx5XSkKICAgICAgICAgICAg IGNvbnRpbnVlOwogCiAgICAgICAgIFtmaWx0ZXJlZENvb2tpZXMuZ2V0KCkgYWRkT2JqZWN0OmNv b2tpZV07CkBAIC04MCwxMiArNjUsMTEgQEAgU3RyaW5nIGNvb2tpZXMoY29uc3QgRG9jdW1lbnQq LCBjb25zdCBLVQogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIAotICAgIE5T VVJMICpjb29raWVVUkwgPSB1cmw7CiAgICAgTlNBcnJheSAqY29va2llczsKICAgICBpZiAoUmV0 YWluUHRyPENGSFRUUENvb2tpZVN0b3JhZ2VSZWY+IGNmQ29va2llU3RvcmFnZSA9IGN1cnJlbnRD RkhUVFBDb29raWVTdG9yYWdlKCkpCi0gICAgICAgIGNvb2tpZXMgPSB3a0hUVFBDb29raWVzRm9y VVJMKGNmQ29va2llU3RvcmFnZS5nZXQoKSwgY29va2llVVJMKTsKKyAgICAgICAgY29va2llcyA9 IHdrSFRUUENvb2tpZXNGb3JVUkwoY2ZDb29raWVTdG9yYWdlLmdldCgpLCB1cmwpOwogICAgIGVs c2UKLSAgICAgICAgY29va2llcyA9IFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRIVFRQQ29v a2llU3RvcmFnZV0gY29va2llc0ZvclVSTDpjb29raWVVUkxdOworICAgICAgICBjb29raWVzID0g W1tOU0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29raWVzRm9y VVJMOnVybF07CiAKICAgICByZXR1cm4gW1tOU0hUVFBDb29raWUgcmVxdWVzdEhlYWRlckZpZWxk c1dpdGhDb29raWVzOmZpbHRlckNvb2tpZXMoY29va2llcykuZ2V0KCldIG9iamVjdEZvcktleTpA IkNvb2tpZSJdOwogCkBAIC05NywxMiArODEsMTEgQEAgU3RyaW5nIGNvb2tpZVJlcXVlc3RIZWFk ZXJGaWVsZFZhbHVlKGNvbgogewogICAgIEJFR0lOX0JMT0NLX09CSkNfRVhDRVBUSU9OUzsKIAot ICAgIE5TVVJMICpjb29raWVVUkwgPSB1cmw7CiAgICAgTlNBcnJheSAqY29va2llczsKICAgICBp ZiAoUmV0YWluUHRyPENGSFRUUENvb2tpZVN0b3JhZ2VSZWY+IGNmQ29va2llU3RvcmFnZSA9IGN1 cnJlbnRDRkhUVFBDb29raWVTdG9yYWdlKCkpCi0gICAgICAgIGNvb2tpZXMgPSB3a0hUVFBDb29r aWVzRm9yVVJMKGNmQ29va2llU3RvcmFnZS5nZXQoKSwgY29va2llVVJMKTsKKyAgICAgICAgY29v a2llcyA9IHdrSFRUUENvb2tpZXNGb3JVUkwoY2ZDb29raWVTdG9yYWdlLmdldCgpLCB1cmwpOwog ICAgIGVsc2UKLSAgICAgICAgY29va2llcyA9IFtbTlNIVFRQQ29va2llU3RvcmFnZSBzaGFyZWRI VFRQQ29va2llU3RvcmFnZV0gY29va2llc0ZvclVSTDpjb29raWVVUkxdOworICAgICAgICBjb29r aWVzID0gW1tOU0hUVFBDb29raWVTdG9yYWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29r aWVzRm9yVVJMOnVybF07CiAKICAgICByZXR1cm4gW1tOU0hUVFBDb29raWUgcmVxdWVzdEhlYWRl ckZpZWxkc1dpdGhDb29raWVzOmNvb2tpZXNdIG9iamVjdEZvcktleTpAIkNvb2tpZSJdOwogCkBA IC0xMjMsOCArMTA2LDkgQEAgdm9pZCBzZXRDb29raWVzKERvY3VtZW50KiBkb2N1bWVudCwgY29u cwogICAgIC8vIGNvb2tpZXNXaXRoUmVzcG9uc2VIZWFkZXJGaWVsZHMgZG9lc24ndCBwYXJzZSBj b29raWVzIHdpdGhvdXQgYSB2YWx1ZQogICAgIFN0cmluZyBjb29raWVTdHJpbmcgPSBjb29raWVT dHIuY29udGFpbnMoJz0nKSA/IGNvb2tpZVN0ciA6IGNvb2tpZVN0ciArICI9IjsKIAotICAgIE5T VVJMICpjb29raWVVUkwgPSB1cmw7ICAgIAorICAgIE5TVVJMICpjb29raWVVUkwgPSB1cmw7CiAg ICAgUmV0YWluUHRyPE5TQXJyYXk+IGZpbHRlcmVkQ29va2llcyA9IGZpbHRlckNvb2tpZXMoW05T SFRUUENvb2tpZSBjb29raWVzV2l0aFJlc3BvbnNlSGVhZGVyRmllbGRzOltOU0RpY3Rpb25hcnkg ZGljdGlvbmFyeVdpdGhPYmplY3Q6Y29va2llU3RyaW5nIGZvcktleTpAIlNldC1Db29raWUiXSBm b3JVUkw6Y29va2llVVJMXSk7CisgICAgQVNTRVJUKFtmaWx0ZXJlZENvb2tpZXMuZ2V0KCkgY291 bnRdIDw9IDEpOwogCiAgICAgaWYgKFJldGFpblB0cjxDRkhUVFBDb29raWVTdG9yYWdlUmVmPiBj ZkNvb2tpZVN0b3JhZ2UgPSBjdXJyZW50Q0ZIVFRQQ29va2llU3RvcmFnZSgpKQogICAgICAgICB3 a1NldEhUVFBDb29raWVzRm9yVVJMKGNmQ29va2llU3RvcmFnZS5nZXQoKSwgZmlsdGVyZWRDb29r aWVzLmdldCgpLCBjb29raWVVUkwsIGRvY3VtZW50LT5maXJzdFBhcnR5Rm9yQ29va2llcygpKTsK QEAgLTE1NSwyNiArMTM5LDE5IEBAIGJvb2wgZ2V0UmF3Q29va2llcyhjb25zdCBEb2N1bWVudCos IGNvbnMKICAgICByYXdDb29raWVzLmNsZWFyKCk7CiAgICAgQkVHSU5fQkxPQ0tfT0JKQ19FWENF UFRJT05TOwogCi0gICAgTlNVUkwgKmNvb2tpZVVSTCA9IHVybDsKICAgICBOU0FycmF5ICpjb29r aWVzOwogICAgIGlmIChSZXRhaW5QdHI8Q0ZIVFRQQ29va2llU3RvcmFnZVJlZj4gY2ZDb29raWVT dG9yYWdlID0gY3VycmVudENGSFRUUENvb2tpZVN0b3JhZ2UoKSkKLSAgICAgICAgY29va2llcyA9 IHdrSFRUUENvb2tpZXNGb3JVUkwoY2ZDb29raWVTdG9yYWdlLmdldCgpLCBjb29raWVVUkwpOwor ICAgICAgICBjb29raWVzID0gd2tIVFRQQ29va2llc0ZvclVSTChjZkNvb2tpZVN0b3JhZ2UuZ2V0 KCksIHVybCk7CiAgICAgZWxzZQotICAgICAgICBjb29raWVzID0gW1tOU0hUVFBDb29raWVTdG9y YWdlIHNoYXJlZEhUVFBDb29raWVTdG9yYWdlXSBjb29raWVzRm9yVVJMOmNvb2tpZVVSTF07Cisg ICAgICAgIGNvb2tpZXMgPSBbW05TSFRUUENvb2tpZVN0b3JhZ2Ugc2hhcmVkSFRUUENvb2tpZVN0 b3JhZ2VdIGNvb2tpZXNGb3JVUkw6dXJsXTsKIAogICAgIE5TVUludGVnZXIgY291bnQgPSBbY29v a2llcyBjb3VudF07CiAgICAgcmF3Q29va2llcy5yZXNlcnZlQ2FwYWNpdHkoY291bnQpOwogICAg IGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKICAgICAgICAgTlNIVFRQ Q29va2llICpjb29raWUgPSAoTlNIVFRQQ29va2llICopW2Nvb2tpZXMgb2JqZWN0QXRJbmRleDpp XTsKLSAgICAgICAgTlNTdHJpbmcgKm5hbWUgPSBbY29va2llIG5hbWVdOwotICAgICAgICBOU1N0 cmluZyAqdmFsdWUgPSBbY29va2llIHZhbHVlXTsKLSAgICAgICAgTlNTdHJpbmcgKmRvbWFpbiA9 IFtjb29raWUgZG9tYWluXTsKLSAgICAgICAgTlNTdHJpbmcgKnBhdGggPSBbY29va2llIHBhdGhd OwogICAgICAgICBOU1RpbWVJbnRlcnZhbCBleHBpcmVzID0gW1tjb29raWUgZXhwaXJlc0RhdGVd IHRpbWVJbnRlcnZhbFNpbmNlMTk3MF0gKiAxMDAwOwotICAgICAgICBib29sIGh0dHBPbmx5ID0g W2Nvb2tpZSBpc0hUVFBPbmx5XTsKLSAgICAgICAgYm9vbCBzZWN1cmUgPSBbY29va2llIGlzU2Vj dXJlXTsKLSAgICAgICAgYm9vbCBzZXNzaW9uID0gW2Nvb2tpZSBpc1Nlc3Npb25Pbmx5XTsKLSAg ICAgICAgcmF3Q29va2llcy51bmNoZWNrZWRBcHBlbmQoQ29va2llKG5hbWUsIHZhbHVlLCBkb21h aW4sIHBhdGgsIGV4cGlyZXMsIGh0dHBPbmx5LCBzZWN1cmUsIHNlc3Npb24pKTsKKyAgICAgICAg cmF3Q29va2llcy51bmNoZWNrZWRBcHBlbmQoQ29va2llKFtjb29raWUgbmFtZV0sIFtjb29raWUg dmFsdWVdLCBbY29va2llIGRvbWFpbl0sIFtjb29raWUgcGF0aF0sIGV4cGlyZXMsCisgICAgICAg ICAgICBbY29va2llIGlzSFRUUE9ubHldLCBbY29va2llIGlzU2VjdXJlXSwgW2Nvb2tpZSBpc1Nl c3Npb25Pbmx5XSkpOwogICAgIH0KIAogICAgIEVORF9CTE9DS19PQkpDX0VYQ0VQVElPTlM7Cklu ZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Nvb2tpZVN0b3JhZ2UuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0Nvb2tpZVN0b3JhZ2Uu aAkocmV2aXNpb24gMTMzNTQ5KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9D b29raWVTdG9yYWdlLmgJKHdvcmtpbmcgY29weSkKQEAgLTI2LDExICsyNiw5IEBACiAjaWZuZGVm IENvb2tpZVN0b3JhZ2VfaAogI2RlZmluZSBDb29raWVTdG9yYWdlX2gKIAotI2luY2x1ZGUgPHd0 Zi9SZXRhaW5QdHIuaD4KLQogbmFtZXNwYWNlIFdlYkNvcmUgewogCi0vLyBUaGVzZSBhcmUgYWx3 YXlzIG9ic2VydmluZyB0aGUgbWFpbiBjb29raWUgc3RvcmFnZSwgZXZlbiB3aGVuIGluIHByaXZh dGUgYnJvd3NpbmcgbW9kZS4KKy8vIFRoZXNlIGFyZSBhbHdheXMgb2JzZXJ2aW5nIHRoZSBzaGFy ZWQgY29va2llIHN0b3JhZ2UsIGV2ZW4gd2hlbiBpbiBwcml2YXRlIGJyb3dzaW5nIG1vZGUuCiB2 b2lkIHN0YXJ0T2JzZXJ2aW5nQ29va2llQ2hhbmdlcygpOwogdm9pZCBzdG9wT2JzZXJ2aW5nQ29v a2llQ2hhbmdlcygpOwogCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL0hU VFBIZWFkZXJNYXAuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL0hUVFBIZWFkZXJNYXAuaAkocmV2aXNpb24gMTMzNTQ5KQorKysgU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9IVFRQSGVhZGVyTWFwLmgJKHdvcmtpbmcgY29weSkKQEAgLTM5LDYg KzM5LDcgQEAgbmFtZXNwYWNlIFdlYkNvcmUgewogCiAgICAgdHlwZWRlZiBWZWN0b3I8c3RkOjpw YWlyPFN0cmluZywgU3RyaW5nPiA+IENyb3NzVGhyZWFkSFRUUEhlYWRlck1hcERhdGE7CiAKKyAg ICAvLyBGSVhNRTogTm90IGV2ZXJ5IGhlYWRlciBmaXRzIGludG8gYSBtYXAuIE5vdGFibHksIG11 bHRpcGxlIFNldC1Db29raWUgaGVhZGVyIGZpZWxkcyBhcmUgbmVlZGVkIHRvIHNldCBtdWx0aXBs ZSBjb29raWVzLgogICAgIGNsYXNzIEhUVFBIZWFkZXJNYXAgOiBwdWJsaWMgSGFzaE1hcDxBdG9t aWNTdHJpbmcsIFN0cmluZywgQ2FzZUZvbGRpbmdIYXNoPiB7CiAgICAgcHVibGljOgogICAgICAg ICBIVFRQSGVhZGVyTWFwKCk7Cg==