184868 2018-04-21 17:04:19 -0700 Cleanup CookieRequestHeaderFieldProxy 2018-04-21 18:22:21 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 dbates dbates bfulgham webkit-bug-importer youennf oldest_to_newest 1416717 0 dbates 2018-04-21 17:04:19 -0700 Cleanup CookieRequestHeaderFieldProxy. 1416718 1 338540 dbates 2018-04-21 17:10:33 -0700 Created attachment 338540 Patch 1416723 2 dbates 2018-04-21 18:16:27 -0700 Committed r230898: <https://trac.webkit.org/changeset/230898> 1416724 3 webkit-bug-importer 2018-04-21 18:17:23 -0700 <rdar://problem/39625268> 1416726 4 dbates 2018-04-21 18:22:21 -0700 Removed extraneous whitespace that I inadvertently added to file Source/WebCore/platform/network/CookieRequestHeaderFieldProxy.h in <https://trac.webkit.org/changeset/230899>. 338540 2018-04-21 17:10:33 -0700 2018-04-21 17:53:55 -0700 Patch bug-184868-20180421171032.patch text/plain 13609 dbates SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIzMDg5NykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDM4IEBACisyMDE4LTA0LTIxICBEYW5pZWwg QmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KKworICAgICAgICBDbGVhbnVwIENvb2tpZVJlcXVl c3RIZWFkZXJGaWVsZFByb3h5CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0xODQ4NjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBTaW1wbGlmeSB0aGUgc3RydWN0IENvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFBy b3h5IGFuZCBtYWtlIGl0IGNvbnNpc3RlbnQgd2l0aCBvdGhlciBzdHJ1Y3RzLgorICAgICAgICBB bW9uZyBvdGhlciBjaGFuZ2VzLCByZW1vdmUgY29uc3RydWN0b3JzIGZvciBDb29raWVSZXF1ZXN0 SGVhZGVyRmllbGRQcm94eSBhcyB0aGV5IGFyZQorICAgICAgICB1bm5lY2Vzc2FyeSBhcyBhbGwg c3VwcG9ydGVkIGNvbXBpbGVycyBzdXBwb3J0IG5vbi1zdGF0aWMgZGF0YSBtZW1iZXIgaW5pdGlh bGl6ZXJzIChOU0RNSSkKKyAgICAgICAgZm9yIGFnZ3JlZ2F0ZXMsIHJlbW92ZSBwcmVmaXggIm1f IiBmcm9tIHRoZSBuYW1lIG9mIGZpZWxkcyBhcyB0aGlzIGlzIHN0cnVjdCBleGlzdHMgZm9yCisg ICAgICAgIGNvbnZlbmllbmNlIGFuZCBvZmZlcnMgbm8gZW5jYXBzdWxhdGlvbiBhbmQgc2ltcGxp ZnkgZGVjb2RpbmcgbG9naWMgb2YgdGhpcyBzdHJ1Y3QuCisKKyAgICAgICAgTm8gZnVuY3Rpb25h bGl0eSBjaGFuZ2VkLiBTbywgbm8gbmV3IHRlc3RzLgorCisgICAgICAgICogbG9hZGVyL0Nvb2tp ZUphci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94 eSk6CisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9Db29raWVSZXF1ZXN0SGVhZGVyRmllbGRQ cm94eS5oOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHk6 OmVuY29kZSBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpDb29raWVSZXF1ZXN0SGVhZGVyRmll bGRQcm94eTo6ZGVjb2RlKToKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZVJlcXVlc3RIZWFkZXJG aWVsZFByb3h5OjpDb29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eSk6IERlbGV0ZWQuCisgICAg ICAgICogcGxhdGZvcm0vbmV0d29yay9Tb2NrZXRTdHJlYW1IYW5kbGVJbXBsLmNwcDoKKyAgICAg ICAgKFdlYkNvcmU6OmNvb2tpZURhdGFGb3JIYW5kc2hha2UpOgorICAgICAgICAqIHBsYXRmb3Jt L25ldHdvcmsvY2YvQ29va2llSmFyQ0ZOZXQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29va2ll UmVxdWVzdEhlYWRlckZpZWxkVmFsdWUpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY2Yv U29ja2V0U3RyZWFtSGFuZGxlSW1wbC5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3Vy bC9Db29raWVKYXJDdXJsLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OmNvb2tpZVJlcXVlc3RIZWFk ZXJGaWVsZFZhbHVlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ29va2llSmFy Q3VybERhdGFiYXNlLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkNvb2tpZUphckN1cmxEYXRhYmFz ZTo6Y29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUgY29uc3QpOgorICAgICAgICAqIHBsYXRm b3JtL25ldHdvcmsvbWFjL0Nvb2tpZUphck1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OmNvb2tp ZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL3Nv dXAvQ29va2llSmFyU291cC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb29raWVSZXF1ZXN0SGVh ZGVyRmllbGRWYWx1ZSk6CisKIDIwMTgtMDQtMjEgIEFudG9pbmUgUXVpbnQgIDxncmFvdXRzQGFw cGxlLmNvbT4KIAogICAgICAgICBbTW9kZXJuIE1lZGlhIENvbnRyb2xzXSBTaG93IGEgbG9hZGlu ZyBpbmRpY2F0b3IgYWZ0ZXIgcHJlc3NpbmcgdGhlIHBsYXkgYnV0dG9uIGluIGNvbXBhY3QgbW9k ZQpJbmRleDogU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nvb2tpZUphci5jcHAKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gU291cmNlL1dlYkNvcmUvbG9hZGVyL0Nvb2tpZUphci5jcHAJKHJldmlzaW9uIDIzMDg5NykK KysrIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9Db29raWVKYXIuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC04NCwxMiArODQsMTYgQEAgQ29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHkgY29va2llUmVx dQogewogICAgIFRyYWNlU2NvcGUgc2NvcGUoRmV0Y2hDb29raWVzU3RhcnQsIEZldGNoQ29va2ll c0VuZCk7CiAKLSAgICBhdXRvIGluY2x1ZGVTZWN1cmVDb29raWVzID0gc2hvdWxkSW5jbHVkZVNl Y3VyZUNvb2tpZXMoZG9jdW1lbnQsIHVybCk7Ci0KLSAgICBpZiAoYXV0byogZnJhbWUgPSBkb2N1 bWVudC5mcmFtZSgpKQotICAgICAgICByZXR1cm4geyBzdG9yYWdlU2Vzc2lvbihkb2N1bWVudCku c2Vzc2lvbklEKCksIGRvY3VtZW50LmZpcnN0UGFydHlGb3JDb29raWVzKCksIHVybCwgZnJhbWUt PmxvYWRlcigpLmNsaWVudCgpLmZyYW1lSUQoKSwgZnJhbWUtPmxvYWRlcigpLmNsaWVudCgpLnBh Z2VJRCgpLCBpbmNsdWRlU2VjdXJlQ29va2llcyB9OwotCi0gICAgcmV0dXJuIHsgc3RvcmFnZVNl c3Npb24oZG9jdW1lbnQpLnNlc3Npb25JRCgpLCBkb2N1bWVudC5maXJzdFBhcnR5Rm9yQ29va2ll cygpLCB1cmwsIHN0ZDo6bnVsbG9wdCwgc3RkOjpudWxsb3B0LCBpbmNsdWRlU2VjdXJlQ29va2ll cyB9OworICAgIENvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFByb3h5IHByb3h5OworICAgIHByb3h5 LnNlc3Npb25JRCA9IHN0b3JhZ2VTZXNzaW9uKGRvY3VtZW50KS5zZXNzaW9uSUQoKTsKKyAgICBw cm94eS5maXJzdFBhcnR5ID0gZG9jdW1lbnQuZmlyc3RQYXJ0eUZvckNvb2tpZXMoKTsKKyAgICBw cm94eS51cmwgPSB1cmw7CisgICAgcHJveHkuaW5jbHVkZVNlY3VyZUNvb2tpZXMgPSBzaG91bGRJ bmNsdWRlU2VjdXJlQ29va2llcyhkb2N1bWVudCwgdXJsKTsKKyAgICBpZiAoYXV0byogZnJhbWUg PSBkb2N1bWVudC5mcmFtZSgpKSB7CisgICAgICAgIHByb3h5LmZyYW1lSUQgPSBmcmFtZS0+bG9h ZGVyKCkuY2xpZW50KCkuZnJhbWVJRCgpOworICAgICAgICBwcm94eS5wYWdlSUQgPSBmcmFtZS0+ bG9hZGVyKCkuY2xpZW50KCkucGFnZUlEKCk7CisgICAgfQorICAgIHJldHVybiBwcm94eTsKIH0K IAogdm9pZCBzZXRDb29raWVzKERvY3VtZW50JiBkb2N1bWVudCwgY29uc3QgVVJMJiB1cmwsIGNv bnN0IFN0cmluZyYgY29va2llU3RyaW5nKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9Db29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eS5oCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvQ29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJv eHkuaAkocmV2aXNpb24gMjMwODk3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9Db29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eS5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMiwz MyArMzIsMTIgQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogc3RydWN0IENvb2tpZVJlcXVlc3RI ZWFkZXJGaWVsZFByb3h5IHsKLSAgICBQQUw6OlNlc3Npb25JRCBtX3Nlc3Npb25JRDsKLSAgICBV UkwgbV9maXJzdFBhcnR5OwotICAgIFVSTCBtX3VybDsKLSAgICBzdGQ6Om9wdGlvbmFsPHVpbnQ2 NF90PiBtX2ZyYW1lSUQ7Ci0gICAgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gbV9wYWdlSUQ7Ci0g ICAgSW5jbHVkZVNlY3VyZUNvb2tpZXMgbV9pbmNsdWRlU2VjdXJlQ29va2llcyB7IEluY2x1ZGVT ZWN1cmVDb29raWVzOjpObyB9OwotCi0gICAgQ29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHko KSA9IGRlZmF1bHQ7Ci0gICAgQ29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHkoUEFMOjpTZXNz aW9uSUQmJiBzZXNzaW9uSUQsIFVSTCYmIGZpcnN0UGFydHksIFVSTCYmIHVybCwgc3RkOjpvcHRp b25hbDx1aW50NjRfdD4mJiBmcmFtZUlELCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiYmIHBhZ2VJ RCwgSW5jbHVkZVNlY3VyZUNvb2tpZXMgaW5jbHVkZVNlY3VyZUNvb2tpZXMpCi0gICAgICAgIDog bV9zZXNzaW9uSUQoV1RGTW92ZShzZXNzaW9uSUQpKQotICAgICAgICAsIG1fZmlyc3RQYXJ0eShX VEZNb3ZlKGZpcnN0UGFydHkpKQotICAgICAgICAsIG1fdXJsKFdURk1vdmUodXJsKSkKLSAgICAg ICAgLCBtX2ZyYW1lSUQoV1RGTW92ZShmcmFtZUlEKSkKLSAgICAgICAgLCBtX3BhZ2VJRChXVEZN b3ZlKHBhZ2VJRCkpCi0gICAgICAgICwgbV9pbmNsdWRlU2VjdXJlQ29va2llcyhpbmNsdWRlU2Vj dXJlQ29va2llcykKLSAgICB7Ci0gICAgfQotCi0gICAgQ29va2llUmVxdWVzdEhlYWRlckZpZWxk UHJveHkoUEFMOjpTZXNzaW9uSUQgc2Vzc2lvbklELCBjb25zdCBVUkwmIGZpcnN0UGFydHksIGNv bnN0IFVSTCYgdXJsLCBjb25zdCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiYgZnJhbWVJRCwgY29u c3Qgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4mIHBhZ2VJRCwgSW5jbHVkZVNlY3VyZUNvb2tpZXMg aW5jbHVkZVNlY3VyZUNvb2tpZXMpCi0gICAgICAgIDogbV9zZXNzaW9uSUQoc2Vzc2lvbklEKQot ICAgICAgICAsIG1fZmlyc3RQYXJ0eShmaXJzdFBhcnR5KQotICAgICAgICAsIG1fdXJsKHVybCkK LSAgICAgICAgLCBtX2ZyYW1lSUQoZnJhbWVJRCkKLSAgICAgICAgLCBtX3BhZ2VJRChwYWdlSUQp Ci0gICAgICAgICwgbV9pbmNsdWRlU2VjdXJlQ29va2llcyhpbmNsdWRlU2VjdXJlQ29va2llcykK LSAgICB7Ci0gICAgfQorICAgIFBBTDo6U2Vzc2lvbklEIHNlc3Npb25JRDsKKyAgICBVUkwgZmly c3RQYXJ0eTsKKyAgICBVUkwgdXJsOworICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1l SUQ7CisgICAgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gcGFnZUlEOworICAgIEluY2x1ZGVTZWN1 cmVDb29raWVzIGluY2x1ZGVTZWN1cmVDb29raWVzIHsgSW5jbHVkZVNlY3VyZUNvb2tpZXM6Ok5v IH07CiAKICAgICB0ZW1wbGF0ZTxjbGFzcyBFbmNvZGVyPiB2b2lkIGVuY29kZShFbmNvZGVyJikg Y29uc3Q7CiAgICAgdGVtcGxhdGU8Y2xhc3MgRGVjb2Rlcj4gc3RhdGljIHN0ZDo6b3B0aW9uYWw8 Q29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJveHk+IGRlY29kZShEZWNvZGVyJik7CkBAIC02Nyw0 MiArNDYsMzEgQEAgc3RydWN0IENvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFByb3h5IHsKIHRlbXBs YXRlPGNsYXNzIEVuY29kZXI+CiB2b2lkIENvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFByb3h5Ojpl bmNvZGUoRW5jb2RlciYgZW5jb2RlcikgY29uc3QKIHsKLSAgICBlbmNvZGVyIDw8IG1fc2Vzc2lv bklEOwotICAgIGVuY29kZXIgPDwgbV9maXJzdFBhcnR5OwotICAgIGVuY29kZXIgPDwgbV91cmw7 Ci0gICAgZW5jb2RlciA8PCBtX2ZyYW1lSUQ7Ci0gICAgZW5jb2RlciA8PCBtX3BhZ2VJRDsKLSAg ICBlbmNvZGVyIDw8IG1faW5jbHVkZVNlY3VyZUNvb2tpZXM7CisgICAgZW5jb2RlciA8PCBzZXNz aW9uSUQ7CisgICAgZW5jb2RlciA8PCBmaXJzdFBhcnR5OworICAgIGVuY29kZXIgPDwgdXJsOwor ICAgIGVuY29kZXIgPDwgZnJhbWVJRDsKKyAgICBlbmNvZGVyIDw8IHBhZ2VJRDsKKyAgICBlbmNv ZGVyIDw8IGluY2x1ZGVTZWN1cmVDb29raWVzOwogfQogCiB0ZW1wbGF0ZTxjbGFzcyBEZWNvZGVy Pgogc3RkOjpvcHRpb25hbDxDb29raWVSZXF1ZXN0SGVhZGVyRmllbGRQcm94eT4gQ29va2llUmVx dWVzdEhlYWRlckZpZWxkUHJveHk6OmRlY29kZShEZWNvZGVyJiBkZWNvZGVyKQotewotICAgIFBB TDo6U2Vzc2lvbklEIHNlc3Npb25JRDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHNlc3Npb25J RCkpCit7ICAgICAgICAgICAgICAgICAgICAgICAgCisgICAgQ29va2llUmVxdWVzdEhlYWRlckZp ZWxkUHJveHkgcmVzdWx0OworICAgIGlmICghZGVjb2Rlci5kZWNvZGUocmVzdWx0LnNlc3Npb25J RCkpCiAgICAgICAgIHJldHVybiBzdGQ6Om51bGxvcHQ7Ci0KLSAgICBVUkwgZmlyc3RQYXJ0eTsK LSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKGZpcnN0UGFydHkpKQorICAgIGlmICghZGVjb2Rlci5k ZWNvZGUocmVzdWx0LmZpcnN0UGFydHkpKQogICAgICAgICByZXR1cm4gc3RkOjpudWxsb3B0Owot Ci0gICAgVVJMIHVybDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHVybCkpCisgICAgaWYgKCFk ZWNvZGVyLmRlY29kZShyZXN1bHQudXJsKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsK LQotICAgIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQ7Ci0gICAgaWYgKCFkZWNvZGVy LmRlY29kZShmcmFtZUlEKSkKKyAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5mcmFtZUlE KSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVsbG9wdDsKLQotICAgIHN0ZDo6b3B0aW9uYWw8dWlu dDY0X3Q+IHBhZ2VJRDsKLSAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHBhZ2VJRCkpCisgICAgaWYg KCFkZWNvZGVyLmRlY29kZShyZXN1bHQucGFnZUlEKSkKICAgICAgICAgcmV0dXJuIHN0ZDo6bnVs bG9wdDsKLQotICAgIEluY2x1ZGVTZWN1cmVDb29raWVzIGluY2x1ZGVTZWN1cmVDb29raWVzOwot ICAgIGlmICghZGVjb2Rlci5kZWNvZGUoaW5jbHVkZVNlY3VyZUNvb2tpZXMpKQorICAgIGlmICgh ZGVjb2Rlci5kZWNvZGUocmVzdWx0LmluY2x1ZGVTZWN1cmVDb29raWVzKSkKICAgICAgICAgcmV0 dXJuIHN0ZDo6bnVsbG9wdDsKLQotICAgIHJldHVybiB7eyBXVEZNb3ZlKHNlc3Npb25JRCksIFdU Rk1vdmUoZmlyc3RQYXJ0eSksIFdURk1vdmUodXJsKSwgV1RGTW92ZSgqZnJhbWVJRCksIFdURk1v dmUoKnBhZ2VJRCksIGluY2x1ZGVTZWN1cmVDb29raWVzIH19OworICAgIHJldHVybiBXVEZNb3Zl KHJlc3VsdCk7CiB9CiAKLX0KK30gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvU29ja2V0U3RyZWFtSGFuZGxlSW1wbC5jcHAKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9Tb2NrZXRTdHJlYW1IYW5k bGVJbXBsLmNwcAkocmV2aXNpb24gMjMwODk3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9Tb2NrZXRTdHJlYW1IYW5kbGVJbXBsLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNzks NyArNzksNyBAQCBzdGF0aWMgc2l6ZV90IHJlbW92ZVRlcm1pbmF0aW9uQ2hhcmFjdGVyCiAKIHN0 YXRpYyBzdGQ6OnBhaXI8VmVjdG9yPHVpbnQ4X3Q+LCBib29sPiBjb29raWVEYXRhRm9ySGFuZHNo YWtlKGNvbnN0IENvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFByb3h5JiBoZWFkZXJGaWVsZFByb3h5 KQogewotICAgIGF1dG8gbmV0d29ya1N0b3JhZ2VTZXNzaW9uID0gTmV0d29ya1N0b3JhZ2VTZXNz aW9uOjpzdG9yYWdlU2Vzc2lvbihoZWFkZXJGaWVsZFByb3h5Lm1fc2Vzc2lvbklEKTsKKyAgICBh dXRvIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiA9IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c3RvcmFn ZVNlc3Npb24oaGVhZGVyRmllbGRQcm94eS5zZXNzaW9uSUQpOwogICAgIFJFTEVBU0VfQVNTRVJU KG5ldHdvcmtTdG9yYWdlU2Vzc2lvbik7CiAKICAgICBTdHJpbmcgY29va2llRGF0YVN0cmluZzsK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvQ29va2llSmFyQ0ZOZXQu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY2YvQ29v a2llSmFyQ0ZOZXQuY3BwCShyZXZpc2lvbiAyMzA4OTcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NmL0Nvb2tpZUphckNGTmV0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjM0 LDcgKzIzNCw3IEBAIHN0ZDo6cGFpcjxTdHJpbmcsIGJvb2w+IGNvb2tpZVJlcXVlc3RIZWEKIAog c3RkOjpwYWlyPFN0cmluZywgYm9vbD4gY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoY29u c3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBDb29raWVSZXF1ZXN0SGVh ZGVyRmllbGRQcm94eSYgaGVhZGVyRmllbGRQcm94eSkKIHsKLSAgICByZXR1cm4gY29va2llUmVx dWVzdEhlYWRlckZpZWxkVmFsdWUoc2Vzc2lvbiwgaGVhZGVyRmllbGRQcm94eS5tX2ZpcnN0UGFy dHksIGhlYWRlckZpZWxkUHJveHkubV91cmwsIGhlYWRlckZpZWxkUHJveHkubV9mcmFtZUlELCBo ZWFkZXJGaWVsZFByb3h5Lm1fcGFnZUlELCBoZWFkZXJGaWVsZFByb3h5Lm1faW5jbHVkZVNlY3Vy ZUNvb2tpZXMpOworICAgIHJldHVybiBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShzZXNz aW9uLCBoZWFkZXJGaWVsZFByb3h5LmZpcnN0UGFydHksIGhlYWRlckZpZWxkUHJveHkudXJsLCBo ZWFkZXJGaWVsZFByb3h5LmZyYW1lSUQsIGhlYWRlckZpZWxkUHJveHkucGFnZUlELCBoZWFkZXJG aWVsZFByb3h5LmluY2x1ZGVTZWN1cmVDb29raWVzKTsKIH0KIAogYm9vbCBjb29raWVzRW5hYmxl ZChjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24pCkluZGV4OiBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1NvY2tldFN0cmVhbUhhbmRsZUltcGwuaAo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NmL1NvY2tldFN0cmVhbUhh bmRsZUltcGwuaAkocmV2aXNpb24gMjMwODk3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v bmV0d29yay9jZi9Tb2NrZXRTdHJlYW1IYW5kbGVJbXBsLmgJKHdvcmtpbmcgY29weSkKQEAgLTEw MCw3ICsxMDAsNyBAQCBwcml2YXRlOgogICAgIFJldGFpblB0cjxDRldyaXRlU3RyZWFtUmVmPiBt X3dyaXRlU3RyZWFtOwogCiAgICAgUmV0YWluUHRyPENGVVJMUmVmPiBtX2h0dHBzVVJMOyAvLyB3 cyhzKTogcmVwbGFjZWQgd2l0aCBodHRwczoKLSAgICBQQUw6OlNlc3Npb25JRCBtX3Nlc3Npb25J RDsKKyAgICBQQUw6OlNlc3Npb25JRCBzZXNzaW9uSUQ7CiAgICAgU3RyaW5nIG1fY3JlZGVudGlh bFBhcnRpdGlvbjsKICAgICBTb3VyY2VBcHBsaWNhdGlvbkF1ZGl0VG9rZW4gbV9hdWRpdERhdGE7 CiAKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVKYXJD dXJsLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvQ29va2llSmFyQ3VybC5jcHAJKHJldmlzaW9uIDIzMDg5NykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvY3VybC9Db29raWVKYXJDdXJsLmNwcAkod29ya2luZyBjb3B5KQpA QCAtNDcsNyArNDcsNyBAQCBzdGQ6OnBhaXI8U3RyaW5nLCBib29sPiBjb29raWVSZXF1ZXN0SGVh CiAKIHN0ZDo6cGFpcjxTdHJpbmcsIGJvb2w+IGNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVl KGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgQ29va2llUmVxdWVz dEhlYWRlckZpZWxkUHJveHkmIGhlYWRlckZpZWxkUHJveHkpCiB7Ci0gICAgcmV0dXJuIHNlc3Np b24uY29va2llU3RvcmFnZSgpLmNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKHNlc3Npb24s IGhlYWRlckZpZWxkUHJveHkubV9maXJzdFBhcnR5LCBoZWFkZXJGaWVsZFByb3h5Lm1fdXJsLCBo ZWFkZXJGaWVsZFByb3h5Lm1fZnJhbWVJRCwgaGVhZGVyRmllbGRQcm94eS5tX3BhZ2VJRCwgaGVh ZGVyRmllbGRQcm94eS5tX2luY2x1ZGVTZWN1cmVDb29raWVzKTsKKyAgICByZXR1cm4gc2Vzc2lv bi5jb29raWVTdG9yYWdlKCkuY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoc2Vzc2lvbiwg aGVhZGVyRmllbGRQcm94eS5maXJzdFBhcnR5LCBoZWFkZXJGaWVsZFByb3h5LnVybCwgaGVhZGVy RmllbGRQcm94eS5mcmFtZUlELCBoZWFkZXJGaWVsZFByb3h5LnBhZ2VJRCwgaGVhZGVyRmllbGRQ cm94eS5pbmNsdWRlU2VjdXJlQ29va2llcyk7CiB9CiAKIGJvb2wgY29va2llc0VuYWJsZWQoY29u c3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uKQpJbmRleDogU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckN1cmxEYXRhYmFzZS5jcHAKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0Nvb2tpZUphckN1cmxE YXRhYmFzZS5jcHAJKHJldmlzaW9uIDIzMDg5NykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvY3VybC9Db29raWVKYXJDdXJsRGF0YWJhc2UuY3BwCSh3b3JraW5nIGNvcHkpCkBA IC05Niw3ICs5Niw3IEBAIHN0ZDo6cGFpcjxTdHJpbmcsIGJvb2w+IENvb2tpZUphckN1cmxEYXQK IAogc3RkOjpwYWlyPFN0cmluZywgYm9vbD4gQ29va2llSmFyQ3VybERhdGFiYXNlOjpjb29raWVS ZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Np b24sIGNvbnN0IENvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFByb3h5JiBoZWFkZXJGaWVsZFByb3h5 KSBjb25zdAogewotICAgIHJldHVybiBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShzZXNz aW9uLCBoZWFkZXJGaWVsZFByb3h5Lm1fZmlyc3RQYXJ0eSwgaGVhZGVyRmllbGRQcm94eS5tX3Vy bCwgaGVhZGVyRmllbGRQcm94eS5tX2ZyYW1lSUQsIGhlYWRlckZpZWxkUHJveHkubV9wYWdlSUQs IGhlYWRlckZpZWxkUHJveHkubV9pbmNsdWRlU2VjdXJlQ29va2llcyk7ICAgIAorICAgIHJldHVy biBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShzZXNzaW9uLCBoZWFkZXJGaWVsZFByb3h5 LmZpcnN0UGFydHksIGhlYWRlckZpZWxkUHJveHkudXJsLCBoZWFkZXJGaWVsZFByb3h5LmZyYW1l SUQsIGhlYWRlckZpZWxkUHJveHkucGFnZUlELCBoZWFkZXJGaWVsZFByb3h5LmluY2x1ZGVTZWN1 cmVDb29raWVzKTsgICAgCiB9CiAKIGJvb2wgQ29va2llSmFyQ3VybERhdGFiYXNlOjpjb29raWVz RW5hYmxlZChjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24pIGNvbnN0CkluZGV4 OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL21hYy9Db29raWVKYXJNYWMubW0KPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvQ29va2llSmFy TWFjLm1tCShyZXZpc2lvbiAyMzA4OTcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3 b3JrL21hYy9Db29raWVKYXJNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTI1NCw3ICsyNTQsNyBA QCBzdGQ6OnBhaXI8U3RyaW5nLCBib29sPiBjb29raWVSZXF1ZXN0SGVhCiAKIHN0ZDo6cGFpcjxT dHJpbmcsIGJvb2w+IGNvb2tpZVJlcXVlc3RIZWFkZXJGaWVsZFZhbHVlKGNvbnN0IE5ldHdvcmtT dG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgQ29va2llUmVxdWVzdEhlYWRlckZpZWxkUHJv eHkmIGhlYWRlckZpZWxkUHJveHkpCiB7Ci0gICAgcmV0dXJuIGNvb2tpZXNGb3JTZXNzaW9uKHNl c3Npb24sIGhlYWRlckZpZWxkUHJveHkubV9maXJzdFBhcnR5LCBoZWFkZXJGaWVsZFByb3h5Lm1f dXJsLCBoZWFkZXJGaWVsZFByb3h5Lm1fZnJhbWVJRCwgaGVhZGVyRmllbGRQcm94eS5tX3BhZ2VJ RCwgSW5jbHVkZUhUVFBPbmx5LCBoZWFkZXJGaWVsZFByb3h5Lm1faW5jbHVkZVNlY3VyZUNvb2tp ZXMpOworICAgIHJldHVybiBjb29raWVzRm9yU2Vzc2lvbihzZXNzaW9uLCBoZWFkZXJGaWVsZFBy b3h5LmZpcnN0UGFydHksIGhlYWRlckZpZWxkUHJveHkudXJsLCBoZWFkZXJGaWVsZFByb3h5LmZy YW1lSUQsIGhlYWRlckZpZWxkUHJveHkucGFnZUlELCBJbmNsdWRlSFRUUE9ubHksIGhlYWRlckZp ZWxkUHJveHkuaW5jbHVkZVNlY3VyZUNvb2tpZXMpOwogfQogCiB2b2lkIHNldENvb2tpZXNGcm9t RE9NKGNvbnN0IE5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgc2Vzc2lvbiwgY29uc3QgVVJMJiBmaXJz dFBhcnR5LCBjb25zdCBVUkwmIHVybCwgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gZnJhbWVJRCwg c3RkOjpvcHRpb25hbDx1aW50NjRfdD4gcGFnZUlELCBjb25zdCBTdHJpbmcmIGNvb2tpZVN0cikK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvc291cC9Db29raWVKYXJTb3Vw LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL3NvdXAv Q29va2llSmFyU291cC5jcHAJKHJldmlzaW9uIDIzMDg5NykKKysrIFNvdXJjZS9XZWJDb3JlL3Bs YXRmb3JtL25ldHdvcmsvc291cC9Db29raWVKYXJTb3VwLmNwcAkod29ya2luZyBjb3B5KQpAQCAt MTM2LDcgKzEzNiw3IEBAIHN0ZDo6cGFpcjxTdHJpbmcsIGJvb2w+IGNvb2tpZVJlcXVlc3RIZWEK IAogc3RkOjpwYWlyPFN0cmluZywgYm9vbD4gY29va2llUmVxdWVzdEhlYWRlckZpZWxkVmFsdWUo Y29uc3QgTmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBzZXNzaW9uLCBjb25zdCBDb29raWVSZXF1ZXN0 SGVhZGVyRmllbGRQcm94eSYgaGVhZGVyRmllbGRQcm94eSkKIHsKLSAgICByZXR1cm4gY29va2ll UmVxdWVzdEhlYWRlckZpZWxkVmFsdWUoc2Vzc2lvbiwgaGVhZGVyRmllbGRQcm94eS5tX2ZpcnN0 UGFydHksIGhlYWRlckZpZWxkUHJveHkubV91cmwsIGhlYWRlckZpZWxkUHJveHkubV9mcmFtZUlE LCBoZWFkZXJGaWVsZFByb3h5Lm1fcGFnZUlELCBoZWFkZXJGaWVsZFByb3h5Lm1faW5jbHVkZVNl Y3VyZUNvb2tpZXMpOworICAgIHJldHVybiBjb29raWVSZXF1ZXN0SGVhZGVyRmllbGRWYWx1ZShz ZXNzaW9uLCBoZWFkZXJGaWVsZFByb3h5LmZpcnN0UGFydHksIGhlYWRlckZpZWxkUHJveHkudXJs LCBoZWFkZXJGaWVsZFByb3h5LmZyYW1lSUQsIGhlYWRlckZpZWxkUHJveHkucGFnZUlELCBoZWFk ZXJGaWVsZFByb3h5LmluY2x1ZGVTZWN1cmVDb29raWVzKTsKIH0KIAogYm9vbCBjb29raWVzRW5h YmxlZChjb25zdCBOZXR3b3JrU3RvcmFnZVNlc3Npb24mIHNlc3Npb24pCg==