202327 2019-09-27 12:52:36 -0700 Move shouldUseTestingNetworkSession from NetworkProcessCreationParameters to NetworkSessionCreationParameters 2019-09-27 13:58:19 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen thorton webkit-bug-importer oldest_to_newest 1574933 0 achristensen 2019-09-27 12:52:36 -0700 Move shouldUseTestingNetworkSession from NetworkProcessCreationParameters to NetworkSessionCreationParameters 1574935 1 379756 achristensen 2019-09-27 12:53:46 -0700 Created attachment 379756 Patch 1574961 2 achristensen 2019-09-27 13:57:38 -0700 http://trac.webkit.org/r250458 1574962 3 webkit-bug-importer 2019-09-27 13:58:19 -0700 <rdar://problem/55793803> 379756 2019-09-27 12:53:46 -0700 2019-09-27 13:14:08 -0700 Patch bug-202327-20190927125346.patch text/plain 22464 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyNTA0MzYpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQ4IEBACisyMDE5LTA5LTI3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgTW92ZSBzaG91bGRV c2VUZXN0aW5nTmV0d29ya1Nlc3Npb24gZnJvbSBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1l dGVycyB0byBOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAyMzI3CisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr UHJvY2Vzcy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzOjppbml0aWFsaXpl TmV0d29ya1Byb2Nlc3MpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzczo6ZW5zdXJl U2Vzc2lvbik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Byb2Nlc3MuaDoKKyAg ICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5j cHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpl bmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFy YW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vz c0NyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtT ZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Nlc3Npb246Ok5ldHdvcmtTZXNz aW9uKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFy YW1ldGVycy5jcHA6CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJh bWV0ZXJzOjplbmNvZGUgY29uc3QpOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3JrU2Vzc2lvbkNy ZWF0aW9uUGFyYW1ldGVyczo6ZGVjb2RlKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNz L2NvY29hL05ldHdvcmtQcm9jZXNzQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6Ok5ldHdvcmtQ cm9jZXNzOjpwbGF0Zm9ybUluaXRpYWxpemVOZXR3b3JrUHJvY2Vzc0NvY29hKToKKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9jdXJsL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Q3VybC5jcHA6Cisg ICAgICAgIChXZWJLaXQ6OlJlbW90ZU5ldHdvcmtpbmdDb250ZXh0OjplbnN1cmVXZWJzaXRlRGF0 YVN0b3JlU2Vzc2lvbik6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdv cmtpbmdDb250ZXh0Lm1tOgorICAgICAgICAoV2ViS2l0OjpSZW1vdGVOZXR3b3JraW5nQ29udGV4 dDo6ZW5zdXJlV2Vic2l0ZURhdGFTdG9yZVNlc3Npb24pOgorICAgICAgICAqIE5ldHdvcmtQcm9j ZXNzL3NvdXAvUmVtb3RlTmV0d29ya2luZ0NvbnRleHRTb3VwLmNwcDoKKyAgICAgICAgKFdlYktp dDo6UmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OmVuc3VyZVdlYnNpdGVEYXRhU3RvcmVTZXNzaW9u KToKKyAgICAgICAgKiBVSVByb2Nlc3MvQVBJL0MvV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvblJlZi5jcHA6CisgICAgICAgIChXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0 UGVyT3JpZ2luU3RvcmFnZVF1b3RhKToKKyAgICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb25TZXROZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkKToKKyAg ICAgICAgKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25HZXRUZXN0aW5nU2Vzc2lvbkVu YWJsZWQpOgorICAgICAgICAoV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblNldFRlc3Rp bmdTZXNzaW9uRW5hYmxlZCk6CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYuaDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vz c1Bvb2wuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQcm9jZXNzUG9vbDo6ZW5zdXJlTmV0d29y a1Byb2Nlc3MpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRl RGF0YVN0b3JlQ29jb2EubW06CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmU6OnBh cmFtZXRlcnMpOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVD b25maWd1cmF0aW9uOjpjb3B5KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24uaDoKKyAgICAgICAgKFdlYktpdDo6V2Vic2l0ZURh dGFTdG9yZUNvbmZpZ3VyYXRpb246OnRlc3RpbmdTZXNzaW9uRW5hYmxlZCBjb25zdCk6CisgICAg ICAgIChXZWJLaXQ6OldlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uOjpzZXRUZXN0aW5nU2Vz c2lvbkVuYWJsZWQpOgorCiAyMDE5LTA5LTI3ICBTYWlkIEFib3UtSGFsbGF3YSAgPHNhYm91aGFs bGF3YUBhcHBsZS5jb20+CiAKICAgICAgICAgW2lPU106IFdoZW4gaW5zZXJ0aW5nIGEgcGhvdG8g YW5kIHRoZW4gaW5zZXJ0aW5nIGF1dG8tY29ycmVjdGVkIHRleHQsIHRoZSBwaG90byBpcyByZW1v dmVkCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9j ZXNzLmNwcAkocmV2aXNpb24gMjUwNDI2KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9OZXR3b3JrUHJvY2Vzcy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMwMywxNSArMzAzLDggQEAg dm9pZCBOZXR3b3JrUHJvY2Vzczo6aW5pdGlhbGl6ZU5ldHdvcmtQcgogICAgICAgICBtZW1vcnlQ cmVzc3VyZUhhbmRsZXIuaW5zdGFsbCgpOwogICAgIH0KIAotICAgIG1fZGlza0NhY2hlSXNEaXNh YmxlZEZvclRlc3RpbmcgPSBwYXJhbWV0ZXJzLnNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lv bjsKLQogICAgIHNldENhY2hlTW9kZWwocGFyYW1ldGVycy5jYWNoZU1vZGVsLCBwYXJhbWV0ZXJz LmRlZmF1bHREYXRhU3RvcmVQYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5uZXR3 b3JrQ2FjaGVEaXJlY3RvcnkpOwogCi0gICAgaWYgKHBhcmFtZXRlcnMuc2hvdWxkVXNlVGVzdGlu Z05ldHdvcmtTZXNzaW9uKSB7Ci0gICAgICAgIG1fc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtTdG9y YWdlU2Vzc2lvbiA9IHRydWU7Ci0gICAgICAgIG1fZGVmYXVsdE5ldHdvcmtTdG9yYWdlU2Vzc2lv biA9IG5ld1Rlc3RpbmdTZXNzaW9uKFBBTDo6U2Vzc2lvbklEOjpkZWZhdWx0U2Vzc2lvbklEKCkp OwotICAgIH0KLQogI2lmIEVOQUJMRShSRVNPVVJDRV9MT0FEX1NUQVRJU1RJQ1MpCiAgICAgbV9p c0lUUERhdGFiYXNlRW5hYmxlZCA9IHBhcmFtZXRlcnMuc2hvdWxkRW5hYmxlSVRQRGF0YWJhc2U7 CiAjZW5kaWYKQEAgLTUwOSw5ICs1MDIsOSBAQCBzdGQ6OnVuaXF1ZV9wdHI8V2ViQ29yZTo6TmV0 d29ya1N0b3JhZ2VTCiB9CiAKICNpZiBQTEFURk9STShDT0NPQSkKLXZvaWQgTmV0d29ya1Byb2Nl c3M6OmVuc3VyZVNlc3Npb24oY29uc3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgY29uc3Qg U3RyaW5nJiBpZGVudGlmaWVyQmFzZSwgUmV0YWluUHRyPENGSFRUUENvb2tpZVN0b3JhZ2VSZWY+ JiYgY29va2llU3RvcmFnZSkKK3ZvaWQgTmV0d29ya1Byb2Nlc3M6OmVuc3VyZVNlc3Npb24oY29u c3QgUEFMOjpTZXNzaW9uSUQmIHNlc3Npb25JRCwgYm9vbCBzaG91bGRVc2VUZXN0aW5nTmV0d29y a1Nlc3Npb24sIGNvbnN0IFN0cmluZyYgaWRlbnRpZmllckJhc2UsIFJldGFpblB0cjxDRkhUVFBD b29raWVTdG9yYWdlUmVmPiYmIGNvb2tpZVN0b3JhZ2UpCiAjZWxzZQotdm9pZCBOZXR3b3JrUHJv Y2Vzczo6ZW5zdXJlU2Vzc2lvbihjb25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklELCBjb25z dCBTdHJpbmcmIGlkZW50aWZpZXJCYXNlKQordm9pZCBOZXR3b3JrUHJvY2Vzczo6ZW5zdXJlU2Vz c2lvbihjb25zdCBQQUw6OlNlc3Npb25JRCYgc2Vzc2lvbklELCBib29sIHNob3VsZFVzZVRlc3Rp bmdOZXR3b3JrU2Vzc2lvbiwgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyQmFzZSkKICNlbmRpZgog ewogICAgIEFTU0VSVChzZXNzaW9uSUQgIT0gUEFMOjpTZXNzaW9uSUQ6OmRlZmF1bHRTZXNzaW9u SUQoKSk7CkBAIC01MjAsNyArNTEzLDcgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzczo6ZW5zdXJlU2Vz c2lvbihjb25zdAogICAgIGlmICghYWRkUmVzdWx0LmlzTmV3RW50cnkpCiAgICAgICAgIHJldHVy bjsKIAotICAgIGlmIChtX3Nob3VsZFVzZVRlc3RpbmdOZXR3b3JrU3RvcmFnZVNlc3Npb24pIHsK KyAgICBpZiAoc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtTZXNzaW9uKSB7CiAgICAgICAgIGFkZFJl c3VsdC5pdGVyYXRvci0+dmFsdWUgPSBuZXdUZXN0aW5nU2Vzc2lvbihzZXNzaW9uSUQpOwogICAg ICAgICByZXR1cm47CiAgICAgfQpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUHJvY2Vzcy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Byb2Nlc3MuaAkocmV2aXNpb24gMjUwNDI2KQorKysgU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzcy5oCSh3b3JraW5nIGNvcHkpCkBAIC0xNzMsOSAr MTczLDkgQEAgcHVibGljOgogICAgIFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYgZGVm YXVsdFN0b3JhZ2VTZXNzaW9uKCkgY29uc3Q7CiAgICAgc3RkOjp1bmlxdWVfcHRyPFdlYkNvcmU6 Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbj4gbmV3VGVzdGluZ1Nlc3Npb24oY29uc3QgUEFMOjpTZXNz aW9uSUQmKTsKICNpZiBQTEFURk9STShDT0NPQSkKLSAgICB2b2lkIGVuc3VyZVNlc3Npb24oY29u c3QgUEFMOjpTZXNzaW9uSUQmLCBjb25zdCBTdHJpbmcmIGlkZW50aWZpZXIsIFJldGFpblB0cjxD RkhUVFBDb29raWVTdG9yYWdlUmVmPiYmKTsKKyAgICB2b2lkIGVuc3VyZVNlc3Npb24oY29uc3Qg UEFMOjpTZXNzaW9uSUQmLCBib29sIHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbiwgY29u c3QgU3RyaW5nJiBpZGVudGlmaWVyLCBSZXRhaW5QdHI8Q0ZIVFRQQ29va2llU3RvcmFnZVJlZj4m Jik7CiAjZWxzZQotICAgIHZvaWQgZW5zdXJlU2Vzc2lvbihjb25zdCBQQUw6OlNlc3Npb25JRCYs IGNvbnN0IFN0cmluZyYgaWRlbnRpZmllcik7CisgICAgdm9pZCBlbnN1cmVTZXNzaW9uKGNvbnN0 IFBBTDo6U2Vzc2lvbklEJiwgYm9vbCBzaG91bGRVc2VUZXN0aW5nTmV0d29ya1Nlc3Npb24sIGNv bnN0IFN0cmluZyYgaWRlbnRpZmllcik7CiAjZW5kaWYKIAogICAgIHZvaWQgcHJvY2Vzc1dpbGxT dXNwZW5kSW1taW5lbnRseSgpOwpAQCAtNDc2LDcgKzQ3Niw2IEBAIHByaXZhdGU6CiAgICAgYm9v bCBtX2hhc1NldENhY2hlTW9kZWwgeyBmYWxzZSB9OwogICAgIENhY2hlTW9kZWwgbV9jYWNoZU1v ZGVsIHsgQ2FjaGVNb2RlbDo6RG9jdW1lbnRWaWV3ZXIgfTsKICAgICBib29sIG1fc3VwcHJlc3NN ZW1vcnlQcmVzc3VyZUhhbmRsZXIgeyBmYWxzZSB9OwotICAgIGJvb2wgbV9kaXNrQ2FjaGVJc0Rp c2FibGVkRm9yVGVzdGluZyB7IGZhbHNlIH07CiAgICAgU3RyaW5nIG1fdWlQcm9jZXNzQnVuZGxl SWRlbnRpZmllcjsKICAgICBEb3dubG9hZE1hbmFnZXIgbV9kb3dubG9hZE1hbmFnZXI7CiAKQEAg LTQ5MSw3ICs0OTAsNiBAQCBwcml2YXRlOgogICAgIEhhc2hNYXA8UEFMOjpTZXNzaW9uSUQsIHN0 ZDo6dW5pcXVlX3B0cjxOZXR3b3JrU2Vzc2lvbj4+IG1fbmV0d29ya1Nlc3Npb25zOwogICAgIEhh c2hNYXA8UEFMOjpTZXNzaW9uSUQsIHN0ZDo6dW5pcXVlX3B0cjxXZWJDb3JlOjpOZXR3b3JrU3Rv cmFnZVNlc3Npb24+PiBtX25ldHdvcmtTdG9yYWdlU2Vzc2lvbnM7CiAgICAgbXV0YWJsZSBzdGQ6 OnVuaXF1ZV9wdHI8V2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uPiBtX2RlZmF1bHROZXR3 b3JrU3RvcmFnZVNlc3Npb247Ci0gICAgYm9vbCBtX3Nob3VsZFVzZVRlc3RpbmdOZXR3b3JrU3Rv cmFnZVNlc3Npb24geyBmYWxzZSB9OwogCiAgICAgUmVmUHRyPFN0b3JhZ2VNYW5hZ2VyU2V0PiBt X3N0b3JhZ2VNYW5hZ2VyU2V0OwogCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJz LmNwcAkocmV2aXNpb24gMjUwNDIyKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQ5 LDcgKzQ5LDYgQEAgdm9pZCBOZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVyczo6ZQogICAg IGVuY29kZXIgPDwgcGFyZW50QnVuZGxlRGlyZWN0b3J5RXh0ZW5zaW9uSGFuZGxlOwogI2VuZGlm CiAgICAgZW5jb2RlciA8PCBzaG91bGRTdXBwcmVzc01lbW9yeVByZXNzdXJlSGFuZGxlcjsKLSAg ICBlbmNvZGVyIDw8IHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbjsKICAgICBlbmNvZGVy IDw8IHVybFNjaGVtZXNSZWdpc3RlcmVkRm9yQ3VzdG9tUHJvdG9jb2xzOwogI2lmIFBMQVRGT1JN KENPQ09BKQogICAgIGVuY29kZXIgPDwgdWlQcm9jZXNzQnVuZGxlSWRlbnRpZmllcjsKQEAgLTEx OSw4ICsxMTgsNiBAQCBib29sIE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzOjpkCiAj ZW5kaWYKICAgICBpZiAoIWRlY29kZXIuZGVjb2RlKHJlc3VsdC5zaG91bGRTdXBwcmVzc01lbW9y eVByZXNzdXJlSGFuZGxlcikpCiAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICBpZiAoIWRlY29k ZXIuZGVjb2RlKHJlc3VsdC5zaG91bGRVc2VUZXN0aW5nTmV0d29ya1Nlc3Npb24pKQotICAgICAg ICByZXR1cm4gZmFsc2U7CiAgICAgaWYgKCFkZWNvZGVyLmRlY29kZShyZXN1bHQudXJsU2NoZW1l c1JlZ2lzdGVyZWRGb3JDdXN0b21Qcm90b2NvbHMpKQogICAgICAgICByZXR1cm4gZmFsc2U7CiAj aWYgUExBVEZPUk0oQ09DT0EpCkluZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUHJvY2Vzc0NyZWF0aW9uUGFyYW1ldGVycy5oCShy ZXZpc2lvbiAyNTA0MjIpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzLmgJKHdvcmtpbmcgY29weSkKQEAgLTYyLDcgKzYyLDYg QEAgc3RydWN0IE5ldHdvcmtQcm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIAogICAgIFNhbmRib3hF eHRlbnNpb246OkhhbmRsZSBwYXJlbnRCdW5kbGVEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGU7CiAj ZW5kaWYKICAgICBib29sIHNob3VsZFN1cHByZXNzTWVtb3J5UHJlc3N1cmVIYW5kbGVyIHsgZmFs c2UgfTsKLSAgICBib29sIHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbiB7IGZhbHNlIH07 CiAKICAgICBWZWN0b3I8U3RyaW5nPiB1cmxTY2hlbWVzUmVnaXN0ZXJlZEZvckN1c3RvbVByb3Rv Y29sczsKIApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lv bi5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3Jr U2Vzc2lvbi5jcHAJKHJldmlzaW9uIDI1MDQyMSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Nlc3Npb24uY3BwCSh3b3JraW5nIGNvcHkpCkBAIC05NSw2ICs5NSw4IEBA IE5ldHdvcmtTZXNzaW9uOjpOZXR3b3JrU2Vzc2lvbihOZXR3b3JrUHIKICAgICAgICAgaWYgKHBh cmFtZXRlcnMubmV0d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZCkKICAgICAg ICAgICAgIGNhY2hlT3B0aW9ucy5hZGQoTmV0d29ya0NhY2hlOjpDYWNoZU9wdGlvbjo6U3BlY3Vs YXRpdmVSZXZhbGlkYXRpb24pOwogI2VuZGlmCisgICAgICAgIGlmIChwYXJhbWV0ZXJzLnNob3Vs ZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbikKKyAgICAgICAgICAgIGNhY2hlT3B0aW9ucy5hZGQo TmV0d29ya0NhY2hlOjpDYWNoZU9wdGlvbjo6VGVzdGluZ01vZGUpOwogCiAgICAgICAgIG1fY2Fj aGUgPSBOZXR3b3JrQ2FjaGU6OkNhY2hlOjpvcGVuKG5ldHdvcmtQcm9jZXNzLCBuZXR3b3JrQ2Fj aGVEaXJlY3RvcnksIGNhY2hlT3B0aW9ucywgbV9zZXNzaW9uSUQpOwogCkluZGV4OiBTb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0ZXJzLmNw cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtTZXNz aW9uQ3JlYXRpb25QYXJhbWV0ZXJzLmNwcAkocmV2aXNpb24gMjUwNDIxKQorKysgU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycy5jcHAJ KHdvcmtpbmcgY29weSkKQEAgLTc3LDYgKzc3LDcgQEAgdm9pZCBOZXR3b3JrU2Vzc2lvbkNyZWF0 aW9uUGFyYW1ldGVyczo6ZQogICAgIGVuY29kZXIgPDwgZGF0YUNvbm5lY3Rpb25TZXJ2aWNlVHlw ZTsKICAgICBlbmNvZGVyIDw8IGZhc3RTZXJ2ZXJUcnVzdEV2YWx1YXRpb25FbmFibGVkOwogICAg IGVuY29kZXIgPDwgbmV0d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZDsKKyAg ICBlbmNvZGVyIDw8IHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbjsKIH0KIAogT3B0aW9u YWw8TmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnM+IE5ldHdvcmtTZXNzaW9uQ3JlYXRp b25QYXJhbWV0ZXJzOjpkZWNvZGUoSVBDOjpEZWNvZGVyJiBkZWNvZGVyKQpAQCAtMjM2LDYgKzIz NywxMSBAQCBPcHRpb25hbDxOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVyCiAgICAgaWYg KCFuZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkKQogICAgICAgICByZXR1 cm4gV1RGOjpudWxsb3B0OwogICAgIAorICAgIE9wdGlvbmFsPGJvb2w+IHNob3VsZFVzZVRlc3Rp bmdOZXR3b3JrU2Vzc2lvbjsKKyAgICBkZWNvZGVyID4+IHNob3VsZFVzZVRlc3RpbmdOZXR3b3Jr U2Vzc2lvbjsKKyAgICBpZiAoIXNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbikKKyAgICAg ICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKKyAgICAKICAgICByZXR1cm4ge3sKICAgICAgICAgKnNl c3Npb25JRAogICAgICAgICAsIFdURk1vdmUoKmJvdW5kSW50ZXJmYWNlSWRlbnRpZmllcikKQEAg LTI3Myw2ICsyNzksNyBAQCBPcHRpb25hbDxOZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVy CiAgICAgICAgICwgV1RGTW92ZSgqZGF0YUNvbm5lY3Rpb25TZXJ2aWNlVHlwZSkKICAgICAgICAg LCBXVEZNb3ZlKCpmYXN0U2VydmVyVHJ1c3RFdmFsdWF0aW9uRW5hYmxlZCkKICAgICAgICAgLCBX VEZNb3ZlKCpuZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkKQorICAgICAg ICAsIFdURk1vdmUoKnNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbikKICAgICB9fTsKIH0K IApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0 aW9uUGFyYW1ldGVycy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvTmV0d29ya1Nlc3Npb25DcmVhdGlvblBhcmFtZXRlcnMuaAkocmV2aXNpb24gMjUwNDIxKQor KysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrU2Vzc2lvbkNyZWF0aW9uUGFy YW1ldGVycy5oCSh3b3JraW5nIGNvcHkpCkBAIC05NSw2ICs5NSw3IEBAIHN0cnVjdCBOZXR3b3Jr U2Vzc2lvbkNyZWF0aW9uUGFyYW1ldGVycyAKICAgICBTdHJpbmcgZGF0YUNvbm5lY3Rpb25TZXJ2 aWNlVHlwZTsKICAgICBib29sIGZhc3RTZXJ2ZXJUcnVzdEV2YWx1YXRpb25FbmFibGVkIHsgZmFs c2UgfTsKICAgICBib29sIG5ldHdvcmtDYWNoZVNwZWN1bGF0aXZlVmFsaWRhdGlvbkVuYWJsZWQg eyBmYWxzZSB9OworICAgIGJvb2wgc2hvdWxkVXNlVGVzdGluZ05ldHdvcmtTZXNzaW9uIHsgZmFs c2UgfTsKIH07CiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDogU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Byb2Nlc3NDb2NvYS5t bQkocmV2aXNpb24gMjUwNDIxKQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jb2Nv YS9OZXR3b3JrUHJvY2Vzc0NvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC0xMTMsMTEgKzExMyw3 IEBAIHZvaWQgTmV0d29ya1Byb2Nlc3M6OnBsYXRmb3JtSW5pdGlhbGl6ZU4KICAgICAvLyAtIGRp c2sgY2FjaGUgc2l6ZSBwYXNzZWQgZnJvbSBVSSBwcm9jZXNzIGlzIGVmZmVjdGl2ZWx5IGEgbWlu aW11bSBzaXplLgogICAgIC8vIE9uZSBub24tb2J2aW91cyBjb25zdHJhaW50IGlzIHRoYXQgd2Ug bmVlZCB0byB1c2UgLXNldFNoYXJlZFVSTENhY2hlOiBldmVuIGluIHRlc3RpbmcgbW9kZSwgdG8g cHJldmVudCBjcmVhdGluZyBhIGRlZmF1bHQgb25lIG9uIGRpc2sgbGF0ZXIsIHdoZW4gc29tZSBv dGhlciBjb2RlIHRvdWNoZXMgdGhlIGNhY2hlLgogCi0gICAgQVNTRVJUKCFtX2Rpc2tDYWNoZUlz RGlzYWJsZWRGb3JUZXN0aW5nKTsKLQogICAgIG1fY2FjaGVPcHRpb25zID0geyBOZXR3b3JrQ2Fj aGU6OkNhY2hlT3B0aW9uOjpSZWdpc3Rlck5vdGlmeSB9OwotICAgIGlmIChwYXJhbWV0ZXJzLnNo b3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbikKLSAgICAgICAgbV9jYWNoZU9wdGlvbnMuYWRk KE5ldHdvcmtDYWNoZTo6Q2FjaGVPcHRpb246OlRlc3RpbmdNb2RlKTsKIAogICAgIC8vIERpc2Fi bGUgTlNVUkxDYWNoZS4KICAgICBhdXRvIHVybENhY2hlKGFkb3B0TlMoW1tOU1VSTENhY2hlIGFs bG9jXSBpbml0V2l0aE1lbW9yeUNhcGFjaXR5OjAgZGlza0NhcGFjaXR5OjAgZGlza1BhdGg6bmls XSkpOwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9jdXJsL1JlbW90ZU5ldHdv cmtpbmdDb250ZXh0Q3VybC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9jdXJsL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0Q3VybC5jcHAJKHJldmlzaW9uIDI1 MDQyMSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY3VybC9SZW1vdGVOZXR3b3Jr aW5nQ29udGV4dEN1cmwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw3IEBAIHZvaWQg UmVtb3RlTmV0d29ya2luZ0NvbnRleHQ6OmVuc3VyZVdlYnMKICAgICBpZiAobmV0d29ya1Byb2Nl c3Muc3RvcmFnZVNlc3Npb24oc2Vzc2lvbklEKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbmV0 d29ya1Byb2Nlc3MuZW5zdXJlU2Vzc2lvbihzZXNzaW9uSUQsIFN0cmluZzo6bnVtYmVyKHNlc3Np b25JRC50b1VJbnQ2NCgpKSk7CisgICAgbmV0d29ya1Byb2Nlc3MuZW5zdXJlU2Vzc2lvbihzZXNz aW9uSUQsIHBhcmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnNob3VsZFVzZVRlc3Rp bmdOZXR3b3JrU2Vzc2lvbiwgU3RyaW5nOjpudW1iZXIoc2Vzc2lvbklELnRvVUludDY0KCkpKTsK ICAgICBuZXR3b3JrUHJvY2Vzcy5zZXRTZXNzaW9uKHNlc3Npb25JRCwgTmV0d29ya1Nlc3Npb246 OmNyZWF0ZShuZXR3b3JrUHJvY2VzcywgV1RGTW92ZShwYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9u UGFyYW1ldGVycykpKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9t YWMvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9tYWMvUmVtb3RlTmV0d29ya2luZ0NvbnRleHQubW0JKHJldmlzaW9u IDI1MDQyMSkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvbWFjL1JlbW90ZU5ldHdv cmtpbmdDb250ZXh0Lm1tCSh3b3JraW5nIGNvcHkpCkBAIC01OCw3ICs1OCw3IEBAIHZvaWQgUmVt b3RlTmV0d29ya2luZ0NvbnRleHQ6OmVuc3VyZVdlYnMKICAgICBpZiAoIXNlc3Npb25JRC5pc0Vw aGVtZXJhbCgpICYmICFwYXJhbWV0ZXJzLnVpUHJvY2Vzc0Nvb2tpZVN0b3JhZ2VJZGVudGlmaWVy LmlzRW1wdHkoKSkKICAgICAgICAgdWlQcm9jZXNzQ29va2llU3RvcmFnZSA9IGNvb2tpZVN0b3Jh Z2VGcm9tSWRlbnRpZnlpbmdEYXRhKHBhcmFtZXRlcnMudWlQcm9jZXNzQ29va2llU3RvcmFnZUlk ZW50aWZpZXIpOwogCi0gICAgbmV0d29ya1Byb2Nlc3MuZW5zdXJlU2Vzc2lvbihzZXNzaW9uSUQs IG1ha2VTdHJpbmcoYmFzZSwgJy4nLCBzZXNzaW9uSUQudG9VSW50NjQoKSksIFdURk1vdmUodWlQ cm9jZXNzQ29va2llU3RvcmFnZSkpOworICAgIG5ldHdvcmtQcm9jZXNzLmVuc3VyZVNlc3Npb24o c2Vzc2lvbklELCBwYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVycy5zaG91bGRVc2VU ZXN0aW5nTmV0d29ya1Nlc3Npb24sIG1ha2VTdHJpbmcoYmFzZSwgJy4nLCBzZXNzaW9uSUQudG9V SW50NjQoKSksIFdURk1vdmUodWlQcm9jZXNzQ29va2llU3RvcmFnZSkpOwogCiAgICAgYXV0byog c2Vzc2lvbiA9IG5ldHdvcmtQcm9jZXNzLnN0b3JhZ2VTZXNzaW9uKHNlc3Npb25JRCk7CiAgICAg Zm9yIChjb25zdCBhdXRvJiBjb29raWUgOiBwYXJhbWV0ZXJzLnBlbmRpbmdDb29raWVzKQpJbmRl eDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9zb3VwL1JlbW90ZU5ldHdvcmtpbmdDb250 ZXh0U291cC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9z b3VwL1JlbW90ZU5ldHdvcmtpbmdDb250ZXh0U291cC5jcHAJKHJldmlzaW9uIDI1MDQyMSkKKysr IFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mvc291cC9SZW1vdGVOZXR3b3JraW5nQ29udGV4 dFNvdXAuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00Miw3ICs0Miw3IEBAIHZvaWQgUmVtb3RlTmV0 d29ya2luZ0NvbnRleHQ6OmVuc3VyZVdlYnMKICAgICBpZiAobmV0d29ya1Byb2Nlc3Muc3RvcmFn ZVNlc3Npb24oc2Vzc2lvbklEKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgbmV0d29ya1Byb2Nl c3MuZW5zdXJlU2Vzc2lvbihzZXNzaW9uSUQsIFN0cmluZzo6bnVtYmVyKHNlc3Npb25JRC50b1VJ bnQ2NCgpKSk7CisgICAgbmV0d29ya1Byb2Nlc3MuZW5zdXJlU2Vzc2lvbihzZXNzaW9uSUQsIHBh cmFtZXRlcnMubmV0d29ya1Nlc3Npb25QYXJhbWV0ZXJzLnNob3VsZFVzZVRlc3RpbmdOZXR3b3Jr U2Vzc2lvbiwgU3RyaW5nOjpudW1iZXIoc2Vzc2lvbklELnRvVUludDY0KCkpKTsKICAgICBuZXR3 b3JrUHJvY2Vzcy5zZXRTZXNzaW9uKHNlc3Npb25JRCwgTmV0d29ya1Nlc3Npb246OmNyZWF0ZShu ZXR3b3JrUHJvY2VzcywgV1RGTW92ZShwYXJhbWV0ZXJzLm5ldHdvcmtTZXNzaW9uUGFyYW1ldGVy cykpKTsKIH0KIApJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wu Y3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcAkocmV2aXNpb24gMjUwNDI2KQorKysgU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjAsOCArNTIwLDYgQEAgTmV0d29ya1By b2Nlc3NQcm94eSYgV2ViUHJvY2Vzc1Bvb2w6OmVucwogICAgIGlmICghcGFyYW1ldGVycy5oc3Rz U3RvcmFnZURpcmVjdG9yeS5pc051bGwoKSkKICAgICAgICAgU2FuZGJveEV4dGVuc2lvbjo6Y3Jl YXRlSGFuZGxlRm9yUmVhZFdyaXRlRGlyZWN0b3J5KHBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJl Y3RvcnksIHBhcmFtZXRlcnMuaHN0c1N0b3JhZ2VEaXJlY3RvcnlFeHRlbnNpb25IYW5kbGUpOwog Ci0gICAgcGFyYW1ldGVycy5zaG91bGRVc2VUZXN0aW5nTmV0d29ya1Nlc3Npb24gPSBtX3Nob3Vs ZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbjsKLQogICAgIHBhcmFtZXRlcnMudXJsU2NoZW1lc1Jl Z2lzdGVyZWRBc1NlY3VyZSA9IGNvcHlUb1ZlY3RvcihtX3NjaGVtZXNUb1JlZ2lzdGVyQXNTZWN1 cmUpOwogICAgIHBhcmFtZXRlcnMudXJsU2NoZW1lc1JlZ2lzdGVyZWRBc0J5cGFzc2luZ0NvbnRl bnRTZWN1cml0eVBvbGljeSA9IGNvcHlUb1ZlY3RvcihtX3NjaGVtZXNUb1JlZ2lzdGVyQXNCeXBh c3NpbmdDb250ZW50U2VjdXJpdHlQb2xpY3kpOwogICAgIHBhcmFtZXRlcnMudXJsU2NoZW1lc1Jl Z2lzdGVyZWRBc0xvY2FsID0gY29weVRvVmVjdG9yKG1fc2NoZW1lc1RvUmVnaXN0ZXJBc0xvY2Fs KTsKSW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9y ZUNvbmZpZ3VyYXRpb25SZWYuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYuY3BwCShyZXZpc2lv biAyNTA0MjEpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQy9XS1dlYnNpdGVEYXRh U3RvcmVDb25maWd1cmF0aW9uUmVmLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMTE3LDcgKzExNyw3 IEBAIHVpbnQ2NF90IFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24KIAogdm9pZCBXS1dl YnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0UGVyT3JpZ2luU3RvcmFnZVF1b3RhKFdLV2Vi c2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgdWludDY0X3QgcXVv dGEpCiB7Ci0gICAgcmV0dXJuIFdlYktpdDo6dG9JbXBsKGNvbmZpZ3VyYXRpb24pLT5zZXRQZXJP cmlnaW5TdG9yYWdlUXVvdGEocXVvdGEpOworICAgIFdlYktpdDo6dG9JbXBsKGNvbmZpZ3VyYXRp b24pLT5zZXRQZXJPcmlnaW5TdG9yYWdlUXVvdGEocXVvdGEpOwogfQogCiBib29sIFdLV2Vic2l0 ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25HZXROZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRp b25FbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlv bikKQEAgLTEyNyw1ICsxMjcsMTUgQEAgYm9vbCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0 aW9uR2V0TgogCiB2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25TZXROZXR3b3Jr Q2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZp Z3VyYXRpb25SZWYgY29uZmlndXJhdGlvbiwgYm9vbCBlbmFibGVkKQogewotICAgIHJldHVybiBX ZWJLaXQ6OnRvSW1wbChjb25maWd1cmF0aW9uKS0+c2V0TmV0d29ya0NhY2hlU3BlY3VsYXRpdmVW YWxpZGF0aW9uRW5hYmxlZChlbmFibGVkKTsKKyAgICBXZWJLaXQ6OnRvSW1wbChjb25maWd1cmF0 aW9uKS0+c2V0TmV0d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZChlbmFibGVk KTsKK30KKworYm9vbCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uR2V0VGVzdGluZ1Nl c3Npb25FbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJh dGlvbikKK3sKKyAgICByZXR1cm4gV2ViS2l0Ojp0b0ltcGwoY29uZmlndXJhdGlvbiktPnRlc3Rp bmdTZXNzaW9uRW5hYmxlZCgpOworfQorCit2b2lkIFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3Vy YXRpb25TZXRUZXN0aW5nU2Vzc2lvbkVuYWJsZWQoV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJh dGlvblJlZiBjb25maWd1cmF0aW9uLCBib29sIGVuYWJsZWQpCit7CisgICAgV2ViS2l0Ojp0b0lt cGwoY29uZmlndXJhdGlvbiktPnNldFRlc3RpbmdTZXNzaW9uRW5hYmxlZChlbmFibGVkKTsKIH0K SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb25SZWYuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9B UEkvQy9XS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmLmgJKHJldmlzaW9uIDI1MDQy MSkKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9DL1dLV2Vic2l0ZURhdGFTdG9yZUNv bmZpZ3VyYXRpb25SZWYuaAkod29ya2luZyBjb3B5KQpAQCAtNjMsNiArNjMsOSBAQCBXS19FWFBP UlQgdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1CiBXS19FWFBPUlQgYm9vbCBXS1dlYnNp dGVEYXRhU3RvcmVDb25maWd1cmF0aW9uR2V0TmV0d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0 aW9uRW5hYmxlZChXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uUmVmIGNvbmZpZ3VyYXRp b24pOwogV0tfRVhQT1JUIHZvaWQgV0tXZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblNldE5l dHdvcmtDYWNoZVNwZWN1bGF0aXZlVmFsaWRhdGlvbkVuYWJsZWQoV0tXZWJzaXRlRGF0YVN0b3Jl Q29uZmlndXJhdGlvblJlZiBjb25maWd1cmF0aW9uLCBib29sIGVuYWJsZWQpOwogCitXS19FWFBP UlQgYm9vbCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uR2V0VGVzdGluZ1Nlc3Npb25F bmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmlndXJhdGlvbik7 CitXS19FWFBPUlQgdm9pZCBXS1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0VGVzdGlu Z1Nlc3Npb25FbmFibGVkKFdLV2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb25SZWYgY29uZmln dXJhdGlvbiwgYm9vbCBlbmFibGVkKTsKKwogI2lmZGVmIF9fY3BsdXNwbHVzCiB9CiAjZW5kaWYK SW5kZXg6IFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3Rv cmVDb25maWd1cmF0aW9uLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5jcHAJKHJldmlzaW9u IDI1MDQyNikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uLmNwcAkod29ya2luZyBjb3B5KQpAQCAtODMsNiArODMsNyBA QCBSZWY8V2Vic2l0ZURhdGFTdG9yZUNvbmZpZ3VyYXRpb24+IFdlYnNpCiAgICAgY29weS0+bV9i b3VuZEludGVyZmFjZUlkZW50aWZpZXIgPSB0aGlzLT5tX2JvdW5kSW50ZXJmYWNlSWRlbnRpZmll cjsKICAgICBjb3B5LT5tX2FsbG93c0NlbGx1bGFyQWNjZXNzID0gdGhpcy0+bV9hbGxvd3NDZWxs dWxhckFjY2VzczsKICAgICBjb3B5LT5tX2RhdGFDb25uZWN0aW9uU2VydmljZVR5cGUgPSB0aGlz LT5tX2RhdGFDb25uZWN0aW9uU2VydmljZVR5cGU7CisgICAgY29weS0+bV90ZXN0aW5nU2Vzc2lv bkVuYWJsZWQgPSB0aGlzLT5tX3Rlc3RpbmdTZXNzaW9uRW5hYmxlZDsKICNpZiBQTEFURk9STShD T0NPQSkKICAgICBpZiAobV9wcm94eUNvbmZpZ3VyYXRpb24pCiAgICAgICAgIGNvcHktPm1fcHJv eHlDb25maWd1cmF0aW9uID0gYWRvcHRDRihDRkRpY3Rpb25hcnlDcmVhdGVDb3B5KG51bGxwdHIs IHRoaXMtPm1fcHJveHlDb25maWd1cmF0aW9uLmdldCgpKSk7CkluZGV4OiBTb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvbi5oCj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uLmgJKHJldmlzaW9uIDI1MDQyNikKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uLmgJ KHdvcmtpbmcgY29weSkKQEAgLTgyLDYgKzgyLDkgQEAgcHVibGljOgogICAgIGJvb2wgbmV0d29y a0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fbmV0 d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZDsgfQogICAgIHZvaWQgc2V0TmV0 d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0aW9uRW5hYmxlZChib29sIGVuYWJsZWQpIHsgbV9u ZXR3b3JrQ2FjaGVTcGVjdWxhdGl2ZVZhbGlkYXRpb25FbmFibGVkID0gZW5hYmxlZDsgfQogCisg ICAgYm9vbCB0ZXN0aW5nU2Vzc2lvbkVuYWJsZWQoKSBjb25zdCB7IHJldHVybiBtX3Rlc3RpbmdT ZXNzaW9uRW5hYmxlZDsgfQorICAgIHZvaWQgc2V0VGVzdGluZ1Nlc3Npb25FbmFibGVkKGJvb2wg ZW5hYmxlZCkgeyBtX3Rlc3RpbmdTZXNzaW9uRW5hYmxlZCA9IGVuYWJsZWQ7IH0KKyAgICAKICNp ZiBQTEFURk9STShDT0NPQSkKICAgICBDRkRpY3Rpb25hcnlSZWYgcHJveHlDb25maWd1cmF0aW9u KCkgY29uc3QgeyByZXR1cm4gbV9wcm94eUNvbmZpZ3VyYXRpb24uZ2V0KCk7IH0KICAgICB2b2lk IHNldFByb3h5Q29uZmlndXJhdGlvbihDRkRpY3Rpb25hcnlSZWYgY29uZmlndXJhdGlvbikgeyBt X3Byb3h5Q29uZmlndXJhdGlvbiA9IGNvbmZpZ3VyYXRpb247IH0KQEAgLTE2Nyw2ICsxNzAsNyBA QCBwcml2YXRlOgogICAgIGJvb2wgbV9hbGxvd3NDZWxsdWxhckFjY2VzcyB7IHRydWUgfTsKICAg ICBib29sIG1fZmFzdFNlcnZlclRydXN0RXZhbHVhdGlvbkVuYWJsZWQgeyBmYWxzZSB9OwogICAg IGJvb2wgbV9zZXJ2aWNlV29ya2VyUHJvY2Vzc1Rlcm1pbmF0aW9uRGVsYXlFbmFibGVkIHsgdHJ1 ZSB9OworICAgIGJvb2wgbV90ZXN0aW5nU2Vzc2lvbkVuYWJsZWQgeyBmYWxzZSB9OwogI2lmIFBM QVRGT1JNKENPQ09BKQogICAgIFJldGFpblB0cjxDRkRpY3Rpb25hcnlSZWY+IG1fcHJveHlDb25m aWd1cmF0aW9uOwogI2VuZGlmCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29h Lm1tCShyZXZpc2lvbiAyNTA0MjYpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRl RGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAgLTE0 NSw2ICsxNDUsNyBAQCBXZWJzaXRlRGF0YVN0b3JlUGFyYW1ldGVycyBXZWJzaXRlRGF0YVN0CiAg ICAgICAgIG1fY29uZmlndXJhdGlvbi0+ZGF0YUNvbm5lY3Rpb25TZXJ2aWNlVHlwZSgpLAogICAg ICAgICBtX2NvbmZpZ3VyYXRpb24tPmZhc3RTZXJ2ZXJUcnVzdEV2YWx1YXRpb25FbmFibGVkKCks CiAgICAgICAgIG1fY29uZmlndXJhdGlvbi0+bmV0d29ya0NhY2hlU3BlY3VsYXRpdmVWYWxpZGF0 aW9uRW5hYmxlZCgpLAorICAgICAgICBtX2NvbmZpZ3VyYXRpb24tPnRlc3RpbmdTZXNzaW9uRW5h YmxlZCgpCiAgICAgfTsKICAgICBuZXR3b3JraW5nSGFzQmVndW4oKTsKIApJbmRleDogVG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjUwNDQx KQorKysgVG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTMgQEAKKzIw MTktMDktMjcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKwor ICAgICAgICBNb3ZlIHNob3VsZFVzZVRlc3RpbmdOZXR3b3JrU2Vzc2lvbiBmcm9tIE5ldHdvcmtQ cm9jZXNzQ3JlYXRpb25QYXJhbWV0ZXJzIHRvIE5ldHdvcmtTZXNzaW9uQ3JlYXRpb25QYXJhbWV0 ZXJzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDIz MjcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YktpdFRlc3RSdW5uZXIvVGVzdENvbnRyb2xsZXIuY3BwOgorICAgICAgICAoV1RSOjpUZXN0Q29u dHJvbGxlcjo6d2Vic2l0ZURhdGFTdG9yZSk6CisKIDIwMTktMDktMjcgIEFsZXggQ2hyaXN0ZW5z ZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBNb3ZlIHNlcnZpY2Ugd29y a2VyIHByb2Nlc3MgdGVybWluYXRpb24gZGVsYXkgZGlzYWJsaW5nIGZyb20gcHJvY2VzcyBwb29s IHRvIHdlYnNpdGUgZGF0YSBzdG9yZQpJbmRleDogVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 Q29udHJvbGxlci5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9UZXN0 Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDI1MDQyMikKKysrIFRvb2xzL1dlYktpdFRlc3RSdW5u ZXIvVGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC01MjUsNiArNTI1LDcgQEAg V0tXZWJzaXRlRGF0YVN0b3JlUmVmIFRlc3RDb250cm9sbGVyOjp3ZQogICAgICAgICAgICAgV0tX ZWJzaXRlRGF0YVN0b3JlQ29uZmlndXJhdGlvblNldFJlc291cmNlTG9hZFN0YXRpc3RpY3NEaXJl Y3RvcnkoY29uZmlndXJhdGlvbi5nZXQoKSwgdG9XSyh0ZW1wb3JhcnlGb2xkZXIgKyBwYXRoU2Vw YXJhdG9yICsgIlJlc291cmNlTG9hZFN0YXRpc3RpY3MiKS5nZXQoKSk7CiAgICAgICAgICAgICBX S1dlYnNpdGVEYXRhU3RvcmVDb25maWd1cmF0aW9uU2V0UGVyT3JpZ2luU3RvcmFnZVF1b3RhKGNv bmZpZ3VyYXRpb24uZ2V0KCksIDQwMCAqIDEwMjQpOwogICAgICAgICAgICAgV0tXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvblNldE5ldHdvcmtDYWNoZVNwZWN1bGF0aXZlVmFsaWRhdGlvbkVu YWJsZWQoY29uZmlndXJhdGlvbi5nZXQoKSwgdHJ1ZSk7CisgICAgICAgICAgICBXS1dlYnNpdGVE YXRhU3RvcmVDb25maWd1cmF0aW9uU2V0VGVzdGluZ1Nlc3Npb25FbmFibGVkKGNvbmZpZ3VyYXRp b24uZ2V0KCksIHRydWUpOwogICAgICAgICB9CiAgICAgICAgIGRhdGFTdG9yZSA9IFdLV2Vic2l0 ZURhdGFTdG9yZUNyZWF0ZVdpdGhDb25maWd1cmF0aW9uKGNvbmZpZ3VyYXRpb24uZ2V0KCkpOwog ICAgIH0K