115520 2013-05-02 11:36:44 -0700 [WK2] Non-ASCII downloaded file names are garbled when using NetworkProcess 2013-05-02 12:25:53 -0700 1 1 1 Unclassified WebKit WebKit2 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ap ap beidson oldest_to_newest 883858 0 ap 2013-05-02 11:36:44 -0700 responseContentDispositionEncodingFallbackArray is not sent over IPC. <rdar://problem/13740375> 883862 1 200325 ap 2013-05-02 11:46:54 -0700 Created attachment 200325 proposed fix 883872 2 200325 darin 2013-05-02 11:52:06 -0700 Comment on attachment 200325 proposed fix View in context: https://bugs.webkit.org/attachment.cgi?id=200325&action=review > Source/WebCore/platform/network/ResourceRequestBase.h:114 > + const Vector<String> responseContentDispositionEncodingFallbackArray() const { return m_responseContentDispositionEncodingFallbackArray; } The const here in const Vector<String> is not needed or helpful. Unless maybe you wanted to return const& to avoid copying. > Source/WebKit2/Shared/mac/WebCoreArgumentCodersMac.mm:63 > + encoder << resourceRequest.responseContentDispositionEncodingFallbackArray(); Do we have to bump a version number when we do things like this? 883876 3 ap 2013-05-02 11:59:55 -0700 > Unless maybe you wanted to return const& to avoid copying. Oops, yes. > Do we have to bump a version number when we do things like this? Not here, this serialization is for IPC only, and is not persistent. 883888 4 ap 2013-05-02 12:25:53 -0700 Committed <http://trac.webkit.org/r149491>. 200325 2013-05-02 11:46:54 -0700 2013-05-02 11:52:06 -0700 proposed fix EncodingFallbackArray.txt text/plain 9369 ap SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE0OTQ5MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIzIEBACisyMDEzLTA1LTAyICBBbGV4ZXkg UHJvc2t1cnlha292ICA8YXBAYXBwbGUuY29tPgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8x Mzc0MDM3NT4gTm9uLUFTQ0lJIGRvd25sb2FkZWQgZmlsZSBuYW1lcyBhcmUgZ2FyYmxlZCB3aGVu IHVzaW5nIE5ldHdvcmtQcm9jZXNzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xMTU1MjAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBDb3ZlcmVkIGJ5IGV4aXN0aW5nIHRlc3RzIHdoZW4gdXNpbmcgTmV0d29y a1Byb2Nlc3MuCisKKyAgICAgICAgKiBXZWJDb3JlLmV4cC5pbjoKKyAgICAgICAgKiBwbGF0Zm9y bS9uZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291 cmNlUmVxdWVzdEJhc2U6OnJlc3BvbnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFj a0FycmF5KToKKyAgICAgICAgQWRkZWQgYSBnZXR0ZXIgZm9yIGVuY29kaW5nIGZhbGxiYWNrIGFy cmF5LgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VSZXF1ZXN0TWFj Lm1tOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VSZXF1ZXN0Ojpkb1VwZGF0ZVJlc291cmNl UmVxdWVzdCk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZVJlcXVlc3Q6OmRvVXBkYXRlUGxh dGZvcm1SZXF1ZXN0KToKKyAgICAgICAgUmVtb3ZlZCBvYnNvbGV0ZSBjaGVja3MgZm9yIHByZXNl bmNlIG9mIGZhbGxiYWNrIGFycmF5IG1ldGhvZHMsIHRoZXkgd2VyZSBhdmFpbGFibGUKKyAgICAg ICAgc2luY2UgMTAuNi44LgorCiAyMDEzLTA1LTAxICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBh cHBsZS5jb20+CiAKICAgICAgICAgdGV4dC1jb21iaW5lOiBob3Jpem9udGFsIGRvZXMgbm90IHdv cmsgcHJvcGVybHkgZm9yIHNvbWUgZm9udHMuCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9XZWJDb3Jl LmV4cC5pbgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmV4cC5pbgkocmV2 aXNpb24gMTQ5NDgyKQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS5leHAuaW4JKHdvcmtpbmcg Y29weSkKQEAgLTY0Myw2ICs2NDMsNyBAQCBfX1pON1dlYkNvcmUxOVJlc291cmNlUmVxdWVzdEJh c2UxOWFkZEhUCiBfX1pON1dlYkNvcmUxOVJlc291cmNlUmVxdWVzdEJhc2UyMmRlZmF1bHRUaW1l b3V0SW50ZXJ2YWxFdgogX19aTjdXZWJDb3JlMTlSZXNvdXJjZVJlcXVlc3RCYXNlMjRzX2RlZmF1 bHRUaW1lb3V0SW50ZXJ2YWxFCiBfX1pON1dlYkNvcmUxOVJlc291cmNlUmVxdWVzdEJhc2UyNXNl dERlZmF1bHRUaW1lb3V0SW50ZXJ2YWxFZAorX19aTjdXZWJDb3JlMTlSZXNvdXJjZVJlcXVlc3RC YXNlNTBzZXRSZXNwb25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheUVS S04zV1RGNlN0cmluZ0VTNF9TNF8KIF9fWk43V2ViQ29yZTE5UmVzb3VyY2VSZXF1ZXN0QmFzZTZz ZXRVUkxFUktOU180S1VSTEUKIF9fWk43V2ViQ29yZTE5VGV4dFJlc291cmNlRGVjb2RlcjVmbHVz aEV2CiBfX1pON1dlYkNvcmUxOVRleHRSZXNvdXJjZURlY29kZXI2ZGVjb2RlRVBLY20KSW5kZXg6 IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1ZXN0QmFzZS5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvUmVzb3VyY2VSZXF1 ZXN0QmFzZS5oCShyZXZpc2lvbiAxNDk0ODIpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9u ZXR3b3JrL1Jlc291cmNlUmVxdWVzdEJhc2UuaAkod29ya2luZyBjb3B5KQpAQCAtMTExLDYgKzEx MSw3IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKICAgICAgICAgdm9pZCBzZXRIVFRQQWNjZXB0KGNv bnN0IFN0cmluZyYgaHR0cEFjY2VwdCkgeyBzZXRIVFRQSGVhZGVyRmllbGQoIkFjY2VwdCIsIGh0 dHBBY2NlcHQpOyB9CiAgICAgICAgIHZvaWQgY2xlYXJIVFRQQWNjZXB0KCk7CiAKKyAgICAgICAg Y29uc3QgVmVjdG9yPFN0cmluZz4gcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0Zh bGxiYWNrQXJyYXkoKSBjb25zdCB7IHJldHVybiBtX3Jlc3BvbnNlQ29udGVudERpc3Bvc2l0aW9u RW5jb2RpbmdGYWxsYmFja0FycmF5OyB9CiAgICAgICAgIHZvaWQgc2V0UmVzcG9uc2VDb250ZW50 RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkoY29uc3QgU3RyaW5nJiBlbmNvZGluZzEs IGNvbnN0IFN0cmluZyYgZW5jb2RpbmcyID0gU3RyaW5nKCksIGNvbnN0IFN0cmluZyYgZW5jb2Rp bmczID0gU3RyaW5nKCkpOwogCiAgICAgICAgIEZvcm1EYXRhKiBodHRwQm9keSgpIGNvbnN0OwpJ bmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VSZXF1ZXN0 TWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvbWFj L1Jlc291cmNlUmVxdWVzdE1hYy5tbQkocmV2aXNpb24gMTQ5NDgyKQorKysgU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9tYWMvUmVzb3VyY2VSZXF1ZXN0TWFjLm1tCSh3b3JraW5nIGNv cHkpCkBAIC0xMDAsMTcgKzEwMCwxMyBAQCB2b2lkIFJlc291cmNlUmVxdWVzdDo6ZG9VcGRhdGVS ZXNvdXJjZVJlCiAgICAgd2hpbGUgKChuYW1lID0gW2UgbmV4dE9iamVjdF0pKQogICAgICAgICBt X2h0dHBIZWFkZXJGaWVsZHMuc2V0KG5hbWUsIFtoZWFkZXJzIG9iamVjdEZvcktleTpuYW1lXSk7 CiAKLSAgICAvLyBUaGUgYmVsb3cgY2hlY2sgY2FuIGJlIHJlbW92ZWQgb25jZSB3ZSByZXF1aXJl IGEgdmVyc2lvbiBvZiBGb3VuZGF0aW9uIHdpdGggLVtOU1VSTFJlcXVlc3QgY29udGVudERpc3Bv c2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5XSBtZXRob2QuCi0gICAgc3RhdGljIGJvb2wgc3Vw cG9ydHNDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkgPSBbTlNVUkxSZXF1 ZXN0IGluc3RhbmNlc1Jlc3BvbmRUb1NlbGVjdG9yOkBzZWxlY3Rvcihjb250ZW50RGlzcG9zaXRp b25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkpXTsKLSAgICBpZiAoc3VwcG9ydHNDb250ZW50RGlzcG9z aXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkpIHsKLSAgICAgICAgbV9yZXNwb25zZUNvbnRlbnRE aXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheS5jbGVhcigpOwotICAgICAgICBOU0FycmF5 ICplbmNvZGluZ0ZhbGxiYWNrcyA9IFttX25zUmVxdWVzdC5nZXQoKSBjb250ZW50RGlzcG9zaXRp b25FbmNvZGluZ0ZhbGxiYWNrQXJyYXldOwotICAgICAgICBOU1VJbnRlZ2VyIGNvdW50ID0gW2Vu Y29kaW5nRmFsbGJhY2tzIGNvdW50XTsKLSAgICAgICAgZm9yIChOU1VJbnRlZ2VyIGkgPSAwOyBp IDwgY291bnQ7ICsraSkgewotICAgICAgICAgICAgQ0ZTdHJpbmdFbmNvZGluZyBlbmNvZGluZyA9 IENGU3RyaW5nQ29udmVydE5TU3RyaW5nRW5jb2RpbmdUb0VuY29kaW5nKFsoTlNOdW1iZXIgKilb ZW5jb2RpbmdGYWxsYmFja3Mgb2JqZWN0QXRJbmRleDppXSB1bnNpZ25lZExvbmdWYWx1ZV0pOwot ICAgICAgICAgICAgaWYgKGVuY29kaW5nICE9IGtDRlN0cmluZ0VuY29kaW5nSW52YWxpZElkKQot ICAgICAgICAgICAgICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxi YWNrQXJyYXkuYXBwZW5kKENGU3RyaW5nQ29udmVydEVuY29kaW5nVG9JQU5BQ2hhclNldE5hbWUo ZW5jb2RpbmcpKTsKLSAgICAgICAgfQorICAgIG1fcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25F bmNvZGluZ0ZhbGxiYWNrQXJyYXkuY2xlYXIoKTsKKyAgICBOU0FycmF5ICplbmNvZGluZ0ZhbGxi YWNrcyA9IFttX25zUmVxdWVzdC5nZXQoKSBjb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxi YWNrQXJyYXldOworICAgIE5TVUludGVnZXIgY291bnQgPSBbZW5jb2RpbmdGYWxsYmFja3MgY291 bnRdOworICAgIGZvciAoTlNVSW50ZWdlciBpID0gMDsgaSA8IGNvdW50OyArK2kpIHsKKyAgICAg ICAgQ0ZTdHJpbmdFbmNvZGluZyBlbmNvZGluZyA9IENGU3RyaW5nQ29udmVydE5TU3RyaW5nRW5j b2RpbmdUb0VuY29kaW5nKFsoTlNOdW1iZXIgKilbZW5jb2RpbmdGYWxsYmFja3Mgb2JqZWN0QXRJ bmRleDppXSB1bnNpZ25lZExvbmdWYWx1ZV0pOworICAgICAgICBpZiAoZW5jb2RpbmcgIT0ga0NG U3RyaW5nRW5jb2RpbmdJbnZhbGlkSWQpCisgICAgICAgICAgICBtX3Jlc3BvbnNlQ29udGVudERp c3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5LmFwcGVuZChDRlN0cmluZ0NvbnZlcnRFbmNv ZGluZ1RvSUFOQUNoYXJTZXROYW1lKGVuY29kaW5nKSk7CiAgICAgfQogCiAjaWYgRU5BQkxFKENB Q0hFX1BBUlRJVElPTklORykKQEAgLTE3NywyMCArMTczLDE2IEBAIHZvaWQgUmVzb3VyY2VSZXF1 ZXN0Ojpkb1VwZGF0ZVBsYXRmb3JtUmUKICAgICBmb3IgKEhUVFBIZWFkZXJNYXA6OmNvbnN0X2l0 ZXJhdG9yIGl0ID0gaHR0cEhlYWRlckZpZWxkcygpLmJlZ2luKCk7IGl0ICE9IGVuZDsgKytpdCkK ICAgICAgICAgW25zUmVxdWVzdCBzZXRWYWx1ZTppdC0+dmFsdWUgZm9ySFRUUEhlYWRlckZpZWxk Oml0LT5rZXldOwogCi0gICAgLy8gVGhlIGJlbG93IGNoZWNrIGNhbiBiZSByZW1vdmVkIG9uY2Ug d2UgcmVxdWlyZSBhIHZlcnNpb24gb2YgRm91bmRhdGlvbiB3aXRoIC1bTlNNdXRhYmxlVVJMUmVx dWVzdCBzZXRDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXk6XSBtZXRob2Qu Ci0gICAgc3RhdGljIGJvb2wgc3VwcG9ydHNDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxi YWNrQXJyYXkgPSBbTlNNdXRhYmxlVVJMUmVxdWVzdCBpbnN0YW5jZXNSZXNwb25kVG9TZWxlY3Rv cjpAc2VsZWN0b3Ioc2V0Q29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5Oild OwotICAgIGlmIChzdXBwb3J0c0NvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJh eSkgewotICAgICAgICBOU011dGFibGVBcnJheSAqZW5jb2RpbmdGYWxsYmFja3MgPSBbTlNNdXRh YmxlQXJyYXkgYXJyYXldOwotICAgICAgICB1bnNpZ25lZCBjb3VudCA9IG1fcmVzcG9uc2VDb250 ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkuc2l6ZSgpOwotICAgICAgICBmb3Ig KHVuc2lnbmVkIGkgPSAwOyBpICE9IGNvdW50OyArK2kpIHsKLSAgICAgICAgICAgIFJldGFpblB0 cjxDRlN0cmluZ1JlZj4gZW5jb2RpbmdOYW1lID0gbV9yZXNwb25zZUNvbnRlbnREaXNwb3NpdGlv bkVuY29kaW5nRmFsbGJhY2tBcnJheVtpXS5jcmVhdGVDRlN0cmluZygpOwotICAgICAgICAgICAg dW5zaWduZWQgbG9uZyBuc0VuY29kaW5nID0gQ0ZTdHJpbmdDb252ZXJ0RW5jb2RpbmdUb05TU3Ry aW5nRW5jb2RpbmcoQ0ZTdHJpbmdDb252ZXJ0SUFOQUNoYXJTZXROYW1lVG9FbmNvZGluZyhlbmNv ZGluZ05hbWUuZ2V0KCkpKTsKKyAgICBOU011dGFibGVBcnJheSAqZW5jb2RpbmdGYWxsYmFja3Mg PSBbTlNNdXRhYmxlQXJyYXkgYXJyYXldOworICAgIHVuc2lnbmVkIGNvdW50ID0gbV9yZXNwb25z ZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheS5zaXplKCk7CisgICAgZm9y ICh1bnNpZ25lZCBpID0gMDsgaSAhPSBjb3VudDsgKytpKSB7CisgICAgICAgIFJldGFpblB0cjxD RlN0cmluZ1JlZj4gZW5jb2RpbmdOYW1lID0gbV9yZXNwb25zZUNvbnRlbnREaXNwb3NpdGlvbkVu Y29kaW5nRmFsbGJhY2tBcnJheVtpXS5jcmVhdGVDRlN0cmluZygpOworICAgICAgICB1bnNpZ25l ZCBsb25nIG5zRW5jb2RpbmcgPSBDRlN0cmluZ0NvbnZlcnRFbmNvZGluZ1RvTlNTdHJpbmdFbmNv ZGluZyhDRlN0cmluZ0NvbnZlcnRJQU5BQ2hhclNldE5hbWVUb0VuY29kaW5nKGVuY29kaW5nTmFt ZS5nZXQoKSkpOwogCi0gICAgICAgICAgICBpZiAobnNFbmNvZGluZyAhPSBrQ0ZTdHJpbmdFbmNv ZGluZ0ludmFsaWRJZCkKLSAgICAgICAgICAgICAgICBbZW5jb2RpbmdGYWxsYmFja3MgYWRkT2Jq ZWN0OltOU051bWJlciBudW1iZXJXaXRoVW5zaWduZWRMb25nOm5zRW5jb2RpbmddXTsKLSAgICAg ICAgfQotICAgICAgICBbbnNSZXF1ZXN0IHNldENvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFs bGJhY2tBcnJheTplbmNvZGluZ0ZhbGxiYWNrc107CisgICAgICAgIGlmIChuc0VuY29kaW5nICE9 IGtDRlN0cmluZ0VuY29kaW5nSW52YWxpZElkKQorICAgICAgICAgICAgW2VuY29kaW5nRmFsbGJh Y2tzIGFkZE9iamVjdDpbTlNOdW1iZXIgbnVtYmVyV2l0aFVuc2lnbmVkTG9uZzpuc0VuY29kaW5n XV07CiAgICAgfQorICAgIFtuc1JlcXVlc3Qgc2V0Q29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdG YWxsYmFja0FycmF5OmVuY29kaW5nRmFsbGJhY2tzXTsKIAogI2lmIEVOQUJMRShDQUNIRV9QQVJU SVRJT05JTkcpCiAgICAgU3RyaW5nIHBhcnRpdGlvbiA9IGNhY2hlUGFydGl0aW9uKCk7CkluZGV4 OiBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nCShyZXZpc2lvbiAxNDk0OTApCisrKyBTb3VyY2UvV2ViS2l0Mi9DaGFuZ2VMb2cJ KHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNSBAQAorMjAxMy0wNS0wMiAgQWxleGV5IFByb3Nr dXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KKworICAgICAgICA8cmRhcjovL3Byb2JsZW0vMTM3NDAz NzU+IE5vbi1BU0NJSSBkb3dubG9hZGVkIGZpbGUgbmFtZXMgYXJlIGdhcmJsZWQgd2hlbiB1c2lu ZyBOZXR3b3JrUHJvY2VzcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9MTE1NTIwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgKiBTaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVudENvZGVyc01hYy5tbToKKyAgICAg ICAgKENvcmVJUEM6Ojo6ZW5jb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgKENvcmVJUEM6Ojo6 ZGVjb2RlUGxhdGZvcm1EYXRhKToKKyAgICAgICAgU2VuZCB0aGUgYXJyYXkgb3ZlciBJUEMsIHNv IHRoYXQgaXQncyBwcmVzZW50IHdoZW4gTmV0d29ya1Byb2Nlc3MgZG9lcyBpdHMgbG9hZGluZy4K KwogMjAxMy0wNS0wMSAgQWxleGV5IFByb3NrdXJ5YWtvdiAgPGFwQGFwcGxlLmNvbT4KIAogICAg ICAgICBSRUdSRVNTSU9OIChyMTQ5NDIyKTogLVtXS0Jyb3dzaW5nQ29udGV4dENvbnRyb2xsZXIg bG9hZEZpbGVVUkw6cmVzdHJpY3RUb0ZpbGVzV2l0aGluOl0KSW5kZXg6IFNvdXJjZS9XZWJLaXQy L1NoYXJlZC9tYWMvV2ViQ29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQyL1NoYXJlZC9tYWMvV2ViQ29yZUFyZ3VtZW50Q29kZXJzTWFjLm1tCShyZXZp c2lvbiAxNDk0ODIpCisrKyBTb3VyY2UvV2ViS2l0Mi9TaGFyZWQvbWFjL1dlYkNvcmVBcmd1bWVu dENvZGVyc01hYy5tbQkod29ya2luZyBjb3B5KQpAQCAtNTgsNiArNTgsOSBAQCB2b2lkIEFyZ3Vt ZW50Q29kZXI8UmVzb3VyY2VSZXF1ZXN0Pjo6ZW5jCiAKICAgICBSZXRhaW5QdHI8Q0ZEaWN0aW9u YXJ5UmVmPiBkaWN0aW9uYXJ5ID0gYWRvcHRDRihXS05TVVJMUmVxdWVzdENyZWF0ZVNlcmlhbGl6 YWJsZVJlcHJlc2VudGF0aW9uKHJlcXVlc3RUb1NlcmlhbGl6ZS5nZXQoKSwgQ29yZUlQQzo6dG9r ZW5OdWxsVHlwZVJlZigpKSk7CiAgICAgQ29yZUlQQzo6ZW5jb2RlKGVuY29kZXIsIGRpY3Rpb25h cnkuZ2V0KCkpOworCisgICAgLy8gVGhlIGZhbGxiYWNrIGFycmF5IGlzIHBhcnQgb2YgTlNVUkxS ZXF1ZXN0LCBidXQgaXQgaXMgbm90IGVuY29kZWQgYnkgV0tOU1VSTFJlcXVlc3RDcmVhdGVTZXJp YWxpemFibGVSZXByZXNlbnRhdGlvbi4KKyAgICBlbmNvZGVyIDw8IHJlc291cmNlUmVxdWVzdC5y ZXNwb25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheSgpOwogfQogCiBi b29sIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VSZXF1ZXN0Pjo6ZGVjb2RlUGxhdGZvcm1EYXRhKEFy Z3VtZW50RGVjb2RlciYgZGVjb2RlciwgUmVzb3VyY2VSZXF1ZXN0JiByZXNvdXJjZVJlcXVlc3Qp CkBAIC04MCw2ICs4MywxNyBAQCBib29sIEFyZ3VtZW50Q29kZXI8UmVzb3VyY2VSZXF1ZXN0Pjo6 ZGVjCiAgICAgICAgIHJldHVybiBmYWxzZTsKIAogICAgIHJlc291cmNlUmVxdWVzdCA9IFJlc291 cmNlUmVxdWVzdChuc1VSTFJlcXVlc3QpOworICAgIAorICAgIFZlY3RvcjxTdHJpbmc+IHJlc3Bv bnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5OworICAgIGlmICghZGVj b2Rlci5kZWNvZGUocmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJy YXkpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXNvdXJjZVJlcXVlc3Quc2V0UmVz cG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkoCisgICAgICAgIHJl c3BvbnNlQ29udGVudERpc3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5LnNpemUoKSA+IDAg PyByZXNwb25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJhY2tBcnJheVswXSA6IFN0 cmluZygpLAorICAgICAgICByZXNwb25zZUNvbnRlbnREaXNwb3NpdGlvbkVuY29kaW5nRmFsbGJh Y2tBcnJheS5zaXplKCkgPiAxID8gcmVzcG9uc2VDb250ZW50RGlzcG9zaXRpb25FbmNvZGluZ0Zh bGxiYWNrQXJyYXlbMV0gOiBTdHJpbmcoKSwKKyAgICAgICAgcmVzcG9uc2VDb250ZW50RGlzcG9z aXRpb25FbmNvZGluZ0ZhbGxiYWNrQXJyYXkuc2l6ZSgpID4gMiA/IHJlc3BvbnNlQ29udGVudERp c3Bvc2l0aW9uRW5jb2RpbmdGYWxsYmFja0FycmF5WzJdIDogU3RyaW5nKCkKKyAgICApOworCiAg ICAgcmV0dXJuIHRydWU7CiB9CiAK