176963 2017-09-14 15:50:46 -0700 [Curl] Move error generation task into ResourceError 2017-09-27 12:27:37 -0700 1 1 1 Unclassified WebKit WebCore Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 basuke basuke achristensen basuke bfulgham commit-queue don.olmstead webkit-bug-importer oldest_to_newest 1349059 0 basuke 2017-09-14 15:50:46 -0700 ResourceError generation code is spread for several places. Move them and pack into ResourceError. 1350111 1 321138 basuke 2017-09-18 15:10:41 -0700 Created attachment 321138 PATCH 1350137 2 321138 commit-queue 2017-09-18 16:02:27 -0700 Comment on attachment 321138 PATCH Clearing flags on attachment: 321138 Committed r222187: <http://trac.webkit.org/changeset/222187> 1350138 3 commit-queue 2017-09-18 16:02:28 -0700 All reviewed patches have been landed. Closing bug. 1353400 4 webkit-bug-importer 2017-09-27 12:27:37 -0700 <rdar://problem/34693319> 321138 2017-09-18 15:10:41 -0700 2017-09-18 16:02:27 -0700 PATCH 176963-1.diff text/plain 11628 basuke ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1MjhkYmUwYzZiOC4uNzllY2ViOGFiOTkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwzMCBAQAorMjAxNy0wOS0xOCAgQmFzdWtlIFN1enVraSAgPEJhc3VrZS5TdXp1a2lAc29u eS5jb20+CisKKyAgICAgICAgW0N1cmxdIE1vdmUgZXJyb3IgZ2VuZXJhdGlvbiB0YXNrIGludG8g UmVzb3VyY2VFcnJvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTc2OTYzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgKiBwbGF0Zm9ybS9DdXJsLmNtYWtlOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsv Y3VybC9DdXJsQ29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpDdXJsSGFuZGxlOjplcnJv ckRlc2NyaXB0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkN1cmxIYW5kbGU6OmVycm9yRGVzY3Jp cHRpb24gY29uc3QpOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4 dC5oOgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yLmg6Cisg ICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUVycm9yOjpzZXRTc2xFcnJvcnMpOgorICAgICAgICAo V2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6aGFzU1NMQ29ubmVjdEVycm9yIGNvbnN0KTogRGVsZXRl ZC4KKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6OmRvUGxhdGZvcm1Jc29sYXRlZENv cHkpOiBEZWxldGVkLgorICAgICAgICAqIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVy cm9yQ3VybC5jcHA6IEFkZGVkLgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VFcnJvcjo6aHR0 cEVycm9yKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6OnNzbEVycm9yKToKKyAg ICAgICAgKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6Omhhc1NTTENvbm5lY3RFcnJvciBjb25zdCk6 CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUVycm9yOjpkb1BsYXRmb3JtSXNvbGF0ZWRDb3B5 KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlRXJyb3I6OnBsYXRmb3JtQ29tcGFyZSk6Cisg ICAgICAgICogcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRl LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpub3Rp ZnlGYWlsKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpk aWRGYWlsKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVD dXJsRGVsZWdhdGUuaDoKKwogMjAxNy0wOS0xNyAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2Fy Y2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgUkVHUkVTU0lPTihyMjIxOTc0KTogW0hhcmZidXp6 XSBUZXN0IGZhc3QvdGV4dC9pbnRlcm5hdGlvbmFsL2hlYnJldy1zZWxlY3Rpb24uaHRtbCBpcyBm YWlsaW5nIHNpbmNlIHIyMjE5NzQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L0N1cmwuY21ha2UgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9DdXJsLmNtYWtlCmluZGV4IGYy ZjYzMDhlZjdiLi4wNzk1YTUxYmZhOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vQ3VybC5jbWFrZQorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9DdXJsLmNtYWtlCkBA IC0xNiw2ICsxNiw3IEBAIGxpc3QoQVBQRU5EIFdlYkNvcmVfU09VUkNFUwogICAgIHBsYXRmb3Jt L25ldHdvcmsvY3VybC9Gb3JtRGF0YVN0cmVhbUN1cmwuY3BwCiAgICAgcGxhdGZvcm0vbmV0d29y ay9jdXJsL011bHRpcGFydEhhbmRsZS5jcHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUHJv eHlTZXJ2ZXJDdXJsLmNwcAorICAgIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9y Q3VybC5jcHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsLmNw cAogICAgIHBsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5j cHAKICAgICBwbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VSZXNwb25zZUN1cmwuY3BwCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRl eHQuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0 LmNwcAppbmRleCAwZjVkNDhkNzZkYi4uODllNDIzMDIzNjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9DdXJsQ29udGV4dC5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmNwcApAQCAtNzcsOCAr NzcsNiBAQCBzdGF0aWMgQ1N0cmluZyBjb29raWVKYXJQYXRoKCkKIAogLy8gQ3VybENvbnRleHQg LS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0tLS0t LS0tLS0tLS0tLQogCi1jb25zdCBjaGFyKiBjb25zdCBDdXJsQ29udGV4dDo6ZXJyb3JEb21haW4g PSAiQ3VybEVycm9yRG9tYWluIjsKLQogQ3VybENvbnRleHQ6OkN1cmxDb250ZXh0KCkKIDogbV9j b29raWVKYXJGaWxlTmFtZSB7IGNvb2tpZUphclBhdGgoKSB9CiAsIG1fY29va2llSmFyIHsgc3Rk OjptYWtlX3VuaXF1ZTxDb29raWVKYXJDdXJsRmlsZVN5c3RlbT4oKSB9CkBAIC0yNjUsOSArMjYz LDE0IEBAIEN1cmxIYW5kbGU6On5DdXJsSGFuZGxlKCkKICAgICBjdXJsX2Vhc3lfY2xlYW51cCht X2hhbmRsZSk7CiB9CiAKK2NvbnN0IFN0cmluZyBDdXJsSGFuZGxlOjplcnJvckRlc2NyaXB0aW9u KENVUkxjb2RlIGVycm9yQ29kZSkKK3sKKyAgICByZXR1cm4gU3RyaW5nKGN1cmxfZWFzeV9zdHJl cnJvcihlcnJvckNvZGUpKTsKK30KKwogY29uc3QgU3RyaW5nIEN1cmxIYW5kbGU6OmVycm9yRGVz Y3JpcHRpb24oKSBjb25zdAogewotICAgIHJldHVybiBTdHJpbmcoY3VybF9lYXN5X3N0cmVycm9y KG1fZXJyb3JDb2RlKSk7CisgICAgcmV0dXJuIGVycm9yRGVzY3JpcHRpb24obV9lcnJvckNvZGUp OwogfQogCiB2b2lkIEN1cmxIYW5kbGU6OmluaXRpYWxpemUoKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL0N1cmxDb250ZXh0LmggYi9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvQ3VybENvbnRleHQuaAppbmRleCAxNGU5OGEwMWIx NS4uNGRkY2ZiMTJkZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY3VybC9DdXJsQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdv cmsvY3VybC9DdXJsQ29udGV4dC5oCkBAIC0xMDQsOCArMTA0LDYgQEAgcHVibGljOgogICAgICAg ICBjb25zdCBTdHJpbmcgdXJsKCkgY29uc3Q7CiAgICAgfTsKIAotICAgIHN0YXRpYyBjb25zdCBj aGFyKiBjb25zdCBlcnJvckRvbWFpbjsKLQogICAgIHN0YXRpYyBDdXJsQ29udGV4dCYgc2luZ2xl dG9uKCkKICAgICB7CiAgICAgICAgIHN0YXRpYyBDdXJsQ29udGV4dCBzaGFyZWQ7CkBAIC0yMjks NiArMjI3LDcgQEAgcHVibGljOgogICAgIENVUkxjb2RlIGVycm9yQ29kZSgpIGNvbnN0IHsgcmV0 dXJuIG1fZXJyb3JDb2RlOyB9CiAgICAgdm9pZCBzZXRFcnJvckNvZGUoQ1VSTGNvZGUgZXJyb3JD b2RlKSB7IG1fZXJyb3JDb2RlID0gZXJyb3JDb2RlOyB9CiAKKyAgICBzdGF0aWMgY29uc3QgU3Ry aW5nIGVycm9yRGVzY3JpcHRpb24oQ1VSTGNvZGUpOwogICAgIGNvbnN0IFN0cmluZyBlcnJvckRl c2NyaXB0aW9uKCkgY29uc3Q7CiAKICAgICB2b2lkIGVuYWJsZVNoYXJlSGFuZGxlKCk7CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VFcnJv ci5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3Iu aAppbmRleCBiYmU5NTZmZmVkYS4uNjRjMTMwOTUwZjUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yLmgKKysrIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3IuaApAQCAtMSw1ICsxLDYg QEAKIC8qCiAgKiBDb3B5cmlnaHQgKEMpIDIwMDYgQXBwbGUgSW5jLiAgQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyAqIENvcHlyaWdodCAoQykgMjAxNyBTb255IEludGVyYWN0aXZlIEVudGVydGFpbm1l bnQgSW5jLgogICoKICAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC0yNSwxMyArMjYsMTMg QEAKIAogI3ByYWdtYSBvbmNlCiAKLSNpbmNsdWRlICJDdXJsQ29udGV4dC5oIgogI2luY2x1ZGUg IlJlc291cmNlRXJyb3JCYXNlLmgiCiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogY2xhc3MgUmVz b3VyY2VFcnJvciA6IHB1YmxpYyBSZXNvdXJjZUVycm9yQmFzZSB7CiAgICAgZnJpZW5kIGNsYXNz IFJlc291cmNlRXJyb3JCYXNlOworCiBwdWJsaWM6CiAgICAgUmVzb3VyY2VFcnJvcihUeXBlIHR5 cGUgPSBUeXBlOjpOdWxsKQogICAgICAgICA6IFJlc291cmNlRXJyb3JCYXNlKHR5cGUpCkBAIC00 MywxNyArNDQsMTkgQEAgcHVibGljOgogICAgIHsKICAgICB9CiAKLSAgICBSZXNvdXJjZUVycm9y KGNvbnN0IFN0cmluZyYgZG9tYWluLCBpbnQgZXJyb3JDb2RlLCBjb25zdCBVUkwmIGZhaWxpbmdV UkwsIGNvbnN0IFN0cmluZyYgbG9jYWxpemVkRGVzY3JpcHRpb24sIHVuc2lnbmVkIHNzbEVycm9y cywgVHlwZSB0eXBlID0gVHlwZTo6R2VuZXJhbCkKLSAgICAgICAgOiBSZXNvdXJjZUVycm9yQmFz ZShkb21haW4sIGVycm9yQ29kZSwgZmFpbGluZ1VSTCwgbG9jYWxpemVkRGVzY3JpcHRpb24sIHR5 cGUpCi0gICAgICAgICwgbV9zc2xFcnJvcnMoc3NsRXJyb3JzKQotICAgIHsKLSAgICB9CisgICAg c3RhdGljIFJlc291cmNlRXJyb3IgaHR0cEVycm9yKGludCBlcnJvckNvZGUsIGNvbnN0IFVSTCYg ZmFpbGluZ1VSTCk7CisgICAgc3RhdGljIFJlc291cmNlRXJyb3Igc3NsRXJyb3IoaW50IGVycm9y Q29kZSwgdW5zaWduZWQgc3NsRXJyb3JzLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwpOwogCiAgICAg dW5zaWduZWQgc3NsRXJyb3JzKCkgY29uc3QgeyByZXR1cm4gbV9zc2xFcnJvcnM7IH0KLSAgICBi b29sIGhhc1NTTENvbm5lY3RFcnJvcigpIGNvbnN0IHsgcmV0dXJuIGVycm9yQ29kZSgpID09IENV UkxFX1NTTF9DT05ORUNUX0VSUk9SOyB9CisgICAgdm9pZCBzZXRTc2xFcnJvcnModW5zaWduZWQg c3NsRXJyb3JzKSB7IG1fc3NsRXJyb3JzID0gc3NsRXJyb3JzOyB9CisgICAgYm9vbCBoYXNTU0xD b25uZWN0RXJyb3IoKSBjb25zdDsKKworICAgIHN0YXRpYyBib29sIHBsYXRmb3JtQ29tcGFyZShj b25zdCBSZXNvdXJjZUVycm9yJiBhLCBjb25zdCBSZXNvdXJjZUVycm9yJiBiKTsKIAogcHJpdmF0 ZToKLSAgICB2b2lkIGRvUGxhdGZvcm1Jc29sYXRlZENvcHkoY29uc3QgUmVzb3VyY2VFcnJvciYp IHsgfQorICAgIHZvaWQgZG9QbGF0Zm9ybUlzb2xhdGVkQ29weShjb25zdCBSZXNvdXJjZUVycm9y Jik7CisKKyAgICBzdGF0aWMgY29uc3QgY2hhciogY29uc3QgY3VybEVycm9yRG9tYWluOwogCiAg ICAgdW5zaWduZWQgbV9zc2xFcnJvcnMgeyAwIH07CiB9OwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlRXJyb3JDdXJsLmNwcCBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUVycm9yQ3VybC5jcHAKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAuLmU3MDA1N2QzNzY1Ci0tLSAvZGV2 L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNl RXJyb3JDdXJsLmNwcApAQCAtMCwwICsxLDY2IEBACisvKgorICogQ29weXJpZ2h0IChDKSAyMDE3 IFNvbnkgSW50ZXJhY3RpdmUgRW50ZXJ0YWlubWVudCBJbmMuCisgKgorICogUmVkaXN0cmlidXRp b24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0Cisg KiBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5n IGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNl IGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlz IGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4g UmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90 aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKiAKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9S UyBgYEFTIElTJycKKyAqIEFORCBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogVEhFIElNUExJRUQgV0FSUkFOVElFUyBP RiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9T RSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZFTlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09O VFJJQlVUT1JTCisgKiBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVO VEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SCisgKiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElO Q0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRgorICogU1VCU1RJVFVU RSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJV U0lORVNTCisgKiBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZ IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgorICogQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFks IE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkKKyAqIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YKKyAqIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVk ZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiUmVzb3VyY2VFcnJvci5oIgorCisjaWYgVVNFKENVUkwp CisKKyNpbmNsdWRlICJDdXJsQ29udGV4dC5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CisKK2Nv bnN0IGNoYXIqIGNvbnN0IFJlc291cmNlRXJyb3I6OmN1cmxFcnJvckRvbWFpbiA9ICJDdXJsRXJy b3JEb21haW4iOworCitSZXNvdXJjZUVycm9yIFJlc291cmNlRXJyb3I6Omh0dHBFcnJvcihpbnQg ZXJyb3JDb2RlLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwpCit7CisgICAgcmV0dXJuIFJlc291cmNl RXJyb3IoY3VybEVycm9yRG9tYWluLCBlcnJvckNvZGUsIGZhaWxpbmdVUkwsIEN1cmxIYW5kbGU6 OmVycm9yRGVzY3JpcHRpb24oc3RhdGljX2Nhc3Q8Q1VSTGNvZGU+KGVycm9yQ29kZSkpKTsKK30K KworUmVzb3VyY2VFcnJvciBSZXNvdXJjZUVycm9yOjpzc2xFcnJvcihpbnQgZXJyb3JDb2RlLCB1 bnNpZ25lZCBzc2xFcnJvcnMsIGNvbnN0IFVSTCYgZmFpbGluZ1VSTCkKK3sKKyAgICBSZXNvdXJj ZUVycm9yIHJlc291cmNlRXJyb3IgPSBSZXNvdXJjZUVycm9yOjpodHRwRXJyb3IoZXJyb3JDb2Rl LCBmYWlsaW5nVVJMKTsKKyAgICByZXNvdXJjZUVycm9yLnNldFNzbEVycm9ycyhzc2xFcnJvcnMp OworICAgIHJldHVybiByZXNvdXJjZUVycm9yOworfQorCitib29sIFJlc291cmNlRXJyb3I6Omhh c1NTTENvbm5lY3RFcnJvcigpIGNvbnN0Cit7CisgICAgcmV0dXJuIGVycm9yQ29kZSgpID09IENV UkxFX1NTTF9DT05ORUNUX0VSUk9SOworfQorCit2b2lkIFJlc291cmNlRXJyb3I6OmRvUGxhdGZv cm1Jc29sYXRlZENvcHkoY29uc3QgUmVzb3VyY2VFcnJvciYgb3RoZXIpCit7CisgICAgbV9zc2xF cnJvcnMgPSBvdGhlci5tX3NzbEVycm9yczsKK30KKworYm9vbCBSZXNvdXJjZUVycm9yOjpwbGF0 Zm9ybUNvbXBhcmUoY29uc3QgUmVzb3VyY2VFcnJvciYgYSwgY29uc3QgUmVzb3VyY2VFcnJvciYg YikKK3sKKyAgICByZXR1cm4gYS5zc2xFcnJvcnMoKSA9PSBiLnNzbEVycm9ycygpOworfQorCit9 IC8vIG5hbWVzcGFjZSBXZWJDb3JlCisKKyNlbmRpZgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlLmNwcCBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNvdXJjZUhhbmRsZUN1cmxE ZWxlZ2F0ZS5jcHAKaW5kZXggM2QyODYxNmRhYmMuLmY1MDZlZGVjYjBhIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsRGVs ZWdhdGUuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNv dXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5jcHAKQEAgLTI4NCwxOSArMjg0LDE3IEBAIHZvaWQgUmVz b3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZpbmlzaCgpCiAKIHZvaWQgUmVzb3VyY2VI YW5kbGVDdXJsRGVsZWdhdGU6Om5vdGlmeUZhaWwoKQogewotICAgIFN0cmluZyBkb21haW4gPSBD dXJsQ29udGV4dDo6ZXJyb3JEb21haW47Ci0gICAgaW50IGVycm9yQ29kZSA9IG1fY3VybEhhbmRs ZS5lcnJvckNvZGUoKTsKLSAgICBVUkwgZmFpbGluZ1VSTCA9IG1fY3VybEhhbmRsZS5nZXRFZmZl Y3RpdmVVUkwoKTsKLSAgICBTdHJpbmcgZXJyb3JEZXNjcmlwdGlvbiA9IG1fY3VybEhhbmRsZS5l cnJvckRlc2NyaXB0aW9uKCk7Ci0gICAgdW5zaWduZWQgc3NsRXJyb3JzID0gbV9zc2xWZXJpZmll ci5zc2xFcnJvcnMoKTsKKyAgICBSZXNvdXJjZUVycm9yIHJlc291cmNlRXJyb3IgPSBSZXNvdXJj ZUVycm9yOjpodHRwRXJyb3IobV9jdXJsSGFuZGxlLmVycm9yQ29kZSgpLCBtX2ZpcnN0UmVxdWVz dC51cmwoKSk7CisgICAgaWYgKG1fc3NsVmVyaWZpZXIuc3NsRXJyb3JzKCkpCisgICAgICAgIHJl c291cmNlRXJyb3Iuc2V0U3NsRXJyb3JzKG1fc3NsVmVyaWZpZXIuc3NsRXJyb3JzKCkpOwogCiAg ICAgaWYgKGlzTWFpblRocmVhZCgpKQotICAgICAgICBkaWRGYWlsKGRvbWFpbiwgZXJyb3JDb2Rl LCBmYWlsaW5nVVJMLCBlcnJvckRlc2NyaXB0aW9uLCBzc2xFcnJvcnMpOworICAgICAgICBkaWRG YWlsKHJlc291cmNlRXJyb3IpOwogICAgIGVsc2UgewotICAgICAgICBjYWxsT25NYWluVGhyZWFk KFtwcm90ZWN0ZWRUaGlzID0gbWFrZVJlZigqdGhpcyksIGRvbWFpbiA9IGRvbWFpbi5pc29sYXRl ZENvcHkoKSwgZXJyb3JDb2RlLCBmYWlsaW5nVVJMID0gZmFpbGluZ1VSTC5pc29sYXRlZENvcHko KSwgZXJyb3JEZXNjcmlwdGlvbiA9IGVycm9yRGVzY3JpcHRpb24uaXNvbGF0ZWRDb3B5KCksIHNz bEVycm9yc10geworICAgICAgICBjYWxsT25NYWluVGhyZWFkKFtwcm90ZWN0ZWRUaGlzID0gbWFr ZVJlZigqdGhpcyksIGVycm9yID0gcmVzb3VyY2VFcnJvci5pc29sYXRlZENvcHkoKV0gewogICAg ICAgICAgICAgaWYgKCFwcm90ZWN0ZWRUaGlzLT5tX2hhbmRsZSkKICAgICAgICAgICAgICAgICBy ZXR1cm47Ci0gICAgICAgICAgICBwcm90ZWN0ZWRUaGlzLT5kaWRGYWlsKGRvbWFpbiwgZXJyb3JD b2RlLCBmYWlsaW5nVVJMLCBlcnJvckRlc2NyaXB0aW9uLCBzc2xFcnJvcnMpOworICAgICAgICAg ICAgcHJvdGVjdGVkVGhpcy0+ZGlkRmFpbChlcnJvcik7CiAgICAgICAgIH0pOwogICAgIH0KIH0K QEAgLTUyNSwxNCArNTIzLDE0IEBAIHZvaWQgUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRp ZEZpbmlzaChOZXR3b3JrTG9hZE1ldHJpY3MgbmV0d29ya0xvYWRNZXRyaWNzCiAgICAgfQogfQog Ci12b2lkIFJlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlOjpkaWRGYWlsKGNvbnN0IFN0cmluZyYg ZG9tYWluLCBpbnQgZXJyb3JDb2RlLCBjb25zdCBVUkwmIGZhaWxpbmdVUkwsIGNvbnN0IFN0cmlu ZyYgbG9jYWxpemVkRGVzY3JpcHRpb24sIHVuc2lnbmVkIHNzbEVycm9ycykKK3ZvaWQgUmVzb3Vy Y2VIYW5kbGVDdXJsRGVsZWdhdGU6OmRpZEZhaWwoY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3Vy Y2VFcnJvcikKIHsKICAgICBpZiAoIW1faGFuZGxlKQogICAgICAgICByZXR1cm47CiAKICAgICBp ZiAobV9oYW5kbGUtPmNsaWVudCgpKSB7CiAgICAgICAgIEN1cmxDYWNoZU1hbmFnZXI6OmdldElu c3RhbmNlKCkuZGlkRmFpbCgqbV9oYW5kbGUpOwotICAgICAgICBtX2hhbmRsZS0+Y2xpZW50KCkt PmRpZEZhaWwobV9oYW5kbGUsIFJlc291cmNlRXJyb3IoZG9tYWluLCBlcnJvckNvZGUsIGZhaWxp bmdVUkwsIGxvY2FsaXplZERlc2NyaXB0aW9uLCBzc2xFcnJvcnMpKTsKKyAgICAgICAgbV9oYW5k bGUtPmNsaWVudCgpLT5kaWRGYWlsKG1faGFuZGxlLCByZXNvdXJjZUVycm9yKTsKICAgICB9CiB9 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvY3VybC9SZXNv dXJjZUhhbmRsZUN1cmxEZWxlZ2F0ZS5oIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29y ay9jdXJsL1Jlc291cmNlSGFuZGxlQ3VybERlbGVnYXRlLmgKaW5kZXggN2ZlMmUwOTAyMGIuLjA5 OTU4YjE2OTFkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2N1 cmwvUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2N1cmwvUmVzb3VyY2VIYW5kbGVDdXJsRGVsZWdhdGUuaApAQCAtODEsNyAr ODEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgcHJlcGFyZVNlbmREYXRhKGNoYXIqLCBzaXplX3Qg YmxvY2tTaXplLCBzaXplX3QgbnVtYmVyT2ZCbG9ja3MpOwogCiAgICAgdm9pZCBkaWRGaW5pc2go TmV0d29ya0xvYWRNZXRyaWNzKTsKLSAgICB2b2lkIGRpZEZhaWwoY29uc3QgU3RyaW5nJiBkb21h aW4sIGludCBlcnJvckNvZGUsIGNvbnN0IFVSTCYgZmFpbGluZ1VSTCwgY29uc3QgU3RyaW5nJiBs b2NhbGl6ZWREZXNjcmlwdGlvbiwgdW5zaWduZWQgc3NsRXJyb3JzKTsKKyAgICB2b2lkIGRpZEZh aWwoY29uc3QgUmVzb3VyY2VFcnJvciYpOwogCiAgICAgdm9pZCBoYW5kbGVEYXRhVVJMKCk7CiAK