236321 2022-02-08 12:38:52 -0800 [Playstation] Fix build break after r289247 if ENABLE_SERVICE_WORKER is off 2022-02-08 16:37:18 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jigen.zhou webkit-unassigned cdumez webkit-bug-importer oldest_to_newest 1838834 0 jigen.zhou 2022-02-08 12:38:52 -0800 After r289247, there are a number of build errors when ENABLE_SERVICE_WORKER is off: In file included from C:/work/webkit/jenkins/neko/Source/WebKit\NetworkProcess/SharedWorker/WebSharedWorkerServer.cpp:27: C:/work/webkit/jenkins/neko/Source/WebKit/NetworkProcess/SharedWorker/WebSharedWorkerServer.h:57:5: error: use of undeclared identifier 'PAL' PAL::SessionID sessionID(); ^ 1 error generated. In file included from WebKit/DerivedSources\WebSharedWorkerServerConnectionMessageReceiver.cpp:26: C:/work/webkit/jenkins/neko/Source/WebKit/NetworkProcess/SharedWorker\WebSharedWorkerServerConnection.h:55:5: error: unknown type name 'NetworkSession' NetworkSession* session(); ^ 1 error generated. In file included from WebKit/DerivedSources/unified-sources/UnifiedSource-54928a2b-18.cpp:4: C:/Working/neko_dir/neko/Source/WebKit\WebProcess/Storage/WebSharedWorkerContextManagerConnection.cpp:62:19: error: use of undeclared identifier 'standardUserAgent'; did you mean 'WebCore::standardUserAgent'? , m_userAgent(standardUserAgent()) ^~~~~~~~~~~~~~~~~ WebCore::standardUserAgent WebCore/PrivateHeaders\WebCore/UserAgent.h:41:23: note: 'WebCore::standardUserAgent' declared here WEBCORE_EXPORT String standardUserAgent(const String& applicationName = emptyString(), const String& applicationVersion = emptyString()); ^ 1 error generated. prospero-lld: error: undefined symbol: WebKit::WebProcessProxy::createForWorkers(WebKit::WebProcessProxy::WorkerType, WebKit::WebProcessPool&, WebCore::RegistrableDomain&&, WebKit::WebsiteDataStore&) >>> referenced by WebProcessPool.cpp:639 (C:/Working/neko_dir/neko/Source/WebKit\UIProcess\WebProcessPool.cpp:639) >>> Source/WebKit/CMakeFiles/WebKit.dir/__/__/WebKit/DerivedSources/unified-sources/UnifiedSource-88d1702b-8.cpp.o:(WebKit::WebProcessPool::establishSharedWorkerContextConnectionToNetworkProcess(WebCore::RegistrableDomain&&, PAL::SessionID, WTF::CompletionHandler<void ()>&&)) ninja: build stopped: subcommand failed. 1838849 1 451297 jigen.zhou 2022-02-08 13:10:42 -0800 Created attachment 451297 Patch 1838881 2 451304 jigen.zhou 2022-02-08 14:34:13 -0800 Created attachment 451304 Patch 1838894 3 451307 jigen.zhou 2022-02-08 14:46:18 -0800 Created attachment 451307 Patch 1838898 4 jigen.zhou 2022-02-08 14:53:12 -0800 Chris Dumez <cdumez@apple.com> 1838900 5 451307 cdumez 2022-02-08 14:54:22 -0800 Comment on attachment 451307 Patch r=me, sorry about the breakage. 1838908 6 jigen.zhou 2022-02-08 15:09:15 -0800 (In reply to Chris Dumez from comment #5) > Comment on attachment 451307 [details] > Patch > > r=me, sorry about the breakage. No problem, can you review the fix ? 1838910 7 cdumez 2022-02-08 15:10:06 -0800 (In reply to Jigen Zhou from comment #6) > (In reply to Chris Dumez from comment #5) > > Comment on attachment 451307 [details] > > Patch > > > > r=me, sorry about the breakage. > > No problem, can you review the fix ? I already did (thus r=me and r+ on your patch). I am just waiting for enough green bubbles to trigger the commit queue. 1838953 8 ews-feeder 2022-02-08 16:36:35 -0800 Committed r289449 (246993@main): <https://commits.webkit.org/246993@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 451307. 1838954 9 webkit-bug-importer 2022-02-08 16:37:18 -0800 <rdar://problem/88659306> 451297 2022-02-08 13:10:42 -0800 2022-02-08 14:34:13 -0800 Patch Patch text/plain 6422 jigen.zhou ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggNTQ5OWYwMTc1ZWVmLi5lNTgwMjUxMjgxOWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMjItMDItMDggIEppZ2VuIFpob3UgIDxqaWdlbi56aG91QHNvbnkuY29tPgor CisgICAgICAgIFtQbGF5c3RhdGlvbl0gRml4IGJ1aWxkIGJyZWFrIGFmdGVyIHIyODkyNDcgaWYg RU5BQkxFX1NFUlZJQ0VfV09SS0VSIGlzIG9mZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQgZml4IGZvciBwbGF5c3RhdGlv biBwbGF0Zm9ybSBhZnRlciByMjg5MjQ3IGZvciBzdXBwb3J0IG9mIHNoYXJpbmcgU2hhcmVkIFdv cmtlcnMuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVzb2x2ZXMgY29tcGlsaW5nIGVycm9ycyBjYXVz ZWQgYnkgdW5rbm93IHR5cGUgbmFtZSBhbmQgdW5kZWNsYXJlZCBpZGVudGlmaWVycywgCisgICAg ICAgIGFuZCBpdCBhbHNvIGZpeGVzIGxpbmtpbmcgZXJyb3IgYnkgbWFraW5nIG1ldGhvZHMgV2Vi UHJvY2Vzc1Byb3h5OjpjcmVhdGVGb3JXb3JrZXJzIGFuZAorICAgICAgICBXZWJQcm9jZXNzUG9v bDo6dXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllckZvcldvcmtlcnMoKSBhdmFpbGFibGUg d2hlbiBFTkFCTEVfU0VSVklDRV9XT1JLRVIgaXMgb2ZmCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyLmg6CisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlckNvbm5lY3Rpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTaGFyZWRXb3JrZXJD b250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOgorCiAyMDIyLTAyLTA4ICBSYXp2YW4gQ2FsaW1h biAgPHJjYWxpbWFuQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRmxleGJv eF0gQWRkIHN1cHBvcnQgZm9yIHNob3dpbmcvaGlkaW5nIGZsZXggY29udGFpbmVyIG92ZXJsYXlz IGFuZCBiYXNpYyBvdmVybGF5IGRyYXdpbmcKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlci5oIGIvU291cmNl L1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVy LmgKaW5kZXggZDJkODAzODA5MzZkLi5kMDBiMGRkZTllOWYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlci5o CisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJl ZFdvcmtlclNlcnZlci5oCkBAIC0zMSw2ICszMSw3IEBACiAjaW5jbHVkZSA8V2ViQ29yZS9TaGFy ZWRXb3JrZXJPYmplY3RJZGVudGlmaWVyLmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9UcmFuc2ZlcnJl ZE1lc3NhZ2VQb3J0Lmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KKyNpbmNsdWRlIDxwYWwv U2Vzc2lvbklELmg+CiAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFJlZ2lzdHJhYmxlRG9t YWluOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3Jr ZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyQ29ubmVjdGlvbi5oIGIvU291cmNlL1dlYktpdC9OZXR3 b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyQ29ubmVjdGlvbi5o CmluZGV4IGZkMTY5YmNmNjQ5OC4uZTE5ZTM0NWQxYzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJDb25u ZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIv V2ViU2hhcmVkV29ya2VyU2VydmVyQ29ubmVjdGlvbi5oCkBAIC00Myw2ICs0Myw3IEBAIGNsYXNz IE5ldHdvcmtTZXNzaW9uOwogY2xhc3MgV2ViU2hhcmVkV29ya2VyOwogY2xhc3MgV2ViU2hhcmVk V29ya2VyU2VydmVyOwogY2xhc3MgV2ViU2hhcmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVj dGlvbjsKK2NsYXNzIE5ldHdvcmtTZXNzaW9uOwogCiBjbGFzcyBXZWJTaGFyZWRXb3JrZXJTZXJ2 ZXJDb25uZWN0aW9uIDogcHVibGljIElQQzo6TWVzc2FnZVNlbmRlciwgcHVibGljIElQQzo6TWVz c2FnZVJlY2VpdmVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcAppbmRleCA0YjE5YjBkMWQzYzEuLmYxMTZm ZTI5YzhiMiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bv b2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApA QCAtMTExNCw3ICsxMTE0LDYgQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6 OnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFpbihXZWJzaXRlRGF0YVN0b3IKICAgICByZXR1cm4g Y3JlYXRlTmV3V2ViUHJvY2Vzcygmd2Vic2l0ZURhdGFTdG9yZSwgY2FwdGl2ZVBvcnRhbE1vZGUp OwogfQogCi0jaWYgRU5BQkxFKFNFUlZJQ0VfV09SS0VSKQogVXNlckNvbnRlbnRDb250cm9sbGVy SWRlbnRpZmllciBXZWJQcm9jZXNzUG9vbDo6dXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmll ckZvcldvcmtlcnMoKQogewogICAgIGlmICghbV91c2VyQ29udGVudENvbnRyb2xsZXJGb3JXb3Jr ZXJzKQpAQCAtMTEyMiw3ICsxMTIxLDYgQEAgVXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmll ciBXZWJQcm9jZXNzUG9vbDo6dXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllckYKIAogICAg IHJldHVybiBtX3VzZXJDb250ZW50Q29udHJvbGxlckZvcldvcmtlcnMtPmlkZW50aWZpZXIoKTsK IH0KLSNlbmRpZgogCiBSZWY8V2ViUGFnZVByb3h5PiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlV2Vi UGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50LCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4m JiBwYWdlQ29uZmlndXJhdGlvbikKIHsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNz UG9vbC5oCmluZGV4IGU3MGI2ZjQyOWY3Yy4uY2IzODk2ZGViZTNhIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKQEAgLTM3OSwxMyArMzc5LDEzIEBAIHB1YmxpYzoK ICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiAgICAgc3RhdGljIHZvaWQgZXN0YWJsaXNoU2Vy dmljZVdvcmtlckNvbnRleHRDb25uZWN0aW9uVG9OZXR3b3JrUHJvY2VzcyhXZWJDb3JlOjpSZWdp c3RyYWJsZURvbWFpbiYmLCBzdGQ6Om9wdGlvbmFsPFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNv bnRleHRJZGVudGlmaWVyPiBzZXJ2aWNlV29ya2VyUGFnZUlkZW50aWZpZXIsIFBBTDo6U2Vzc2lv bklELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogICAgIHNpemVfdCBzZXJ2aWNlV29y a2VyUHJveGllc0NvdW50KCkgY29uc3Q7Ci0gICAgVXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRp ZmllciB1c2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyRm9yV29ya2VycygpOwogICAgIGJv b2wgaGFzU2VydmljZVdvcmtlckZvcmVncm91bmRBY3Rpdml0eUZvclRlc3RpbmcoKSBjb25zdDsK ICAgICBib29sIGhhc1NlcnZpY2VXb3JrZXJCYWNrZ3JvdW5kQWN0aXZpdHlGb3JUZXN0aW5nKCkg Y29uc3Q7CiAjZW5kaWYKICAgICB2b2lkIHNlcnZpY2VXb3JrZXJQcm9jZXNzQ3Jhc2hlZChXZWJQ cm9jZXNzUHJveHkmKTsKIAogICAgIHZvaWQgdXBkYXRlV29ya2VyVXNlckFnZW50KGNvbnN0IFN0 cmluZyYgdXNlckFnZW50KTsKKyAgICBVc2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyIHVz ZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZpZXJGb3JXb3JrZXJzKCk7CiAgICAgc3RhdGljIHZv aWQgZXN0YWJsaXNoU2hhcmVkV29ya2VyQ29udGV4dENvbm5lY3Rpb25Ub05ldHdvcmtQcm9jZXNz KFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiYsIFBBTDo6U2Vzc2lvbklELCBDb21wbGV0aW9u SGFuZGxlcjx2b2lkKCk+JiYpOwogCiAjaWYgUExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAppbmRleCBiNzQ2YTdkN2QyMTcuLmY0NjY5 MjQ5YTMzMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1By b3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw CkBAIC0xODIsNyArMTgyLDYgQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Byb3h5 OjpjcmVhdGUoV2ViUHJvY2Vzc1Bvb2wmIHByb2Nlc3NQb29sLCBXZWJzaXQKICAgICByZXR1cm4g cHJveHk7CiB9CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIpCiBSZWY8V2ViUHJvY2Vzc1By b3h5PiBXZWJQcm9jZXNzUHJveHk6OmNyZWF0ZUZvcldvcmtlcnMoV29ya2VyVHlwZSB3b3JrZXJU eXBlLCBXZWJQcm9jZXNzUG9vbCYgcHJvY2Vzc1Bvb2wsIFJlZ2lzdHJhYmxlRG9tYWluJiYgcmVn aXN0cmFibGVEb21haW4sIFdlYnNpdGVEYXRhU3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUpCiB7CiAg ICAgYXV0byBwcm94eSA9IGFkb3B0UmVmKCpuZXcgV2ViUHJvY2Vzc1Byb3h5KHByb2Nlc3NQb29s LCAmd2Vic2l0ZURhdGFTdG9yZSwgSXNQcmV3YXJtZWQ6Ok5vLCBDcm9zc09yaWdpbk1vZGU6OlNo YXJlZCwgQ2FwdGl2ZVBvcnRhbE1vZGU6OkRpc2FibGVkKSk7CkBAIC0xOTEsNyArMTkwLDYgQEAg UmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGVGb3JXb3JrZXJzKFdv cmtlclR5cGUgd29ya2VyVHlwZSwgV2UKICAgICBwcm94eS0+Y29ubmVjdCgpOwogICAgIHJldHVy biBwcm94eTsKIH0KLSNlbmRpZgogCiAjaWYgUExBVEZPUk0oQ09DT0EpICYmIEVOQUJMRShNRURJ QV9TVFJFQU0pCiBjbGFzcyBVSVByb3h5Rm9yQ2FwdHVyZSBmaW5hbCA6IHB1YmxpYyBVc2VyTWVk aWFDYXB0dXJlTWFuYWdlclByb3h5OjpDb25uZWN0aW9uUHJveHkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNo YXJlZFdvcmtlckNvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKaW5kZXggODQzMDY0NzY2NWZh Li44MTUyMTZhY2RjZTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9y YWdlL1dlYlNoYXJlZFdvcmtlckNvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uLmNwcApAQCAtNTksNyArNTksNyBAQCBXZWJTaGFyZWRXb3JrZXJDb250ZXh0 TWFuYWdlckNvbm5lY3Rpb246OldlYlNoYXJlZFdvcmtlckNvbnRleHRNYW5hZ2VyQ29ubmVjdGlv bgogI2lmIFBMQVRGT1JNKENPQ09BKQogICAgICwgbV91c2VyQWdlbnQoV2ViQ29yZTo6c3RhbmRh cmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25OYW1lKHsgfSkpCiAjZWxzZQotICAgICwgbV91c2Vy QWdlbnQoc3RhbmRhcmRVc2VyQWdlbnQoKSkKKyAgICAsIG1fdXNlckFnZW50KFdlYkNvcmU6OnN0 YW5kYXJkVXNlckFnZW50KCkpCiAjZW5kaWYKICAgICAsIG1fdXNlckNvbnRlbnRDb250cm9sbGVy KFdlYlVzZXJDb250ZW50Q29udHJvbGxlcjo6Z2V0T3JDcmVhdGUoaW5pdGlhbGl6YXRpb25EYXRh LnVzZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZpZXIpKQogewo= 451304 2022-02-08 14:34:13 -0800 2022-02-08 14:46:18 -0800 Patch Patch text/plain 6338 jigen.zhou ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggN2RlZjI3NGZhZTJmLi40OTdhNDcwOWZiYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMjItMDItMDggIEppZ2VuIFpob3UgIDxqaWdlbi56aG91QHNvbnkuY29tPgor CisgICAgICAgIFtQbGF5c3RhdGlvbl0gRml4IGJ1aWxkIGJyZWFrIGFmdGVyIHIyODkyNDcgaWYg RU5BQkxFX1NFUlZJQ0VfV09SS0VSIGlzIG9mZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQgZml4IGZvciBwbGF5c3RhdGlv biBwbGF0Zm9ybSBhZnRlciByMjg5MjQ3IGZvciBzdXBwb3J0IG9mIHNoYXJpbmcgU2hhcmVkIFdv cmtlcnMuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVzb2x2ZXMgY29tcGlsaW5nIGVycm9ycyBjYXVz ZWQgYnkgdW5rbm93IHR5cGUgbmFtZSBhbmQgdW5kZWNsYXJlZCBpZGVudGlmaWVycywgCisgICAg ICAgIGFuZCBpdCBhbHNvIGZpeGVzIGxpbmtpbmcgZXJyb3IgYnkgbWFraW5nIG1ldGhvZHMgV2Vi UHJvY2Vzc1Byb3h5OjpjcmVhdGVGb3JXb3JrZXJzIGFuZAorICAgICAgICBXZWJQcm9jZXNzUG9v bDo6dXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllckZvcldvcmtlcnMoKSBhdmFpbGFibGUg d2hlbiBFTkFCTEVfU0VSVklDRV9XT1JLRVIgaXMgb2ZmCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyLmg6CisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlckNvbm5lY3Rpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTaGFyZWRXb3JrZXJD b250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOgorCiAyMDIyLTAyLTA4ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2Nh Y2hlLW9yaWdpbnMuaHR0cHMuaHRtbCBpcyBmbGFreQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJT ZXJ2ZXIuaAppbmRleCBkMmQ4MDM4MDkzNmQuLjg5YmEwMTZjMTczNiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2Vy dmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2Vi U2hhcmVkV29ya2VyU2VydmVyLmgKQEAgLTMyLDYgKzMyLDEwIEBACiAjaW5jbHVkZSA8V2ViQ29y ZS9UcmFuc2ZlcnJlZE1lc3NhZ2VQb3J0Lmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAor bmFtZXNwYWNlIFBBTCB7CisgICAgY2xhc3MgU2Vzc2lvbklEOworfQorCiBuYW1lc3BhY2UgV2Vi Q29yZSB7CiBjbGFzcyBSZWdpc3RyYWJsZURvbWFpbjsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyQ29u bmVjdGlvbi5oIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2Vi U2hhcmVkV29ya2VyU2VydmVyQ29ubmVjdGlvbi5oCmluZGV4IGZkMTY5YmNmNjQ5OC4uZTE5ZTM0 NWQxYzk3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdv cmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyQ29ubmVj dGlvbi5oCkBAIC00Myw2ICs0Myw3IEBAIGNsYXNzIE5ldHdvcmtTZXNzaW9uOwogY2xhc3MgV2Vi U2hhcmVkV29ya2VyOwogY2xhc3MgV2ViU2hhcmVkV29ya2VyU2VydmVyOwogY2xhc3MgV2ViU2hh cmVkV29ya2VyU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbjsKK2NsYXNzIE5ldHdvcmtTZXNzaW9u OwogCiBjbGFzcyBXZWJTaGFyZWRXb3JrZXJTZXJ2ZXJDb25uZWN0aW9uIDogcHVibGljIElQQzo6 TWVzc2FnZVNlbmRlciwgcHVibGljIElQQzo6TWVzc2FnZVJlY2VpdmVyIHsKICAgICBXVEZfTUFL RV9GQVNUX0FMTE9DQVRFRDsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlByb2Nlc3NQb29sLmNwcCBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29s LmNwcAppbmRleCA0YjE5YjBkMWQzYzEuLmYxMTZmZTI5YzhiMiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv VUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmNwcApAQCAtMTExNCw3ICsxMTE0LDYgQEAgUmVmPFdl YlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Bvb2w6OnByb2Nlc3NGb3JSZWdpc3RyYWJsZURvbWFp bihXZWJzaXRlRGF0YVN0b3IKICAgICByZXR1cm4gY3JlYXRlTmV3V2ViUHJvY2Vzcygmd2Vic2l0 ZURhdGFTdG9yZSwgY2FwdGl2ZVBvcnRhbE1vZGUpOwogfQogCi0jaWYgRU5BQkxFKFNFUlZJQ0Vf V09SS0VSKQogVXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllciBXZWJQcm9jZXNzUG9vbDo6 dXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllckZvcldvcmtlcnMoKQogewogICAgIGlmICgh bV91c2VyQ29udGVudENvbnRyb2xsZXJGb3JXb3JrZXJzKQpAQCAtMTEyMiw3ICsxMTIxLDYgQEAg VXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllciBXZWJQcm9jZXNzUG9vbDo6dXNlckNvbnRl bnRDb250cm9sbGVySWRlbnRpZmllckYKIAogICAgIHJldHVybiBtX3VzZXJDb250ZW50Q29udHJv bGxlckZvcldvcmtlcnMtPmlkZW50aWZpZXIoKTsKIH0KLSNlbmRpZgogCiBSZWY8V2ViUGFnZVBy b3h5PiBXZWJQcm9jZXNzUG9vbDo6Y3JlYXRlV2ViUGFnZShQYWdlQ2xpZW50JiBwYWdlQ2xpZW50 LCBSZWY8QVBJOjpQYWdlQ29uZmlndXJhdGlvbj4mJiBwYWdlQ29uZmlndXJhdGlvbikKIHsKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmggYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oCmluZGV4IGU3MGI2ZjQyOWY3Yy4u Y2IzODk2ZGViZTNhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9j ZXNzUG9vbC5oCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgK QEAgLTM3OSwxMyArMzc5LDEzIEBAIHB1YmxpYzoKICNpZiBFTkFCTEUoU0VSVklDRV9XT1JLRVIp CiAgICAgc3RhdGljIHZvaWQgZXN0YWJsaXNoU2VydmljZVdvcmtlckNvbnRleHRDb25uZWN0aW9u VG9OZXR3b3JrUHJvY2VzcyhXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbiYmLCBzdGQ6Om9wdGlv bmFsPFdlYkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbnRleHRJZGVudGlmaWVyPiBzZXJ2aWNlV29y a2VyUGFnZUlkZW50aWZpZXIsIFBBTDo6U2Vzc2lvbklELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lk KCk+JiYpOwogICAgIHNpemVfdCBzZXJ2aWNlV29ya2VyUHJveGllc0NvdW50KCkgY29uc3Q7Ci0g ICAgVXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllciB1c2VyQ29udGVudENvbnRyb2xsZXJJ ZGVudGlmaWVyRm9yV29ya2VycygpOwogICAgIGJvb2wgaGFzU2VydmljZVdvcmtlckZvcmVncm91 bmRBY3Rpdml0eUZvclRlc3RpbmcoKSBjb25zdDsKICAgICBib29sIGhhc1NlcnZpY2VXb3JrZXJC YWNrZ3JvdW5kQWN0aXZpdHlGb3JUZXN0aW5nKCkgY29uc3Q7CiAjZW5kaWYKICAgICB2b2lkIHNl cnZpY2VXb3JrZXJQcm9jZXNzQ3Jhc2hlZChXZWJQcm9jZXNzUHJveHkmKTsKIAogICAgIHZvaWQg dXBkYXRlV29ya2VyVXNlckFnZW50KGNvbnN0IFN0cmluZyYgdXNlckFnZW50KTsKKyAgICBVc2Vy Q29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyIHVzZXJDb250ZW50Q29udHJvbGxlcklkZW50aWZp ZXJGb3JXb3JrZXJzKCk7CiAgICAgc3RhdGljIHZvaWQgZXN0YWJsaXNoU2hhcmVkV29ya2VyQ29u dGV4dENvbm5lY3Rpb25Ub05ldHdvcmtQcm9jZXNzKFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWlu JiYsIFBBTDo6U2Vzc2lvbklELCBDb21wbGV0aW9uSGFuZGxlcjx2b2lkKCk+JiYpOwogCiAjaWYg UExBVEZPUk0oQ09DT0EpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQ cm9jZXNzUHJveHkuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5 LmNwcAppbmRleCBiNzQ2YTdkN2QyMTcuLmY0NjY5MjQ5YTMzMSAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Byb3h5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0 L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCkBAIC0xODIsNyArMTgyLDYgQEAgUmVmPFdl YlByb2Nlc3NQcm94eT4gV2ViUHJvY2Vzc1Byb3h5OjpjcmVhdGUoV2ViUHJvY2Vzc1Bvb2wmIHBy b2Nlc3NQb29sLCBXZWJzaXQKICAgICByZXR1cm4gcHJveHk7CiB9CiAKLSNpZiBFTkFCTEUoU0VS VklDRV9XT1JLRVIpCiBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNzUHJveHk6OmNyZWF0 ZUZvcldvcmtlcnMoV29ya2VyVHlwZSB3b3JrZXJUeXBlLCBXZWJQcm9jZXNzUG9vbCYgcHJvY2Vz c1Bvb2wsIFJlZ2lzdHJhYmxlRG9tYWluJiYgcmVnaXN0cmFibGVEb21haW4sIFdlYnNpdGVEYXRh U3RvcmUmIHdlYnNpdGVEYXRhU3RvcmUpCiB7CiAgICAgYXV0byBwcm94eSA9IGFkb3B0UmVmKCpu ZXcgV2ViUHJvY2Vzc1Byb3h5KHByb2Nlc3NQb29sLCAmd2Vic2l0ZURhdGFTdG9yZSwgSXNQcmV3 YXJtZWQ6Ok5vLCBDcm9zc09yaWdpbk1vZGU6OlNoYXJlZCwgQ2FwdGl2ZVBvcnRhbE1vZGU6OkRp c2FibGVkKSk7CkBAIC0xOTEsNyArMTkwLDYgQEAgUmVmPFdlYlByb2Nlc3NQcm94eT4gV2ViUHJv Y2Vzc1Byb3h5OjpjcmVhdGVGb3JXb3JrZXJzKFdvcmtlclR5cGUgd29ya2VyVHlwZSwgV2UKICAg ICBwcm94eS0+Y29ubmVjdCgpOwogICAgIHJldHVybiBwcm94eTsKIH0KLSNlbmRpZgogCiAjaWYg UExBVEZPUk0oQ09DT0EpICYmIEVOQUJMRShNRURJQV9TVFJFQU0pCiBjbGFzcyBVSVByb3h5Rm9y Q2FwdHVyZSBmaW5hbCA6IHB1YmxpYyBVc2VyTWVkaWFDYXB0dXJlTWFuYWdlclByb3h5OjpDb25u ZWN0aW9uUHJveHkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9X ZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNoYXJlZFdvcmtlckNvbnRleHRNYW5hZ2VyQ29u bmVjdGlvbi5jcHAKaW5kZXggODQzMDY0NzY2NWZhLi44MTUyMTZhY2RjZTMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9TdG9yYWdlL1dlYlNoYXJlZFdvcmtlckNvbnRleHRN YW5hZ2VyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3Jh Z2UvV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uLmNwcApAQCAtNTksNyAr NTksNyBAQCBXZWJTaGFyZWRXb3JrZXJDb250ZXh0TWFuYWdlckNvbm5lY3Rpb246OldlYlNoYXJl ZFdvcmtlckNvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbgogI2lmIFBMQVRGT1JNKENPQ09BKQogICAg ICwgbV91c2VyQWdlbnQoV2ViQ29yZTo6c3RhbmRhcmRVc2VyQWdlbnRXaXRoQXBwbGljYXRpb25O YW1lKHsgfSkpCiAjZWxzZQotICAgICwgbV91c2VyQWdlbnQoc3RhbmRhcmRVc2VyQWdlbnQoKSkK KyAgICAsIG1fdXNlckFnZW50KFdlYkNvcmU6OnN0YW5kYXJkVXNlckFnZW50KCkpCiAjZW5kaWYK ICAgICAsIG1fdXNlckNvbnRlbnRDb250cm9sbGVyKFdlYlVzZXJDb250ZW50Q29udHJvbGxlcjo6 Z2V0T3JDcmVhdGUoaW5pdGlhbGl6YXRpb25EYXRhLnVzZXJDb250ZW50Q29udHJvbGxlcklkZW50 aWZpZXIpKQogewo= 451307 2022-02-08 14:46:18 -0800 2022-02-08 16:36:37 -0800 Patch Patch text/plain 6334 jigen.zhou ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFu Z2VMb2cKaW5kZXggN2RlZjI3NGZhZTJmLi40OTdhNDcwOWZiYjAgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjIgQEAKKzIwMjItMDItMDggIEppZ2VuIFpob3UgIDxqaWdlbi56aG91QHNvbnkuY29tPgor CisgICAgICAgIFtQbGF5c3RhdGlvbl0gRml4IGJ1aWxkIGJyZWFrIGFmdGVyIHIyODkyNDcgaWYg RU5BQkxFX1NFUlZJQ0VfV09SS0VSIGlzIG9mZgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM2MzIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVW5yZXZpZXdlZCwgYnVpbGQgZml4IGZvciBwbGF5c3RhdGlv biBwbGF0Zm9ybSBhZnRlciByMjg5MjQ3IGZvciBzdXBwb3J0IG9mIHNoYXJpbmcgU2hhcmVkIFdv cmtlcnMuCisgICAgICAgIFRoaXMgcGF0Y2ggcmVzb2x2ZXMgY29tcGlsaW5nIGVycm9ycyBjYXVz ZWQgYnkgdW5rbm93IHR5cGUgbmFtZSBhbmQgdW5kZWNsYXJlZCBpZGVudGlmaWVycywgCisgICAg ICAgIGFuZCBpdCBhbHNvIGZpeGVzIGxpbmtpbmcgZXJyb3IgYnkgbWFraW5nIG1ldGhvZHMgV2Vi UHJvY2Vzc1Byb3h5OjpjcmVhdGVGb3JXb3JrZXJzIGFuZAorICAgICAgICBXZWJQcm9jZXNzUG9v bDo6dXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllckZvcldvcmtlcnMoKSBhdmFpbGFibGUg d2hlbiBFTkFCTEVfU0VSVklDRV9XT1JLRVIgaXMgb2ZmCisKKyAgICAgICAgKiBOZXR3b3JrUHJv Y2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyLmg6CisgICAgICAgICogTmV0 d29ya1Byb2Nlc3MvU2hhcmVkV29ya2VyL1dlYlNoYXJlZFdvcmtlclNlcnZlckNvbm5lY3Rpb24u aDoKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwOgorICAgICAgICAqIFVJ UHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5oOgorICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQcm9jZXNz UHJveHkuY3BwOgorICAgICAgICAqIFdlYlByb2Nlc3MvU3RvcmFnZS9XZWJTaGFyZWRXb3JrZXJD b250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwOgorCiAyMDIyLTAyLTA4ICBDaHJpcyBEdW1leiAg PGNkdW1lekBhcHBsZS5jb20+CiAKICAgICAgICAgaHR0cC90ZXN0cy9jYWNoZS1zdG9yYWdlL2Nh Y2hlLW9yaWdpbnMuaHR0cHMuaHRtbCBpcyBmbGFreQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2VydmVyLmggYi9T b3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJT ZXJ2ZXIuaAppbmRleCBkMmQ4MDM4MDkzNmQuLjE5NmMxMjkzMWZlYiAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2ViU2hhcmVkV29ya2VyU2Vy dmVyLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TaGFyZWRXb3JrZXIvV2Vi U2hhcmVkV29ya2VyU2VydmVyLmgKQEAgLTMyLDYgKzMyLDEwIEBACiAjaW5jbHVkZSA8V2ViQ29y ZS9UcmFuc2ZlcnJlZE1lc3NhZ2VQb3J0Lmg+CiAjaW5jbHVkZSA8d3RmL1dlYWtQdHIuaD4KIAor bmFtZXNwYWNlIFBBTCB7CitjbGFzcyBTZXNzaW9uSUQ7Cit9CisKIG5hbWVzcGFjZSBXZWJDb3Jl IHsKIGNsYXNzIFJlZ2lzdHJhYmxlRG9tYWluOwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJDb25uZWN0 aW9uLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFy ZWRXb3JrZXJTZXJ2ZXJDb25uZWN0aW9uLmgKaW5kZXggZmQxNjliY2Y2NDk4Li5lMTllMzQ1ZDFj OTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2hhcmVkV29ya2Vy L1dlYlNoYXJlZFdvcmtlclNlcnZlckNvbm5lY3Rpb24uaAorKysgYi9Tb3VyY2UvV2ViS2l0L05l dHdvcmtQcm9jZXNzL1NoYXJlZFdvcmtlci9XZWJTaGFyZWRXb3JrZXJTZXJ2ZXJDb25uZWN0aW9u LmgKQEAgLTQzLDYgKzQzLDcgQEAgY2xhc3MgTmV0d29ya1Nlc3Npb247CiBjbGFzcyBXZWJTaGFy ZWRXb3JrZXI7CiBjbGFzcyBXZWJTaGFyZWRXb3JrZXJTZXJ2ZXI7CiBjbGFzcyBXZWJTaGFyZWRX b3JrZXJTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uOworY2xhc3MgTmV0d29ya1Nlc3Npb247CiAK IGNsYXNzIFdlYlNoYXJlZFdvcmtlclNlcnZlckNvbm5lY3Rpb24gOiBwdWJsaWMgSVBDOjpNZXNz YWdlU2VuZGVyLCBwdWJsaWMgSVBDOjpNZXNzYWdlUmVjZWl2ZXIgewogICAgIFdURl9NQUtFX0ZB U1RfQUxMT0NBVEVEOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJv Y2Vzc1Bvb2wuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3Bw CmluZGV4IDRiMTliMGQxZDNjMS4uZjExNmZlMjljOGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUG9vbC5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVBy b2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuY3BwCkBAIC0xMTE0LDcgKzExMTQsNiBAQCBSZWY8V2ViUHJv Y2Vzc1Byb3h5PiBXZWJQcm9jZXNzUG9vbDo6cHJvY2Vzc0ZvclJlZ2lzdHJhYmxlRG9tYWluKFdl YnNpdGVEYXRhU3RvcgogICAgIHJldHVybiBjcmVhdGVOZXdXZWJQcm9jZXNzKCZ3ZWJzaXRlRGF0 YVN0b3JlLCBjYXB0aXZlUG9ydGFsTW9kZSk7CiB9CiAKLSNpZiBFTkFCTEUoU0VSVklDRV9XT1JL RVIpCiBVc2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyIFdlYlByb2Nlc3NQb29sOjp1c2Vy Q29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyRm9yV29ya2VycygpCiB7CiAgICAgaWYgKCFtX3Vz ZXJDb250ZW50Q29udHJvbGxlckZvcldvcmtlcnMpCkBAIC0xMTIyLDcgKzExMjEsNiBAQCBVc2Vy Q29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyIFdlYlByb2Nlc3NQb29sOjp1c2VyQ29udGVudENv bnRyb2xsZXJJZGVudGlmaWVyRgogCiAgICAgcmV0dXJuIG1fdXNlckNvbnRlbnRDb250cm9sbGVy Rm9yV29ya2Vycy0+aWRlbnRpZmllcigpOwogfQotI2VuZGlmCiAKIFJlZjxXZWJQYWdlUHJveHk+ IFdlYlByb2Nlc3NQb29sOjpjcmVhdGVXZWJQYWdlKFBhZ2VDbGllbnQmIHBhZ2VDbGllbnQsIFJl ZjxBUEk6OlBhZ2VDb25maWd1cmF0aW9uPiYmIHBhZ2VDb25maWd1cmF0aW9uKQogewpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaCBiL1NvdXJjZS9X ZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQb29sLmgKaW5kZXggZTcwYjZmNDI5ZjdjLi5jYjM4 OTZkZWJlM2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nlc3NQ b29sLmgKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUHJvY2Vzc1Bvb2wuaApAQCAt Mzc5LDEzICszNzksMTMgQEAgcHVibGljOgogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikKICAg ICBzdGF0aWMgdm9pZCBlc3RhYmxpc2hTZXJ2aWNlV29ya2VyQ29udGV4dENvbm5lY3Rpb25Ub05l dHdvcmtQcm9jZXNzKFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluJiYsIHN0ZDo6b3B0aW9uYWw8 V2ViQ29yZTo6U2NyaXB0RXhlY3V0aW9uQ29udGV4dElkZW50aWZpZXI+IHNlcnZpY2VXb3JrZXJQ YWdlSWRlbnRpZmllciwgUEFMOjpTZXNzaW9uSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4m Jik7CiAgICAgc2l6ZV90IHNlcnZpY2VXb3JrZXJQcm94aWVzQ291bnQoKSBjb25zdDsKLSAgICBV c2VyQ29udGVudENvbnRyb2xsZXJJZGVudGlmaWVyIHVzZXJDb250ZW50Q29udHJvbGxlcklkZW50 aWZpZXJGb3JXb3JrZXJzKCk7CiAgICAgYm9vbCBoYXNTZXJ2aWNlV29ya2VyRm9yZWdyb3VuZEFj dGl2aXR5Rm9yVGVzdGluZygpIGNvbnN0OwogICAgIGJvb2wgaGFzU2VydmljZVdvcmtlckJhY2tn cm91bmRBY3Rpdml0eUZvclRlc3RpbmcoKSBjb25zdDsKICNlbmRpZgogICAgIHZvaWQgc2Vydmlj ZVdvcmtlclByb2Nlc3NDcmFzaGVkKFdlYlByb2Nlc3NQcm94eSYpOwogCiAgICAgdm9pZCB1cGRh dGVXb3JrZXJVc2VyQWdlbnQoY29uc3QgU3RyaW5nJiB1c2VyQWdlbnQpOworICAgIFVzZXJDb250 ZW50Q29udHJvbGxlcklkZW50aWZpZXIgdXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmllckZv cldvcmtlcnMoKTsKICAgICBzdGF0aWMgdm9pZCBlc3RhYmxpc2hTaGFyZWRXb3JrZXJDb250ZXh0 Q29ubmVjdGlvblRvTmV0d29ya1Byb2Nlc3MoV2ViQ29yZTo6UmVnaXN0cmFibGVEb21haW4mJiwg UEFMOjpTZXNzaW9uSUQsIENvbXBsZXRpb25IYW5kbGVyPHZvaWQoKT4mJik7CiAKICNpZiBQTEFU Rk9STShDT0NPQSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlByb2Nl c3NQcm94eS5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3Bw CmluZGV4IGI3NDZhN2Q3ZDIxNy4uZjQ2NjkyNDlhMzMxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9XZWJQcm9jZXNzUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvVUlQ cm9jZXNzL1dlYlByb2Nlc3NQcm94eS5jcHAKQEAgLTE4Miw3ICsxODIsNiBAQCBSZWY8V2ViUHJv Y2Vzc1Byb3h5PiBXZWJQcm9jZXNzUHJveHk6OmNyZWF0ZShXZWJQcm9jZXNzUG9vbCYgcHJvY2Vz c1Bvb2wsIFdlYnNpdAogICAgIHJldHVybiBwcm94eTsKIH0KIAotI2lmIEVOQUJMRShTRVJWSUNF X1dPUktFUikKIFJlZjxXZWJQcm9jZXNzUHJveHk+IFdlYlByb2Nlc3NQcm94eTo6Y3JlYXRlRm9y V29ya2VycyhXb3JrZXJUeXBlIHdvcmtlclR5cGUsIFdlYlByb2Nlc3NQb29sJiBwcm9jZXNzUG9v bCwgUmVnaXN0cmFibGVEb21haW4mJiByZWdpc3RyYWJsZURvbWFpbiwgV2Vic2l0ZURhdGFTdG9y ZSYgd2Vic2l0ZURhdGFTdG9yZSkKIHsKICAgICBhdXRvIHByb3h5ID0gYWRvcHRSZWYoKm5ldyBX ZWJQcm9jZXNzUHJveHkocHJvY2Vzc1Bvb2wsICZ3ZWJzaXRlRGF0YVN0b3JlLCBJc1ByZXdhcm1l ZDo6Tm8sIENyb3NzT3JpZ2luTW9kZTo6U2hhcmVkLCBDYXB0aXZlUG9ydGFsTW9kZTo6RGlzYWJs ZWQpKTsKQEAgLTE5MSw3ICsxOTAsNiBAQCBSZWY8V2ViUHJvY2Vzc1Byb3h5PiBXZWJQcm9jZXNz UHJveHk6OmNyZWF0ZUZvcldvcmtlcnMoV29ya2VyVHlwZSB3b3JrZXJUeXBlLCBXZQogICAgIHBy b3h5LT5jb25uZWN0KCk7CiAgICAgcmV0dXJuIHByb3h5OwogfQotI2VuZGlmCiAKICNpZiBQTEFU Rk9STShDT0NPQSkgJiYgRU5BQkxFKE1FRElBX1NUUkVBTSkKIGNsYXNzIFVJUHJveHlGb3JDYXB0 dXJlIGZpbmFsIDogcHVibGljIFVzZXJNZWRpYUNhcHR1cmVNYW5hZ2VyUHJveHk6OkNvbm5lY3Rp b25Qcm94eSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9X ZWJTaGFyZWRXb3JrZXJDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktp dC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uLmNwcAppbmRleCA4NDMwNjQ3NjY1ZmEuLjgxNTIxNmFjZGNlMyAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9XZWJQcm9jZXNzL1N0b3JhZ2UvV2ViU2hhcmVkV29ya2VyQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvU3RvcmFnZS9X ZWJTaGFyZWRXb3JrZXJDb250ZXh0TWFuYWdlckNvbm5lY3Rpb24uY3BwCkBAIC01OSw3ICs1OSw3 IEBAIFdlYlNoYXJlZFdvcmtlckNvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6V2ViU2hhcmVkV29y a2VyQ29udGV4dE1hbmFnZXJDb25uZWN0aW9uCiAjaWYgUExBVEZPUk0oQ09DT0EpCiAgICAgLCBt X3VzZXJBZ2VudChXZWJDb3JlOjpzdGFuZGFyZFVzZXJBZ2VudFdpdGhBcHBsaWNhdGlvbk5hbWUo eyB9KSkKICNlbHNlCi0gICAgLCBtX3VzZXJBZ2VudChzdGFuZGFyZFVzZXJBZ2VudCgpKQorICAg ICwgbV91c2VyQWdlbnQoV2ViQ29yZTo6c3RhbmRhcmRVc2VyQWdlbnQoKSkKICNlbmRpZgogICAg ICwgbV91c2VyQ29udGVudENvbnRyb2xsZXIoV2ViVXNlckNvbnRlbnRDb250cm9sbGVyOjpnZXRP ckNyZWF0ZShpbml0aWFsaXphdGlvbkRhdGEudXNlckNvbnRlbnRDb250cm9sbGVySWRlbnRpZmll cikpCiB7Cg==