211244 2020-04-30 11:58:34 -0700 Web Inspector: Worker: should use the name of the worker if it exists 2020-05-04 12:52:21 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 hi hi bburg ews-watchlist hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff saam tzagallo webkit-bug-importer oldest_to_newest 1647468 0 hi 2020-04-30 11:58:34 -0700 test.html ``` let worker = new Worker("worker.js", {name: "My Worker"}); ``` worker.js ``` console.log(self.name); ``` 1647515 1 398084 hi 2020-04-30 13:09:59 -0700 Created attachment 398084 Patch 1647516 2 ews-watchlist 2020-04-30 13:10:42 -0700 This patch modifies the inspector protocol. Please ensure that any frontend changes appropriately use feature checks for new protocol features. 1648125 3 398084 bburg 2020-05-01 15:59:55 -0700 Comment on attachment 398084 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=398084&action=review r=me great cleanup! Please investigate Windows EWS failure: C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\ForwardingHeaders\JavaScriptCore/InspectorFrontendDispatchers.h(351,10): message : see declaration of 'Inspector::WorkerFrontendDispatcher::workerCreated' (compiling source file C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\WebCore\unified-sources\UnifiedSource-84c9f43f-6.cpp) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] > LayoutTests/inspector/worker/runtime-basic-expected.txt:13 > Target - Page - location and href - Location: inspector/worker/runtime-basic.html > Very nice! 1648629 4 hi 2020-05-04 11:16:49 -0700 (In reply to Brian Burg from comment #3) > Please investigate Windows EWS failure: > > C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\ForwardingHeaders\JavaScriptCore/InspectorFrontendDispatchers.h(351,10): message : see declaration of 'Inspector::WorkerFrontendDispatcher::workerCreated' (compiling source file C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\DerivedSources\WebCore\unified-sources\UnifiedSource-84c9f43f-6.cpp) [C:\cygwin\home\buildbot\worker\Windows-EWS\build\WebKitBuild\Release\Source\WebCore\WebCore.vcxproj] The windows bot doesn't seem to update/regenerate DerivedSources properly. This has happened a bunch of times when I've made changes to the protocol. A clean build has always fixed the issue. 1648642 5 hi 2020-05-04 11:39:00 -0700 *** Bug 164678 has been marked as a duplicate of this bug. *** 1648684 6 ews-feeder 2020-05-04 12:51:33 -0700 Committed r261104: <https://trac.webkit.org/changeset/261104> All reviewed patches have been landed. Closing bug and clearing flags on attachment 398084. 1648686 7 webkit-bug-importer 2020-05-04 12:52:21 -0700 <rdar://problem/62857411> 398084 2020-04-30 13:09:59 -0700 2020-05-04 12:51:34 -0700 Patch bug-211244-20200430140958.patch text/plain 29731 hi ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDJiNmM5ZTBiMjBlOTA4N2NiOTZiN2UxMjVlYmQ2 ZGRiMjZjNGI4NGYuLmViM2U4MWZjNDVmZTg1NmM5NjQ0YzRmNDIzNzFlODViM2M4ZDlhZDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0ph dmFTY3JpcHRDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA0LTMwICBEZXZp biBSb3Vzc28gIDxkcm91c3NvQGFwcGxlLmNvbT4KKworICAgICAgICBXZWIgSW5zcGVjdG9yOiBX b3JrZXI6IHNob3VsZCB1c2UgdGhlIG5hbWUgb2YgdGhlIHdvcmtlciBpZiBpdCBleGlzdHMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMTI0NAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L3Byb3RvY29sL1dvcmtlci5qc29uOgorICAgICAgICBJbmNsdWRlIHRoZSBgbmFtZWAgaW4gYFdv cmtlci53b3JrZXJDcmVhdGVkYC4KKwogMjAyMC0wNC0yOSAgUm9zcyBLaXJzbGluZyAgPHJvc3Mu a2lyc2xpbmdAc29ueS5jb20+CiAKICAgICAgICAgRW5zdXJlIEludGwgY2xhc3NlcyBkb24ndCBo YXZlIG5hbWluZyBjb25mbGljdHMgd2l0aCB1bmlmaWVkIGJ1aWxkcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCmluZGV4IGJj MzkzOGViNDRhY2E1ZWIzZWJhNTBiMGYyZGIzYTQ2MTk2ODdlOWEuLjM5MTFkN2Y5MWRkOGUzZjg0 NDNlNGI5OTQ3OTJhNGU5N2JlMTg3YjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyArMSw0NCBAQAorMjAy MC0wNC0zMCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2Vi IEluc3BlY3RvcjogV29ya2VyOiBzaG91bGQgdXNlIHRoZSBuYW1lIG9mIHRoZSB3b3JrZXIgaWYg aXQgZXhpc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMTEyNDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBUZXN0OiBpbnNwZWN0b3Ivd29ya2VyL3J1bnRpbWUtYmFzaWMuaHRtbAorCisgICAgICAgIFBh c3MgdGhlIGBuYW1lYCBmcm9tIHRoZSBgV29ya2VyT3B0aW9uc2AgZ2l2ZW4gdG8gdGhlIGBXb3Jr ZXJgIHdoZW4gaXQncyBjb25zdHJ1Y3RlZCB0byBXZWIKKyAgICAgICAgSW5zcGVjdG9yIHNvIGl0 IGNhbiBiZSB1c2VkIGluIHRoZSBmcm9udGVuZCBVSS4KKworICAgICAgICBEcml2ZS1ieTogcmVw bGFjZSBsb3RzIG9mIHBvaW50ZXJzIHdpdGggcmVmZXJlbmNlcy4KKworICAgICAgICAqIHdvcmtl cnMvV29ya2VyTWVzc2FnaW5nUHJveHkuY3BwOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VyTWVz c2FnaW5nUHJveHk6OnN0YXJ0V29ya2VyR2xvYmFsU2NvcGUpOgorCisgICAgICAgICogd29ya2Vy cy9Xb3JrZXJJbnNwZWN0b3JQcm94eS5oOgorICAgICAgICAoV2ViQ29yZTo6V29ya2VySW5zcGVj dG9yUHJveHk6Om5hbWUgY29uc3QpOiBBZGRlZC4KKyAgICAgICAgKiB3b3JrZXJzL1dvcmtlcklu c3BlY3RvclByb3h5LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtlckluc3BlY3RvclByb3h5 Ojp3b3JrZXJTdGFydGVkKToKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtlckluc3BlY3RvclByb3h5 Ojp3b3JrZXJUZXJtaW5hdGVkKToKKyAgICAgICAgKFdlYkNvcmU6Oldvcmtlckluc3BlY3RvclBy b3h5Ojpjb25uZWN0VG9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKToKKyAgICAgICAgKFdlYkNv cmU6Oldvcmtlckluc3BlY3RvclByb3h5OjpzZW5kTWVzc2FnZUZyb21Xb3JrZXJUb0Zyb250ZW5k KToKKworICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaDoKKyAg ICAgICAgKFdlYkNvcmU6Okluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyU3RhcnRlZCk6 CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndvcmtlclRlcm1p bmF0ZWQpOgorICAgICAgICAqIGluc3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3Bw OgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3b3JrZXJTdGFy dGVkSW1wbCk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246Ondv cmtlclRlcm1pbmF0ZWRJbXBsKToKKworICAgICAgICAqIGluc3BlY3Rvci9hZ2VudHMvSW5zcGVj dG9yV29ya2VyQWdlbnQuaDoKKyAgICAgICAgKiBpbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvcldv cmtlckFnZW50LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6Okluc3BlY3RvcldvcmtlckFnZW50Ojpz ZW5kTWVzc2FnZUZyb21Xb3JrZXJUb0Zyb250ZW5kKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvcldvcmtlckFnZW50Ojp3b3JrZXJTdGFydGVkKToKKyAgICAgICAgKFdlYkNvcmU6Okluc3Bl Y3RvcldvcmtlckFnZW50Ojp3b3JrZXJUZXJtaW5hdGVkKToKKyAgICAgICAgKFdlYkNvcmU6Oklu c3BlY3RvcldvcmtlckFnZW50Ojpjb25uZWN0VG9BbGxXb3JrZXJJbnNwZWN0b3JQcm94aWVzRm9y UGFnZSk6CisgICAgICAgIChXZWJDb3JlOjpJbnNwZWN0b3JXb3JrZXJBZ2VudDo6Y29ubmVjdFRv V29ya2VySW5zcGVjdG9yUHJveHkpOgorICAgICAgICAoV2ViQ29yZTo6SW5zcGVjdG9yV29ya2Vy QWdlbnQ6OmRpc2Nvbm5lY3RGcm9tV29ya2VySW5zcGVjdG9yUHJveHkpOgorCiAyMDIwLTA0LTMw ICBBbmRyZXMgR29uemFsZXogIDxhbmRyZXNnXzIyQGFwcGxlLmNvbT4KIAogICAgICAgICBGaXgg Zm9yIGNyYXNoIGluIEFYTG9nZ2VyLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJ L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKaW5kZXggYWQxNDIy M2UwNThlZGU4MzFmN2YzNDZiOWRhNjgyMzMxNjg3YzdhOC4uMmNhNDM0MTBhMWMyYTJlZWQ4ZDY0 YzYwMjFlM2Y2MzM5ZjgyYWNjNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MjggQEAKKzIwMjAtMDQtMzAgIERldmluIFJvdXNzbyAgPGRyb3Vzc29AYXBwbGUuY29tPgorCisg ICAgICAgIFdlYiBJbnNwZWN0b3I6IFdvcmtlcjogc2hvdWxkIHVzZSB0aGUgbmFtZSBvZiB0aGUg d29ya2VyIGlmIGl0IGV4aXN0cworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9MjExMjQ0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Byb3RvY29sL1dvcmtlck9ic2VydmVyLmpzOgor ICAgICAgICAoV0kuV29ya2VyT2JzZXJ2ZXIucHJvdG90eXBlLndvcmtlckNyZWF0ZWQpOgorICAg ICAgICAqIFVzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvV29ya2VyTWFuYWdlci5qczoKKyAgICAg ICAgKFdJLldvcmtlck1hbmFnZXIucHJvdG90eXBlLndvcmtlckNyZWF0ZWQpOgorICAgICAgICAq IFVzZXJJbnRlcmZhY2UvUHJvdG9jb2wvV29ya2VyVGFyZ2V0LmpzOgorICAgICAgICAoV0kuV29y a2VyVGFyZ2V0KToKKyAgICAgICAgKFdJLldvcmtlclRhcmdldC5wcm90b3R5cGUuZ2V0IGN1c3Rv bU5hbWUpOiBBZGRlZC4KKyAgICAgICAgKFdJLldvcmtlclRhcmdldC5wcm90b3R5cGUuZ2V0IGRp c3BsYXlOYW1lKToKKyAgICAgICAgKFdJLldvcmtlclRhcmdldC5wcm90b3R5cGUuZ2V0IGRpc3Bs YXlVUkwpOiBBZGRlZC4KKyAgICAgICAgVXNlIHRoZSBgbmFtZWAgZnJvbSB0aGUgYFdvcmtlck9w dGlvbnNgIGdpdmVuIHRvIHRoZSBgV29ya2VyYCB3aGVuIGl0J3MgY29uc3RydWN0ZWQgYXMgdGhl CisgICAgICAgIGBkaXNwbGF5TmFtZWAgb2YgdGhlIGBXSS5Xb3JrZXJUYXJnZXRgIGlmIGFibGUu IEFsc28gZXhwb3NlZCB2aWEgYGdldCBjdXN0b21OYW1lYC4KKworICAgICAgICAqIFVzZXJJbnRl cmZhY2UvVmlld3MvU2NyaXB0VHJlZUVsZW1lbnQuanM6CisgICAgICAgIChXSS5TY3JpcHRUcmVl RWxlbWVudCk6CisgICAgICAgICogVXNlckludGVyZmFjZS9WaWV3cy9Xb3JrZXJUcmVlRWxlbWVu dC5qczoKKyAgICAgICAgKFdJLldvcmtlclRyZWVFbGVtZW50KToKKyAgICAgICAgQWNjZXB0IGFu IGBvcHRpb25zYCBvcHRpb25hbCBvYmplY3QgdGhhdCBjYW4gYmUgdXNlZCB0byBvdmVycmlkZSB0 aGUgYG1haW5UaXRsZWAuCisKIDIwMjAtMDQtMzAgIENocmlzdG9waGVyIFJlaWQgIDxjaHJpcy5y ZWlkQHNvbnkuY29tPgogCiAgICAgICAgIFtDTWFrZV0gRG9uJ3QgY29weSBpbnNwZWN0b3IgcmVz b3VyY2VzIGluIGV2ZXJ5IGluY3JlbWVudGFsIGJ1aWxkCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvaW5zcGVjdG9yL3Byb3RvY29sL1dvcmtlci5qc29uIGIvU291cmNlL0phdmFT Y3JpcHRDb3JlL2luc3BlY3Rvci9wcm90b2NvbC9Xb3JrZXIuanNvbgppbmRleCA5ZTJiZWU5MTNk MzdjNzlmZWRiYjkxODE3NmE0MzAyMmI4NGZhNDViLi42Mzg2MTI0MTM0NjZlZmM4N2I3MzdlOGE4 MTA0MmVkMDdjYTEyNzAzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvaW5zcGVj dG9yL3Byb3RvY29sL1dvcmtlci5qc29uCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNw ZWN0b3IvcHJvdG9jb2wvV29ya2VyLmpzb24KQEAgLTMyLDcgKzMyLDggQEAKICAgICAgICAgICAg ICJuYW1lIjogIndvcmtlckNyZWF0ZWQiLAogICAgICAgICAgICAgInBhcmFtZXRlcnMiOiBbCiAg ICAgICAgICAgICAgICAgeyAibmFtZSI6ICJ3b3JrZXJJZCIsICJ0eXBlIjogInN0cmluZyIgfSwK LSAgICAgICAgICAgICAgICB7ICJuYW1lIjogInVybCIsICJ0eXBlIjogInN0cmluZyIgfQorICAg ICAgICAgICAgICAgIHsgIm5hbWUiOiAidXJsIiwgInR5cGUiOiAic3RyaW5nIiB9LAorICAgICAg ICAgICAgICAgIHsgIm5hbWUiOiAibmFtZSIsICJ0eXBlIjogInN0cmluZyIgfQogICAgICAgICAg ICAgXQogICAgICAgICB9LAogICAgICAgICB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2lu c3BlY3Rvci9JbnNwZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCmluZGV4IDdhMzg2YTcyZWRiOTg1 ODk4NzU4YzM3MDFiZmUxMjBkZTk0NTI1NWUuLjBjNDQyZWU5MDg4NzdkMjA2N2Q2NWU4NzQ0MTY1 MmE4Y2YwMGM4OGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNwZWN0 b3JJbnN0cnVtZW50YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JJbnN0cnVtZW50YXRpb24uY3BwCkBAIC05NzksMTMgKzk3OSwxMyBAQCBib29sIEluc3Bl Y3Rvckluc3RydW1lbnRhdGlvbjo6c2hvdWxkV2FpdEZvckRlYnVnZ2VyT25TdGFydEltcGwoSW5z dHJ1bWVudGluZ0FnZQogICAgIHJldHVybiBmYWxzZTsKIH0KIAotdm9pZCBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OndvcmtlclN0YXJ0ZWRJbXBsKEluc3RydW1lbnRpbmdBZ2VudHMmIGluc3Ry dW1lbnRpbmdBZ2VudHMsIFdvcmtlckluc3BlY3RvclByb3h5KiBwcm94eSwgY29uc3QgVVJMJiB1 cmwpCit2b2lkIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyU3RhcnRlZEltcGwoSW5z dHJ1bWVudGluZ0FnZW50cyYgaW5zdHJ1bWVudGluZ0FnZW50cywgV29ya2VySW5zcGVjdG9yUHJv eHkmIHByb3h5KQogewogICAgIGlmIChJbnNwZWN0b3JXb3JrZXJBZ2VudCogd29ya2VyQWdlbnQg PSBpbnN0cnVtZW50aW5nQWdlbnRzLmluc3BlY3RvcldvcmtlckFnZW50KCkpCi0gICAgICAgIHdv cmtlckFnZW50LT53b3JrZXJTdGFydGVkKHByb3h5LCB1cmwpOworICAgICAgICB3b3JrZXJBZ2Vu dC0+d29ya2VyU3RhcnRlZChwcm94eSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uOjp3b3JrZXJUZXJtaW5hdGVkSW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiBpbnN0cnVtZW50 aW5nQWdlbnRzLCBXb3JrZXJJbnNwZWN0b3JQcm94eSogcHJveHkpCit2b2lkIEluc3BlY3Rvcklu c3RydW1lbnRhdGlvbjo6d29ya2VyVGVybWluYXRlZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYg aW5zdHJ1bWVudGluZ0FnZW50cywgV29ya2VySW5zcGVjdG9yUHJveHkmIHByb3h5KQogewogICAg IGlmIChJbnNwZWN0b3JXb3JrZXJBZ2VudCogd29ya2VyQWdlbnQgPSBpbnN0cnVtZW50aW5nQWdl bnRzLmluc3BlY3RvcldvcmtlckFnZW50KCkpCiAgICAgICAgIHdvcmtlckFnZW50LT53b3JrZXJU ZXJtaW5hdGVkKHByb3h5KTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9J bnNwZWN0b3JJbnN0cnVtZW50YXRpb24uaCBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9JbnNw ZWN0b3JJbnN0cnVtZW50YXRpb24uaAppbmRleCAyMWY4OGQxM2Q3Njg0ZDg5NzBhOGQ3ZjhiN2Ix YmIzMjM3YTllNzNiLi4wM2JkZDU1Y2M5MzBkZTBjZmM2MWY4ZDllNDIxMGY0OTUyYWE0NjMzIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvSW5zcGVjdG9ySW5zdHJ1bWVudGF0 aW9uLmgKKysrIGIvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL0luc3BlY3Rvckluc3RydW1lbnRh dGlvbi5oCkBAIC00Nyw2ICs0Nyw3IEBACiAjaW5jbHVkZSAiUGFnZS5oIgogI2luY2x1ZGUgIlN0 b3JhZ2VBcmVhLmgiCiAjaW5jbHVkZSAiV2ViQW5pbWF0aW9uLmgiCisjaW5jbHVkZSAiV29ya2Vy SW5zcGVjdG9yUHJveHkuaCIKICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9Db25zb2xlTWVzc2Fn ZS5oPgogI2luY2x1ZGUgPGluaXRpYWxpemVyX2xpc3Q+CiAjaW5jbHVkZSA8d3RmL0NvbXBsZXRp b25IYW5kbGVyLmg+CkBAIC05Nyw3ICs5OCw2IEBAIGNsYXNzIFNoYXJlZEJ1ZmZlcjsKIGNsYXNz IFRpbWVyQmFzZTsKIGNsYXNzIFdlYktpdE5hbWVkRmxvdzsKIGNsYXNzIFdvcmtlckdsb2JhbFNj b3BlOwotY2xhc3MgV29ya2VySW5zcGVjdG9yUHJveHk7CiAKICNpZiBFTkFCTEUoV0VCR0wpCiBj bGFzcyBXZWJHTFByb2dyYW07CkBAIC0yNzAsOCArMjcwLDggQEAgcHVibGljOgogICAgIHN0YXRp YyB2b2lkIGRpZERpc3BhdGNoRE9NU3RvcmFnZUV2ZW50KFBhZ2UmLCBjb25zdCBTdHJpbmcmIGtl eSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwgY29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgU3RvcmFn ZVR5cGUsIFNlY3VyaXR5T3JpZ2luKik7CiAKICAgICBzdGF0aWMgYm9vbCBzaG91bGRXYWl0Rm9y RGVidWdnZXJPblN0YXJ0KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmKTsKLSAgICBzdGF0aWMgdm9p ZCB3b3JrZXJTdGFydGVkKFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQmLCBXb3JrZXJJbnNwZWN0b3JQ cm94eSosIGNvbnN0IFVSTCYpOwotICAgIHN0YXRpYyB2b2lkIHdvcmtlclRlcm1pbmF0ZWQoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCYsIFdvcmtlckluc3BlY3RvclByb3h5Kik7CisgICAgc3RhdGlj IHZvaWQgd29ya2VyU3RhcnRlZChXb3JrZXJJbnNwZWN0b3JQcm94eSYpOworICAgIHN0YXRpYyB2 b2lkIHdvcmtlclRlcm1pbmF0ZWQoV29ya2VySW5zcGVjdG9yUHJveHkmKTsKIAogICAgIHN0YXRp YyB2b2lkIGRpZENyZWF0ZVdlYlNvY2tldChEb2N1bWVudCosIHVuc2lnbmVkIGxvbmcgaWRlbnRp ZmllciwgY29uc3QgVVJMJiByZXF1ZXN0VVJMKTsKICAgICBzdGF0aWMgdm9pZCB3aWxsU2VuZFdl YlNvY2tldEhhbmRzaGFrZVJlcXVlc3QoRG9jdW1lbnQqLCB1bnNpZ25lZCBsb25nIGlkZW50aWZp ZXIsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYpOwpAQCAtNDcwLDggKzQ3MCw4IEBAIHByaXZhdGU6 CiAgICAgc3RhdGljIHZvaWQgZGlkRGlzcGF0Y2hET01TdG9yYWdlRXZlbnRJbXBsKEluc3RydW1l bnRpbmdBZ2VudHMmLCBjb25zdCBTdHJpbmcmIGtleSwgY29uc3QgU3RyaW5nJiBvbGRWYWx1ZSwg Y29uc3QgU3RyaW5nJiBuZXdWYWx1ZSwgU3RvcmFnZVR5cGUsIFNlY3VyaXR5T3JpZ2luKik7CiAK ICAgICBzdGF0aWMgYm9vbCBzaG91bGRXYWl0Rm9yRGVidWdnZXJPblN0YXJ0SW1wbChJbnN0cnVt ZW50aW5nQWdlbnRzJik7Ci0gICAgc3RhdGljIHZvaWQgd29ya2VyU3RhcnRlZEltcGwoSW5zdHJ1 bWVudGluZ0FnZW50cyYsIFdvcmtlckluc3BlY3RvclByb3h5KiwgY29uc3QgVVJMJik7Ci0gICAg c3RhdGljIHZvaWQgd29ya2VyVGVybWluYXRlZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFdv cmtlckluc3BlY3RvclByb3h5Kik7CisgICAgc3RhdGljIHZvaWQgd29ya2VyU3RhcnRlZEltcGwo SW5zdHJ1bWVudGluZ0FnZW50cyYsIFdvcmtlckluc3BlY3RvclByb3h5Jik7CisgICAgc3RhdGlj IHZvaWQgd29ya2VyVGVybWluYXRlZEltcGwoSW5zdHJ1bWVudGluZ0FnZW50cyYsIFdvcmtlcklu c3BlY3RvclByb3h5Jik7CiAKICAgICBzdGF0aWMgdm9pZCBkaWRDcmVhdGVXZWJTb2NrZXRJbXBs KEluc3RydW1lbnRpbmdBZ2VudHMmLCB1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNvbnN0IFVS TCYgcmVxdWVzdFVSTCk7CiAgICAgc3RhdGljIHZvaWQgd2lsbFNlbmRXZWJTb2NrZXRIYW5kc2hh a2VSZXF1ZXN0SW1wbChJbnN0cnVtZW50aW5nQWdlbnRzJiwgdW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKQEAgLTEyOTMsMTcgKzEyOTMsMTcgQEAgaW5s aW5lIGJvb2wgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpzaG91bGRXYWl0Rm9yRGVidWdnZXJP blN0YXJ0KFNjcmlwdEV4ZWN1dGkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAKLWlubGluZSB2b2lk IEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyU3RhcnRlZChTY3JpcHRFeGVjdXRpb25D b250ZXh0JiBjb250ZXh0LCBXb3JrZXJJbnNwZWN0b3JQcm94eSogcHJveHksIGNvbnN0IFVSTCYg dXJsKQoraW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3b3JrZXJTdGFydGVk KFdvcmtlckluc3BlY3RvclByb3h5JiBwcm94eSkKIHsKICAgICBGQVNUX1JFVFVSTl9JRl9OT19G Uk9OVEVORFModm9pZCgpKTsKLSAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyogaW5zdHJ1bWVu dGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JDb250ZXh0KGNvbnRleHQpKQotICAg ICAgICB3b3JrZXJTdGFydGVkSW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgcHJveHksIHVybCk7 CisgICAgaWYgKEluc3RydW1lbnRpbmdBZ2VudHMqIGluc3RydW1lbnRpbmdBZ2VudHMgPSBpbnN0 cnVtZW50aW5nQWdlbnRzRm9yQ29udGV4dChwcm94eS5zY3JpcHRFeGVjdXRpb25Db250ZXh0KCkp KQorICAgICAgICB3b3JrZXJTdGFydGVkSW1wbCgqaW5zdHJ1bWVudGluZ0FnZW50cywgcHJveHkp OwogfQogCi1pbmxpbmUgdm9pZCBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndvcmtlclRlcm1p bmF0ZWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCYgY29udGV4dCwgV29ya2VySW5zcGVjdG9yUHJv eHkqIHByb3h5KQoraW5saW5lIHZvaWQgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjp3b3JrZXJU ZXJtaW5hdGVkKFdvcmtlckluc3BlY3RvclByb3h5JiBwcm94eSkKIHsKICAgICBGQVNUX1JFVFVS Tl9JRl9OT19GUk9OVEVORFModm9pZCgpKTsKLSAgICBpZiAoSW5zdHJ1bWVudGluZ0FnZW50cyog aW5zdHJ1bWVudGluZ0FnZW50cyA9IGluc3RydW1lbnRpbmdBZ2VudHNGb3JDb250ZXh0KGNvbnRl eHQpKQorICAgIGlmIChJbnN0cnVtZW50aW5nQWdlbnRzKiBpbnN0cnVtZW50aW5nQWdlbnRzID0g aW5zdHJ1bWVudGluZ0FnZW50c0ZvckNvbnRleHQocHJveHkuc2NyaXB0RXhlY3V0aW9uQ29udGV4 dCgpKSkKICAgICAgICAgd29ya2VyVGVybWluYXRlZEltcGwoKmluc3RydW1lbnRpbmdBZ2VudHMs IHByb3h5KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50 cy9JbnNwZWN0b3JXb3JrZXJBZ2VudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdl bnRzL0luc3BlY3RvcldvcmtlckFnZW50LmNwcAppbmRleCAyOWQ4YTJiZmM4ZDhlYjU5YjVkMTEw Y2YwNWMwNmE1MGYzYzZiOGZkLi5hN2EyMGY3MjM0NzQzZDY1MzgyYjVjOTMwNzdjOTVmMmJmYTc5 M2JiIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rv cldvcmtlckFnZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0lu c3BlY3RvcldvcmtlckFnZW50LmNwcApAQCAtMTA0LDkgKzEwNCw5IEBAIHZvaWQgSW5zcGVjdG9y V29ya2VyQWdlbnQ6OnNlbmRNZXNzYWdlVG9Xb3JrZXIoRXJyb3JTdHJpbmcmIGVycm9yU3RyaW5n LCBjb25zdCBTCiAgICAgcHJveHktPnNlbmRNZXNzYWdlVG9Xb3JrZXJJbnNwZWN0b3JDb250cm9s bGVyKG1lc3NhZ2UpOwogfQogCi12b2lkIEluc3BlY3RvcldvcmtlckFnZW50OjpzZW5kTWVzc2Fn ZUZyb21Xb3JrZXJUb0Zyb250ZW5kKFdvcmtlckluc3BlY3RvclByb3h5KiBwcm94eSwgY29uc3Qg U3RyaW5nJiBtZXNzYWdlKQordm9pZCBJbnNwZWN0b3JXb3JrZXJBZ2VudDo6c2VuZE1lc3NhZ2VG cm9tV29ya2VyVG9Gcm9udGVuZChXb3JrZXJJbnNwZWN0b3JQcm94eSYgcHJveHksIGNvbnN0IFN0 cmluZyYgbWVzc2FnZSkKIHsKLSAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+ZGlzcGF0Y2hNZXNz YWdlRnJvbVdvcmtlcihwcm94eS0+aWRlbnRpZmllcigpLCBtZXNzYWdlKTsKKyAgICBtX2Zyb250 ZW5kRGlzcGF0Y2hlci0+ZGlzcGF0Y2hNZXNzYWdlRnJvbVdvcmtlcihwcm94eS5pZGVudGlmaWVy KCksIG1lc3NhZ2UpOwogfQogCiBib29sIEluc3BlY3RvcldvcmtlckFnZW50OjpzaG91bGRXYWl0 Rm9yRGVidWdnZXJPblN0YXJ0KCkgY29uc3QKQEAgLTExNCw3ICsxMTQsNyBAQCBib29sIEluc3Bl Y3RvcldvcmtlckFnZW50OjpzaG91bGRXYWl0Rm9yRGVidWdnZXJPblN0YXJ0KCkgY29uc3QKICAg ICByZXR1cm4gbV9lbmFibGVkOwogfQogCi12b2lkIEluc3BlY3RvcldvcmtlckFnZW50Ojp3b3Jr ZXJTdGFydGVkKFdvcmtlckluc3BlY3RvclByb3h5KiBwcm94eSwgY29uc3QgVVJMJikKK3ZvaWQg SW5zcGVjdG9yV29ya2VyQWdlbnQ6OndvcmtlclN0YXJ0ZWQoV29ya2VySW5zcGVjdG9yUHJveHkm IHByb3h5KQogewogICAgIGlmICghbV9lbmFibGVkKQogICAgICAgICByZXR1cm47CkBAIC0xMjIs NyArMTIyLDcgQEAgdm9pZCBJbnNwZWN0b3JXb3JrZXJBZ2VudDo6d29ya2VyU3RhcnRlZChXb3Jr ZXJJbnNwZWN0b3JQcm94eSogcHJveHksIGNvbnN0IFVSTCYKICAgICBjb25uZWN0VG9Xb3JrZXJJ bnNwZWN0b3JQcm94eShwcm94eSk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6Ondv cmtlclRlcm1pbmF0ZWQoV29ya2VySW5zcGVjdG9yUHJveHkqIHByb3h5KQordm9pZCBJbnNwZWN0 b3JXb3JrZXJBZ2VudDo6d29ya2VyVGVybWluYXRlZChXb3JrZXJJbnNwZWN0b3JQcm94eSYgcHJv eHkpCiB7CiAgICAgaWYgKCFtX2VuYWJsZWQpCiAgICAgICAgIHJldHVybjsKQEAgLTE0Miw3ICsx NDIsNyBAQCB2b2lkIEluc3BlY3RvcldvcmtlckFnZW50Ojpjb25uZWN0VG9BbGxXb3JrZXJJbnNw ZWN0b3JQcm94aWVzRm9yUGFnZSgpCiAgICAgICAgIGlmIChkb2N1bWVudC5wYWdlKCkgIT0gJm1f cGFnZSkKICAgICAgICAgICAgIGNvbnRpbnVlOwogCi0gICAgICAgIGNvbm5lY3RUb1dvcmtlcklu c3BlY3RvclByb3h5KHByb3h5KTsKKyAgICAgICAgY29ubmVjdFRvV29ya2VySW5zcGVjdG9yUHJv eHkoKnByb3h5KTsKICAgICB9CiB9CiAKQEAgLTE1NCwyMiArMTU0LDIyIEBAIHZvaWQgSW5zcGVj dG9yV29ya2VyQWdlbnQ6OmRpc2Nvbm5lY3RGcm9tQWxsV29ya2VySW5zcGVjdG9yUHJveGllcygp CiAgICAgbV9jb25uZWN0ZWRQcm94aWVzLmNsZWFyKCk7CiB9CiAKLXZvaWQgSW5zcGVjdG9yV29y a2VyQWdlbnQ6OmNvbm5lY3RUb1dvcmtlckluc3BlY3RvclByb3h5KFdvcmtlckluc3BlY3RvclBy b3h5KiBwcm94eSkKK3ZvaWQgSW5zcGVjdG9yV29ya2VyQWdlbnQ6OmNvbm5lY3RUb1dvcmtlcklu c3BlY3RvclByb3h5KFdvcmtlckluc3BlY3RvclByb3h5JiBwcm94eSkKIHsKLSAgICBwcm94eS0+ Y29ubmVjdFRvV29ya2VySW5zcGVjdG9yQ29udHJvbGxlcih0aGlzKTsKKyAgICBwcm94eS5jb25u ZWN0VG9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKCp0aGlzKTsKIAotICAgIG1fY29ubmVjdGVk UHJveGllcy5zZXQocHJveHktPmlkZW50aWZpZXIoKSwgcHJveHkpOworICAgIG1fY29ubmVjdGVk UHJveGllcy5zZXQocHJveHkuaWRlbnRpZmllcigpLCAmcHJveHkpOwogCi0gICAgbV9mcm9udGVu ZERpc3BhdGNoZXItPndvcmtlckNyZWF0ZWQocHJveHktPmlkZW50aWZpZXIoKSwgcHJveHktPnVy bCgpLnN0cmluZygpKTsKKyAgICBtX2Zyb250ZW5kRGlzcGF0Y2hlci0+d29ya2VyQ3JlYXRlZChw cm94eS5pZGVudGlmaWVyKCksIHByb3h5LnVybCgpLnN0cmluZygpLCBwcm94eS5uYW1lKCkpOwog fQogCi12b2lkIEluc3BlY3RvcldvcmtlckFnZW50OjpkaXNjb25uZWN0RnJvbVdvcmtlckluc3Bl Y3RvclByb3h5KFdvcmtlckluc3BlY3RvclByb3h5KiBwcm94eSkKK3ZvaWQgSW5zcGVjdG9yV29y a2VyQWdlbnQ6OmRpc2Nvbm5lY3RGcm9tV29ya2VySW5zcGVjdG9yUHJveHkoV29ya2VySW5zcGVj dG9yUHJveHkmIHByb3h5KQogewotICAgIG1fZnJvbnRlbmREaXNwYXRjaGVyLT53b3JrZXJUZXJt aW5hdGVkKHByb3h5LT5pZGVudGlmaWVyKCkpOworICAgIG1fZnJvbnRlbmREaXNwYXRjaGVyLT53 b3JrZXJUZXJtaW5hdGVkKHByb3h5LmlkZW50aWZpZXIoKSk7CiAKLSAgICBtX2Nvbm5lY3RlZFBy b3hpZXMucmVtb3ZlKHByb3h5LT5pZGVudGlmaWVyKCkpOworICAgIG1fY29ubmVjdGVkUHJveGll cy5yZW1vdmUocHJveHkuaWRlbnRpZmllcigpKTsKIAotICAgIHByb3h5LT5kaXNjb25uZWN0RnJv bVdvcmtlckluc3BlY3RvckNvbnRyb2xsZXIoKTsKKyAgICBwcm94eS5kaXNjb25uZWN0RnJvbVdv cmtlckluc3BlY3RvckNvbnRyb2xsZXIoKTsKIH0KIAogfSAvLyBuYW1lc3BhY2UgSW5zcGVjdG9y CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvcldv cmtlckFnZW50LmggYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvYWdlbnRzL0luc3BlY3Rvcldv cmtlckFnZW50LmgKaW5kZXggOTQ0NzQ5M2UxZmE0YWMxY2FiYmRhMDQxYTc4YWEzMDhkODM0ZjQw OC4uMTdkMWJlYWU5MDEwZjMyMDAxYWM2NGRkOWQ4OTJhOTNmMTBhN2Q1NiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2FnZW50cy9JbnNwZWN0b3JXb3JrZXJBZ2VudC5oCisr KyBiL1NvdXJjZS9XZWJDb3JlL2luc3BlY3Rvci9hZ2VudHMvSW5zcGVjdG9yV29ya2VyQWdlbnQu aApAQCAtNTUsMTggKzU1LDE4IEBAIHB1YmxpYzoKICAgICB2b2lkIHNlbmRNZXNzYWdlVG9Xb3Jr ZXIoRXJyb3JTdHJpbmcmLCBjb25zdCBTdHJpbmcmIHdvcmtlcklkLCBjb25zdCBTdHJpbmcmIG1l c3NhZ2UpIG92ZXJyaWRlOwogCiAgICAgLy8gV29ya2VySW5zcGVjdG9yUHJveHk6OlBhZ2VDaGFu bmVsCi0gICAgdm9pZCBzZW5kTWVzc2FnZUZyb21Xb3JrZXJUb0Zyb250ZW5kKFdvcmtlckluc3Bl Y3RvclByb3h5KiwgY29uc3QgU3RyaW5nJiBtZXNzYWdlKSBvdmVycmlkZTsKKyAgICB2b2lkIHNl bmRNZXNzYWdlRnJvbVdvcmtlclRvRnJvbnRlbmQoV29ya2VySW5zcGVjdG9yUHJveHkmLCBjb25z dCBTdHJpbmcmIG1lc3NhZ2UpIG92ZXJyaWRlOwogCiAgICAgLy8gSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uCiAgICAgYm9vbCBzaG91bGRXYWl0Rm9yRGVidWdnZXJPblN0YXJ0KCkgY29uc3Q7Ci0g ICAgdm9pZCB3b3JrZXJTdGFydGVkKFdvcmtlckluc3BlY3RvclByb3h5KiwgY29uc3QgVVJMJik7 Ci0gICAgdm9pZCB3b3JrZXJUZXJtaW5hdGVkKFdvcmtlckluc3BlY3RvclByb3h5Kik7CisgICAg dm9pZCB3b3JrZXJTdGFydGVkKFdvcmtlckluc3BlY3RvclByb3h5Jik7CisgICAgdm9pZCB3b3Jr ZXJUZXJtaW5hdGVkKFdvcmtlckluc3BlY3RvclByb3h5Jik7CiAKIHByaXZhdGU6CiAgICAgdm9p ZCBjb25uZWN0VG9BbGxXb3JrZXJJbnNwZWN0b3JQcm94aWVzRm9yUGFnZSgpOwogICAgIHZvaWQg ZGlzY29ubmVjdEZyb21BbGxXb3JrZXJJbnNwZWN0b3JQcm94aWVzKCk7Ci0gICAgdm9pZCBjb25u ZWN0VG9Xb3JrZXJJbnNwZWN0b3JQcm94eShXb3JrZXJJbnNwZWN0b3JQcm94eSopOwotICAgIHZv aWQgZGlzY29ubmVjdEZyb21Xb3JrZXJJbnNwZWN0b3JQcm94eShXb3JrZXJJbnNwZWN0b3JQcm94 eSopOworICAgIHZvaWQgY29ubmVjdFRvV29ya2VySW5zcGVjdG9yUHJveHkoV29ya2VySW5zcGVj dG9yUHJveHkmKTsKKyAgICB2b2lkIGRpc2Nvbm5lY3RGcm9tV29ya2VySW5zcGVjdG9yUHJveHko V29ya2VySW5zcGVjdG9yUHJveHkmKTsKIAogICAgIHN0ZDo6dW5pcXVlX3B0cjxJbnNwZWN0b3I6 OldvcmtlckZyb250ZW5kRGlzcGF0Y2hlcj4gbV9mcm9udGVuZERpc3BhdGNoZXI7CiAgICAgUmVm UHRyPEluc3BlY3Rvcjo6V29ya2VyQmFja2VuZERpc3BhdGNoZXI+IG1fYmFja2VuZERpc3BhdGNo ZXI7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlckluc3BlY3RvclBy b3h5LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VySW5zcGVjdG9yUHJveHkuY3Bw CmluZGV4IDVmN2QxNzM0YmI2MGE0YmIyZWQxN2FhYjgxNWFmMWVhNDhkNDZkYTEuLjYzMmI4MmUy OGI3MmRhNjEzNzFjMjRlYmZiYWYyZGQ1NTkxMGQwNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJD b3JlL3dvcmtlcnMvV29ya2VySW5zcGVjdG9yUHJveHkuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvV29ya2VySW5zcGVjdG9yUHJveHkuY3BwCkBAIC0zMSw2ICszMSw3IEBACiAjaW5j bHVkZSAiV29ya2VyR2xvYmFsU2NvcGUuaCIKICNpbmNsdWRlICJXb3JrZXJJbnNwZWN0b3JDb250 cm9sbGVyLmgiCiAjaW5jbHVkZSAiV29ya2VyUnVuTG9vcC5oIgorI2luY2x1ZGUgIldvcmtlclRo cmVhZC5oIgogI2luY2x1ZGUgPEphdmFTY3JpcHRDb3JlL0luc3BlY3RvckFnZW50QmFzZS5oPgog I2luY2x1ZGUgPHd0Zi9OZXZlckRlc3Ryb3llZC5oPgogCkBAIC02MSwxNyArNjIsMTggQEAgV29y a2VyVGhyZWFkU3RhcnRNb2RlIFdvcmtlckluc3BlY3RvclByb3h5Ojp3b3JrZXJTdGFydE1vZGUo U2NyaXB0RXhlY3V0aW9uQ29udGUKICAgICByZXR1cm4gcGF1c2VPblN0YXJ0ID8gV29ya2VyVGhy ZWFkU3RhcnRNb2RlOjpXYWl0Rm9ySW5zcGVjdG9yIDogV29ya2VyVGhyZWFkU3RhcnRNb2RlOjpO b3JtYWw7CiB9CiAKLXZvaWQgV29ya2VySW5zcGVjdG9yUHJveHk6OndvcmtlclN0YXJ0ZWQoU2Ny aXB0RXhlY3V0aW9uQ29udGV4dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCwgV29ya2VyVGhyZWFk KiB0aHJlYWQsIGNvbnN0IFVSTCYgdXJsKQordm9pZCBXb3JrZXJJbnNwZWN0b3JQcm94eTo6d29y a2VyU3RhcnRlZChTY3JpcHRFeGVjdXRpb25Db250ZXh0KiBzY3JpcHRFeGVjdXRpb25Db250ZXh0 LCBXb3JrZXJUaHJlYWQqIHRocmVhZCwgY29uc3QgVVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgbmFt ZSkKIHsKICAgICBBU1NFUlQoIW1fd29ya2VyVGhyZWFkKTsKIAogICAgIG1fc2NyaXB0RXhlY3V0 aW9uQ29udGV4dCA9IHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiAgICAgbV93b3JrZXJUaHJlYWQg PSB0aHJlYWQ7CiAgICAgbV91cmwgPSB1cmw7CisgICAgbV9uYW1lID0gbmFtZTsKIAogICAgIGFs bFdvcmtlckluc3BlY3RvclByb3hpZXMoKS5hZGQodGhpcyk7CiAKLSAgICBJbnNwZWN0b3JJbnN0 cnVtZW50YXRpb246OndvcmtlclN0YXJ0ZWQoKm1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5nZXQo KSwgdGhpcywgbV91cmwpOworICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6d29ya2VyU3Rh cnRlZCgqdGhpcyk7CiB9CiAKIHZvaWQgV29ya2VySW5zcGVjdG9yUHJveHk6OndvcmtlclRlcm1p bmF0ZWQoKQpAQCAtNzksNyArODEsNyBAQCB2b2lkIFdvcmtlckluc3BlY3RvclByb3h5Ojp3b3Jr ZXJUZXJtaW5hdGVkKCkKICAgICBpZiAoIW1fd29ya2VyVGhyZWFkKQogICAgICAgICByZXR1cm47 CiAKLSAgICBJbnNwZWN0b3JJbnN0cnVtZW50YXRpb246OndvcmtlclRlcm1pbmF0ZWQoKm1fc2Ny aXB0RXhlY3V0aW9uQ29udGV4dC5nZXQoKSwgdGhpcyk7CisgICAgSW5zcGVjdG9ySW5zdHJ1bWVu dGF0aW9uOjp3b3JrZXJUZXJtaW5hdGVkKCp0aGlzKTsKIAogICAgIGFsbFdvcmtlckluc3BlY3Rv clByb3hpZXMoKS5yZW1vdmUodGhpcyk7CiAKQEAgLTk1LDEzICs5NywxMyBAQCB2b2lkIFdvcmtl ckluc3BlY3RvclByb3h5OjpyZXN1bWVXb3JrZXJJZlBhdXNlZCgpCiAgICAgfSk7CiB9CiAKLXZv aWQgV29ya2VySW5zcGVjdG9yUHJveHk6OmNvbm5lY3RUb1dvcmtlckluc3BlY3RvckNvbnRyb2xs ZXIoUGFnZUNoYW5uZWwqIGNoYW5uZWwpCit2b2lkIFdvcmtlckluc3BlY3RvclByb3h5Ojpjb25u ZWN0VG9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2VDaGFubmVsJiBjaGFubmVsKQogewog ICAgIEFTU0VSVChtX3dvcmtlclRocmVhZCk7CiAgICAgaWYgKCFtX3dvcmtlclRocmVhZCkKICAg ICAgICAgcmV0dXJuOwogCi0gICAgbV9wYWdlQ2hhbm5lbCA9IGNoYW5uZWw7CisgICAgbV9wYWdl Q2hhbm5lbCA9ICZjaGFubmVsOwogCiAgICAgbV93b3JrZXJUaHJlYWQtPnJ1bkxvb3AoKS5wb3N0 RGVidWdnZXJUYXNrKFtdIChTY3JpcHRFeGVjdXRpb25Db250ZXh0JiBjb250ZXh0KSB7CiAgICAg ICAgIGRvd25jYXN0PFdvcmtlckdsb2JhbFNjb3BlPihjb250ZXh0KS5pbnNwZWN0b3JDb250cm9s bGVyKCkuY29ubmVjdEZyb250ZW5kKCk7CkBAIC0xNDEsNyArMTQzLDcgQEAgdm9pZCBXb3JrZXJJ bnNwZWN0b3JQcm94eTo6c2VuZE1lc3NhZ2VGcm9tV29ya2VyVG9Gcm9udGVuZChjb25zdCBTdHJp bmcmIG1lc3NhZ2UKICAgICBpZiAoIW1fcGFnZUNoYW5uZWwpCiAgICAgICAgIHJldHVybjsKIAot ICAgIG1fcGFnZUNoYW5uZWwtPnNlbmRNZXNzYWdlRnJvbVdvcmtlclRvRnJvbnRlbmQodGhpcywg bWVzc2FnZSk7CisgICAgbV9wYWdlQ2hhbm5lbC0+c2VuZE1lc3NhZ2VGcm9tV29ya2VyVG9Gcm9u dGVuZCgqdGhpcywgbWVzc2FnZSk7CiB9CiAKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VySW5zcGVjdG9yUHJveHkuaCBiL1Nv dXJjZS9XZWJDb3JlL3dvcmtlcnMvV29ya2VySW5zcGVjdG9yUHJveHkuaAppbmRleCBhMWQzZWE3 NTc2ZTdlYTM0YTY0Y2I5MTU0N2RlNzZhY2Y1MThiZGU1Li41ZThhMWRjMGVkMGQ5YWE1MzJjMzY3 NDY0Yzg2N2ZiNGY3ZjlhYTVmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dv cmtlckluc3BlY3RvclByb3h5LmgKKysrIGIvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJJ bnNwZWN0b3JQcm94eS5oCkBAIC0yNSw5ICsyNSw5IEBACiAKICNwcmFnbWEgb25jZQogCi0jaW5j bHVkZSA8d3RmL1VSTC5oPgotI2luY2x1ZGUgIldvcmtlclRocmVhZC5oIgogI2luY2x1ZGUgPHd0 Zi9IYXNoU2V0Lmg+CisjaW5jbHVkZSA8d3RmL1JlZlB0ci5oPgorI2luY2x1ZGUgPHd0Zi9VUkwu aD4KICNpbmNsdWRlIDx3dGYvdGV4dC9XVEZTdHJpbmcuaD4KIAogLy8gQWxsIG9mIHRoZXNlIG1l dGhvZHMgc2hvdWxkIGJlIGNhbGxlZCBvbiB0aGUgTWFpbiBUaHJlYWQuCkBAIC0zOCw2ICszOCw4 IEBAIG5hbWVzcGFjZSBXZWJDb3JlIHsKIGNsYXNzIFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQ7CiBj bGFzcyBXb3JrZXJUaHJlYWQ7CiAKK2VudW0gY2xhc3MgV29ya2VyVGhyZWFkU3RhcnRNb2RlOwor CiBjbGFzcyBXb3JrZXJJbnNwZWN0b3JQcm94eSB7CiAgICAgV1RGX01BS0VfTk9OQ09QWUFCTEUo V29ya2VySW5zcGVjdG9yUHJveHkpOwogICAgIFdURl9NQUtFX0ZBU1RfQUxMT0NBVEVEOwpAQCAt NDksMjEgKzUxLDIyIEBAIHB1YmxpYzoKICAgICBjbGFzcyBQYWdlQ2hhbm5lbCB7CiAgICAgcHVi bGljOgogICAgICAgICB2aXJ0dWFsIH5QYWdlQ2hhbm5lbCgpID0gZGVmYXVsdDsKLSAgICAgICAg dmlydHVhbCB2b2lkIHNlbmRNZXNzYWdlRnJvbVdvcmtlclRvRnJvbnRlbmQoV29ya2VySW5zcGVj dG9yUHJveHkqLCBjb25zdCBTdHJpbmcmKSA9IDA7CisgICAgICAgIHZpcnR1YWwgdm9pZCBzZW5k TWVzc2FnZUZyb21Xb3JrZXJUb0Zyb250ZW5kKFdvcmtlckluc3BlY3RvclByb3h5JiwgY29uc3Qg U3RyaW5nJikgPSAwOwogICAgIH07CiAKICAgICBzdGF0aWMgSGFzaFNldDxXb3JrZXJJbnNwZWN0 b3JQcm94eSo+JiBhbGxXb3JrZXJJbnNwZWN0b3JQcm94aWVzKCk7CiAKICAgICBjb25zdCBVUkwm IHVybCgpIGNvbnN0IHsgcmV0dXJuIG1fdXJsOyB9CisgICAgY29uc3QgU3RyaW5nJiBuYW1lKCkg Y29uc3QgeyByZXR1cm4gbV9uYW1lOyB9CiAgICAgY29uc3QgU3RyaW5nJiBpZGVudGlmaWVyKCkg Y29uc3QgeyByZXR1cm4gbV9pZGVudGlmaWVyOyB9CiAgICAgU2NyaXB0RXhlY3V0aW9uQ29udGV4 dCogc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpIGNvbnN0IHsgcmV0dXJuIG1fc2NyaXB0RXhlY3V0 aW9uQ29udGV4dC5nZXQoKTsgfQogCiAgICAgV29ya2VyVGhyZWFkU3RhcnRNb2RlIHdvcmtlclN0 YXJ0TW9kZShTY3JpcHRFeGVjdXRpb25Db250ZXh0Jik7Ci0gICAgdm9pZCB3b3JrZXJTdGFydGVk KFNjcmlwdEV4ZWN1dGlvbkNvbnRleHQqLCBXb3JrZXJUaHJlYWQqLCBjb25zdCBVUkwmKTsKKyAg ICB2b2lkIHdvcmtlclN0YXJ0ZWQoU2NyaXB0RXhlY3V0aW9uQ29udGV4dCosIFdvcmtlclRocmVh ZCosIGNvbnN0IFVSTCYsIGNvbnN0IFN0cmluZyYgbmFtZSk7CiAgICAgdm9pZCB3b3JrZXJUZXJt aW5hdGVkKCk7CiAKICAgICB2b2lkIHJlc3VtZVdvcmtlcklmUGF1c2VkKCk7Ci0gICAgdm9pZCBj b25uZWN0VG9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2VDaGFubmVsKik7CisgICAgdm9p ZCBjb25uZWN0VG9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKFBhZ2VDaGFubmVsJik7CiAgICAg dm9pZCBkaXNjb25uZWN0RnJvbVdvcmtlckluc3BlY3RvckNvbnRyb2xsZXIoKTsKICAgICB2b2lk IHNlbmRNZXNzYWdlVG9Xb3JrZXJJbnNwZWN0b3JDb250cm9sbGVyKGNvbnN0IFN0cmluZyYpOwog ICAgIHZvaWQgc2VuZE1lc3NhZ2VGcm9tV29ya2VyVG9Gcm9udGVuZChjb25zdCBTdHJpbmcmKTsK QEAgLTczLDYgKzc2LDcgQEAgcHJpdmF0ZToKICAgICBSZWZQdHI8V29ya2VyVGhyZWFkPiBtX3dv cmtlclRocmVhZDsKICAgICBTdHJpbmcgbV9pZGVudGlmaWVyOwogICAgIFVSTCBtX3VybDsKKyAg ICBTdHJpbmcgbV9uYW1lOwogICAgIFBhZ2VDaGFubmVsKiBtX3BhZ2VDaGFubmVsIHsgbnVsbHB0 ciB9OwogfTsKIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvd29ya2Vycy9Xb3JrZXJNZXNz YWdpbmdQcm94eS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1By b3h5LmNwcAppbmRleCA4ODYwY2I3NjQxNTM5ZjU0MmRmYjg0OTA4OTAwMWJlODUyYzlkZjc1Li5i OWQxOTcwZmRiNGU3NzQ4ZDZmZjM1Mzc2NDJhOWQwOWJiODEyOWE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS93b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS93b3JrZXJzL1dvcmtlck1lc3NhZ2luZ1Byb3h5LmNwcApAQCAtOTUsNyArOTUsNyBA QCB2b2lkIFdvcmtlck1lc3NhZ2luZ1Byb3h5OjpzdGFydFdvcmtlckdsb2JhbFNjb3BlKGNvbnN0 IFVSTCYgc2NyaXB0VVJMLCBjb25zdCBTdAogICAgIHdvcmtlclRocmVhZENyZWF0ZWQodGhyZWFk LmdldCgpKTsKICAgICB0aHJlYWQtPnN0YXJ0KCk7CiAKLSAgICBtX2luc3BlY3RvclByb3h5LT53 b3JrZXJTdGFydGVkKG1fc2NyaXB0RXhlY3V0aW9uQ29udGV4dC5nZXQoKSwgdGhyZWFkLnB0cigp LCBzY3JpcHRVUkwpOworICAgIG1faW5zcGVjdG9yUHJveHktPndvcmtlclN0YXJ0ZWQobV9zY3Jp cHRFeGVjdXRpb25Db250ZXh0LmdldCgpLCB0aHJlYWQucHRyKCksIHNjcmlwdFVSTCwgbmFtZSk7 CiB9CiAKIHZvaWQgV29ya2VyTWVzc2FnaW5nUHJveHk6OnBvc3RNZXNzYWdlVG9Xb3JrZXJPYmpl Y3QoTWVzc2FnZVdpdGhNZXNzYWdlUG9ydHMmJiBtZXNzYWdlKQpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvV29ya2VyTWFuYWdlci5q cyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0NvbnRyb2xsZXJzL1dvcmtl ck1hbmFnZXIuanMKaW5kZXggNGZmZjE3NTAyMzAzZDVkNTEzMzZkZTQ2YmM5YmIyNDlhNzExYWQ4 NS4uOWQ0Mjk0YTA1MzRjOGNjYjc2ZTVkMTkxYzMwZTI3MzRkNjI3YTNhZiAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQ29udHJvbGxlcnMvV29ya2VyTWFu YWdlci5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Db250cm9s bGVycy9Xb3JrZXJNYW5hZ2VyLmpzCkBAIC00MiwxMSArNDIsMTEgQEAgV0kuV29ya2VyTWFuYWdl ciA9IGNsYXNzIFdvcmtlck1hbmFnZXIgZXh0ZW5kcyBXSS5PYmplY3QKIAogICAgIC8vIFdvcmtl ck9ic2VydmVyCiAKLSAgICB3b3JrZXJDcmVhdGVkKHRhcmdldCwgd29ya2VySWQsIHVybCkKKyAg ICB3b3JrZXJDcmVhdGVkKHRhcmdldCwgd29ya2VySWQsIHVybCwgbmFtZSkKICAgICB7CiAgICAg ICAgIGNvbnNvbGUuYXNzZXJ0KHRhcmdldC5oYXNDb21tYW5kKCJXb3JrZXIuc2VuZE1lc3NhZ2VU b1dvcmtlciIpKTsKICAgICAgICAgbGV0IGNvbm5lY3Rpb24gPSBuZXcgSW5zcGVjdG9yQmFja2Vu ZC5Xb3JrZXJDb25uZWN0aW9uOwotICAgICAgICBsZXQgd29ya2VyVGFyZ2V0ID0gbmV3IFdJLldv cmtlclRhcmdldCh0YXJnZXQsIHdvcmtlcklkLCB1cmwsIGNvbm5lY3Rpb24pOworICAgICAgICBs ZXQgd29ya2VyVGFyZ2V0ID0gbmV3IFdJLldvcmtlclRhcmdldCh0YXJnZXQsIHdvcmtlcklkLCB1 cmwsIG5hbWUsIGNvbm5lY3Rpb24pOwogICAgICAgICB3b3JrZXJUYXJnZXQuaW5pdGlhbGl6ZSgp OwogCiAgICAgICAgIFdJLnRhcmdldE1hbmFnZXIuYWRkVGFyZ2V0KHdvcmtlclRhcmdldCk7CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9X b3JrZXJPYnNlcnZlci5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1By b3RvY29sL1dvcmtlck9ic2VydmVyLmpzCmluZGV4IGQ4NjlkNTM5OTM1YjMwYTlkMDRiMWZjYTYw ZmU1MWIxOTc2ZmQ1OTkuLmQ3MDY2Yjg2NDI2YTZhMTk1ZTYwZThjOTk4MWNlNDc0NTlkOGZiMTMg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29s L1dvcmtlck9ic2VydmVyLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJm YWNlL1Byb3RvY29sL1dvcmtlck9ic2VydmVyLmpzCkBAIC0yNyw5ICsyNyw5IEBAIFdJLldvcmtl ck9ic2VydmVyID0gY2xhc3MgV29ya2VyT2JzZXJ2ZXIgZXh0ZW5kcyBJbnNwZWN0b3JCYWNrZW5k LkRpc3BhdGNoZXIKIHsKICAgICAvLyBFdmVudHMgZGVmaW5lZCBieSB0aGUgIldvcmtlciIgZG9t YWluLgogCi0gICAgd29ya2VyQ3JlYXRlZCh3b3JrZXJJZCwgdXJsKQorICAgIHdvcmtlckNyZWF0 ZWQod29ya2VySWQsIHVybCwgbmFtZSkKICAgICB7Ci0gICAgICAgIFdJLndvcmtlck1hbmFnZXIu d29ya2VyQ3JlYXRlZCh0aGlzLl90YXJnZXQsIHdvcmtlcklkLCB1cmwpOworICAgICAgICBXSS53 b3JrZXJNYW5hZ2VyLndvcmtlckNyZWF0ZWQodGhpcy5fdGFyZ2V0LCB3b3JrZXJJZCwgdXJsLCBu YW1lKTsKICAgICB9CiAKICAgICB3b3JrZXJUZXJtaW5hdGVkKHdvcmtlcklkKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvV29ya2VyVGFy Z2V0LmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvUHJvdG9jb2wvV29y a2VyVGFyZ2V0LmpzCmluZGV4IGQ1YWYzNzFmMzAzMmM1YjViYjJjNDE1MzYwNWRkNjc3NDk2NWRl YTUuLmFiYTMyMmQ1ZDA0MjgxNTg3NThiNzEyYzM4NWM3MTEwNjA0YzhmM2YgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Byb3RvY29sL1dvcmtlclRhcmdl dC5qcworKysgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Qcm90b2NvbC9X b3JrZXJUYXJnZXQuanMKQEAgLTI1LDE2ICsyNSwyOCBAQAogCiBXSS5Xb3JrZXJUYXJnZXQgPSBj bGFzcyBXb3JrZXJUYXJnZXQgZXh0ZW5kcyBXSS5UYXJnZXQKIHsKLSAgICBjb25zdHJ1Y3Rvcihw YXJlbnRUYXJnZXQsIHdvcmtlcklkLCBuYW1lLCBjb25uZWN0aW9uLCBvcHRpb25zID0ge30pCisg ICAgY29uc3RydWN0b3IocGFyZW50VGFyZ2V0LCB3b3JrZXJJZCwgdXJsLCBkaXNwbGF5TmFtZSwg Y29ubmVjdGlvbiwgb3B0aW9ucyA9IHt9KQogICAgIHsKLSAgICAgICAgc3VwZXIocGFyZW50VGFy Z2V0LCB3b3JrZXJJZCwgbmFtZSwgV0kuVGFyZ2V0VHlwZS5Xb3JrZXIsIGNvbm5lY3Rpb24sIG9w dGlvbnMpOworICAgICAgICBzdXBlcihwYXJlbnRUYXJnZXQsIHdvcmtlcklkLCB1cmwsIFdJLlRh cmdldFR5cGUuV29ya2VyLCBjb25uZWN0aW9uLCBvcHRpb25zKTsKKworICAgICAgICB0aGlzLl9k aXNwbGF5TmFtZSA9IGRpc3BsYXlOYW1lOwogCiAgICAgICAgIHRoaXMuX2V4ZWN1dGlvbkNvbnRl eHQgPSBuZXcgV0kuRXhlY3V0aW9uQ29udGV4dCh0aGlzLCBXSS5SdW50aW1lTWFuYWdlci5Ub3BM ZXZlbENvbnRleHRFeGVjdXRpb25JZGVudGlmaWVyLCBXSS5FeGVjdXRpb25Db250ZXh0LlR5cGUu Tm9ybWFsLCB0aGlzLmRpc3BsYXlOYW1lKTsKICAgICB9CiAKICAgICAvLyBQcm90ZWN0ZWQgKFRh cmdldCkKIAorICAgIGdldCBjdXN0b21OYW1lKCkKKyAgICB7CisgICAgICAgIHJldHVybiB0aGlz Ll9kaXNwbGF5TmFtZTsKKyAgICB9CisKICAgICBnZXQgZGlzcGxheU5hbWUoKQorICAgIHsKKyAg ICAgICAgcmV0dXJuIHRoaXMuX2Rpc3BsYXlOYW1lIHx8IHRoaXMuZGlzcGxheVVSTDsKKyAgICB9 CisKKyAgICBnZXQgZGlzcGxheVVSTCgpCiAgICAgewogICAgICAgICByZXR1cm4gV0kuZGlzcGxh eU5hbWVGb3JVUkwodGhpcy5fbmFtZSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvU2NyaXB0VHJlZUVsZW1lbnQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUcmVlRWxlbWVudC5q cwppbmRleCAzM2ZjOWZmZGI5OGQ1MmU1YWI5MDM2MGZhNTNiNTBjNTQ1OGYyYTRmLi45ZjgyNjI1 M2E3YTdjNjE5ZGM3MmUyYjZlNDJkMDYzOWM0ZjYxZjQ1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUcmVlRWxlbWVudC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9TY3JpcHRUcmVlRWxl bWVudC5qcwpAQCAtMjUsMzggKzI1LDQ1IEBACiAKIFdJLlNjcmlwdFRyZWVFbGVtZW50ID0gY2xh c3MgU2NyaXB0VHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5Tb3VyY2VDb2RlVHJlZUVsZW1lbnQKIHsK LSAgICBjb25zdHJ1Y3RvcihzY3JpcHQpCisgICAgY29uc3RydWN0b3Ioc2NyaXB0LCBvcHRpb25z ID0ge30pCiAgICAgewogICAgICAgICBjb25zb2xlLmFzc2VydChzY3JpcHQgaW5zdGFuY2VvZiBX SS5TY3JpcHQpOwogCi0gICAgICAgIGNvbnN0IHRpdGxlID0gbnVsbDsKLSAgICAgICAgY29uc3Qg c3VidGl0bGUgPSBudWxsOwotICAgICAgICBzdXBlcihzY3JpcHQsICJzY3JpcHQiLCB0aXRsZSwg c3VidGl0bGUpOworICAgICAgICBsZXQgc2NyaXB0RGlzcGxheU5hbWUgPSBzY3JpcHQuZGlzcGxh eU5hbWU7CiAKLSAgICAgICAgdGhpcy5tYWluVGl0bGUgPSBzY3JpcHQuZGlzcGxheU5hbWU7Cisg ICAgICAgIGxldCB0aXRsZSA9IG9wdGlvbnMubWFpblRpdGxlIHx8IHNjcmlwdERpc3BsYXlOYW1l OworICAgICAgICBsZXQgc3VidGl0bGUgPSBudWxsOworICAgICAgICBsZXQgdG9vbHRpcCA9IG51 bGw7CisgICAgICAgIGxldCBjbGFzc05hbWVzID0gWyJzY3JpcHQiXTsKIAogICAgICAgICBpZiAo c2NyaXB0LnVybCAmJiAhc2NyaXB0LmR5bmFtaWNhbGx5QWRkZWRTY3JpcHRFbGVtZW50KSB7Ci0g ICAgICAgICAgICBpZiAoc2NyaXB0LnVybENvbXBvbmVudHMuc2NoZW1lID09PSAid2ViLWluc3Bl Y3RvciIpCi0gICAgICAgICAgICAgICAgdGhpcy50b29sdGlwID0gdGhpcy5tYWluVGl0bGU7Ci0g ICAgICAgICAgICBlbHNlIHsKKyAgICAgICAgICAgIGlmIChzY3JpcHQudXJsQ29tcG9uZW50cy5z Y2hlbWUgIT09ICJ3ZWItaW5zcGVjdG9yIikgewogICAgICAgICAgICAgICAgIC8vIFNob3cgdGhl IGhvc3QgYXMgdGhlIHN1YnRpdGxlIGlmIGl0IGlzIGRpZmZlcmVudCBmcm9tIHRoZSBtYWluIHRp dGxlLgogICAgICAgICAgICAgICAgIGxldCBob3N0ID0gV0kuZGlzcGxheU5hbWVGb3JIb3N0KHNj cmlwdC51cmxDb21wb25lbnRzLmhvc3QpOwotICAgICAgICAgICAgICAgIHRoaXMuc3VidGl0bGUg PSB0aGlzLm1haW5UaXRsZSAhPT0gaG9zdCA/IGhvc3QgOiBudWxsOworICAgICAgICAgICAgICAg IGlmIChob3N0ICYmIHRpdGxlICE9PSBob3N0KQorICAgICAgICAgICAgICAgICAgICBzdWJ0aXRs ZSA9IGhvc3Q7CisgICAgICAgICAgICAgICAgZWxzZSBpZiAoc2NyaXB0RGlzcGxheU5hbWUgJiYg dGl0bGUgIT09IHNjcmlwdERpc3BsYXlOYW1lKQorICAgICAgICAgICAgICAgICAgICBzdWJ0aXRs ZSA9IHNjcmlwdERpc3BsYXlOYW1lOwogCi0gICAgICAgICAgICAgICAgdGhpcy50b29sdGlwID0g c2NyaXB0LnVybDsKKyAgICAgICAgICAgICAgICB0b29sdGlwID0gc2NyaXB0LnVybDsKICAgICAg ICAgICAgIH0KIAotICAgICAgICAgICAgdGhpcy5hZGRDbGFzc05hbWUoV0kuUmVzb3VyY2VUcmVl RWxlbWVudC5SZXNvdXJjZUljb25TdHlsZUNsYXNzTmFtZSk7Ci0gICAgICAgICAgICB0aGlzLmFk ZENsYXNzTmFtZShXSS5SZXNvdXJjZS5UeXBlLlNjcmlwdCk7CisgICAgICAgICAgICBjbGFzc05h bWVzLnB1c2goV0kuUmVzb3VyY2VUcmVlRWxlbWVudC5SZXNvdXJjZUljb25TdHlsZUNsYXNzTmFt ZSk7CisgICAgICAgICAgICBjbGFzc05hbWVzLnB1c2goV0kuUmVzb3VyY2UuVHlwZS5TY3JpcHQp OwogICAgICAgICB9IGVsc2UKLSAgICAgICAgICAgIHRoaXMuYWRkQ2xhc3NOYW1lKFdJLlNjcmlw dFRyZWVFbGVtZW50LkFub255bW91c1NjcmlwdEljb25TdHlsZUNsYXNzTmFtZSk7CisgICAgICAg ICAgICBjbGFzc05hbWVzLnB1c2goV0kuU2NyaXB0VHJlZUVsZW1lbnQuQW5vbnltb3VzU2NyaXB0 SWNvblN0eWxlQ2xhc3NOYW1lKTsKIAogICAgICAgICBpZiAoc2NyaXB0LmlzTWFpblJlc291cmNl KCkpIHsKICAgICAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHNjcmlwdC50YXJnZXQudHlwZSA9PT0g V0kuVGFyZ2V0VHlwZS5Xb3JrZXIgfHwgc2NyaXB0LnRhcmdldC50eXBlID09PSBXSS5UYXJnZXRU eXBlLlNlcnZpY2VXb3JrZXIsIHNjcmlwdC50YXJnZXQudHlwZSk7Ci0gICAgICAgICAgICB0aGlz LmFkZENsYXNzTmFtZSgid29ya2VyLWljb24iKTsKKyAgICAgICAgICAgIGNsYXNzTmFtZXMucHVz aCgid29ya2VyLWljb24iKTsKICAgICAgICAgfQogCisgICAgICAgIHN1cGVyKHNjcmlwdCwgY2xh c3NOYW1lcywgdGl0bGUsIHN1YnRpdGxlKTsKKwogICAgICAgICB0aGlzLl9zY3JpcHQgPSBzY3Jp cHQ7CisKKyAgICAgICAgaWYgKHRvb2x0aXApCisgICAgICAgICAgICB0aGlzLnRvb2x0aXAgPSB0 b29sdGlwOwogICAgIH0KIAogICAgIC8vIFB1YmxpYwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYklu c3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVmlld3MvV29ya2VyVHJlZUVsZW1lbnQuanMgYi9Tb3Vy Y2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Xb3JrZXJUcmVlRWxlbWVudC5q cwppbmRleCA0ZjkzMjU4Y2I5ODBhZmJiYTIwMjA5ZWViMTlmMGU2ZDRlMmYxMDBmLi5iZTQ2ZjUx YTBjNzc1YjlhOWFiYmMyZjYwZGVhOWRjMTFkNTljYTFhIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Xb3JrZXJUcmVlRWxlbWVudC5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9Xb3JrZXJUcmVlRWxl bWVudC5qcwpAQCAtMzAsMTIgKzMwLDE2IEBAIFdJLldvcmtlclRyZWVFbGVtZW50ID0gY2xhc3Mg V29ya2VyVHJlZUVsZW1lbnQgZXh0ZW5kcyBXSS5TY3JpcHRUcmVlRWxlbWVudAogewogICAgIGNv bnN0cnVjdG9yKHRhcmdldCkKICAgICB7Ci0gICAgICAgIHN1cGVyKHRhcmdldC5tYWluUmVzb3Vy Y2UpOwotCiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRhcmdldCBpbnN0YW5jZW9mIFdJLlRhcmdl dCk7CiAgICAgICAgIGNvbnNvbGUuYXNzZXJ0KHRhcmdldC50eXBlID09PSBXSS5UYXJnZXRUeXBl LldvcmtlciB8fCB0YXJnZXQudHlwZSA9PT0gV0kuVGFyZ2V0VHlwZS5TZXJ2aWNlV29ya2VyKTsK ICAgICAgICAgY29uc29sZS5hc3NlcnQodGFyZ2V0Lm1haW5SZXNvdXJjZSBpbnN0YW5jZW9mIFdJ LlNjcmlwdCk7CiAKKyAgICAgICAgbGV0IG9wdGlvbnMgPSB7fTsKKyAgICAgICAgaWYgKHRhcmdl dCBpbnN0YW5jZW9mIFdJLldvcmtlclRhcmdldCkKKyAgICAgICAgICAgIG9wdGlvbnMubWFpblRp dGxlID0gdGFyZ2V0LmN1c3RvbU5hbWU7CisKKyAgICAgICAgc3VwZXIodGFyZ2V0Lm1haW5SZXNv dXJjZSwgb3B0aW9ucyk7CisKICAgICAgICAgdGhpcy5fdGFyZ2V0ID0gdGFyZ2V0OwogICAgICAg ICB0aGlzLl90YXJnZXQuYWRkRXZlbnRMaXN0ZW5lcihXSS5UYXJnZXQuRXZlbnQuUmVzb3VyY2VB ZGRlZCwgdGhpcy5fcmVzb3VyY2VBZGRlZCwgdGhpcyk7CiAgICAgICAgIHRoaXMuX3RhcmdldC5h ZGRFdmVudExpc3RlbmVyKFdJLlRhcmdldC5FdmVudC5TY3JpcHRBZGRlZCwgdGhpcy5fc2NyaXB0 QWRkZWQsIHRoaXMpOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGU4NDRmY2ZhNjU5NzFlNjQ5NzRlZWY2ZGVkYzEwZmExZDFl ZTZiMzQuLmZkZjRkZTUzMmNkNzMwNmI2ZWViOWZmOTI2NDRmODc4NjgxYmY2ZDMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwxMyBAQAorMjAyMC0wNC0zMCAgRGV2aW4gUm91c3NvICA8ZHJvdXNzb0BhcHBsZS5j b20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogV29ya2VyOiBzaG91bGQgdXNlIHRoZSBuYW1l IG9mIHRoZSB3b3JrZXIgaWYgaXQgZXhpc3RzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMTEyNDQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICAqIGluc3BlY3Rvci93b3JrZXIvcnVudGltZS1iYXNpYy5odG1s OgorICAgICAgICAqIGluc3BlY3Rvci93b3JrZXIvcnVudGltZS1iYXNpYy1leHBlY3RlZC50eHQ6 CisKIDIwMjAtMDQtMzAgIFNpbW9uIEZyYXNlciAgPHNpbW9uLmZyYXNlckBhcHBsZS5jb20+CiAK ICAgICAgICAgYm9yZGVyLXJhZGl1cyBmYWlscyB0byBjbGlwIGlmcmFtZSBjb250ZW50cwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9ydW50aW1lLWJhc2ljLWV4cGVj dGVkLnR4dCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3JrZXIvcnVudGltZS1iYXNpYy1leHBl Y3RlZC50eHQKaW5kZXggMWYxNDQ1ODAzYmZiZGNlYzAwMTdiNGVhOWE3NWU0ZWY5N2E3ZjhlMC4u ZDQyNzkzYjI1MjdkYTJiYTY0N2U5NGMxMjA3ZmQzZmQ4YjQ4MDFlYSAxMDA2NDQKLS0tIGEvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3dvcmtlci9ydW50aW1lLWJhc2ljLWV4cGVjdGVkLnR4dAorKysg Yi9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya2VyL3J1bnRpbWUtYmFzaWMtZXhwZWN0ZWQudHh0 CkBAIC02LDExICs2LDExIEBAIFRlc3QgZm9yIFJ1bnRpbWVBZ2VudCBpbiBhIFdvcmtlci4KIFRh cmdldCAtIFBhZ2UgLSBwYXNzcGhyYXNlIC0gcGFnZS1wYXNzcGhyYXNlCiAKIC0tIFJ1bm5pbmcg dGVzdCBjYXNlOiBXb3JrZXIuUnVudGltZS5ldmFsdWF0ZQotVGFyZ2V0IC0gd29ya2VyLTEuanMg LSBwYXNzcGhyYXNlIC0gd29ya2VyLXBhc3NwaHJhc2UKK1RhcmdldCAtIFRlc3RXb3JrZXIgLSBw YXNzcGhyYXNlIC0gd29ya2VyLXBhc3NwaHJhc2UKIAogLS0gUnVubmluZyB0ZXN0IGNhc2U6IE1h aW4uUnVudGltZS5SZW1vdGVPYmplY3RBbmRQcm9wZXJ0eURlc2NyaXB0b3IuCiBUYXJnZXQgLSBQ YWdlIC0gbG9jYXRpb24gYW5kIGhyZWYgLSBMb2NhdGlvbjogaW5zcGVjdG9yL3dvcmtlci9ydW50 aW1lLWJhc2ljLmh0bWwKIAogLS0gUnVubmluZyB0ZXN0IGNhc2U6IFdvcmtlci5SdW50aW1lLlJl bW90ZU9iamVjdEFuZFByb3BlcnR5RGVzY3JpcHRvci4KLVRhcmdldCAtIHdvcmtlci0xLmpzIC0g bG9jYXRpb24gYW5kIGhyZWYgLSBXb3JrZXJMb2NhdGlvbjogaW5zcGVjdG9yL3dvcmtlci9yZXNv dXJjZXMvd29ya2VyLTEuanMKK1RhcmdldCAtIFRlc3RXb3JrZXIgLSBsb2NhdGlvbiBhbmQgaHJl ZiAtIFdvcmtlckxvY2F0aW9uOiBpbnNwZWN0b3Ivd29ya2VyL3Jlc291cmNlcy93b3JrZXItMS5q cwogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbnNwZWN0b3Ivd29ya2VyL3J1bnRpbWUtYmFz aWMuaHRtbCBiL0xheW91dFRlc3RzL2luc3BlY3Rvci93b3JrZXIvcnVudGltZS1iYXNpYy5odG1s CmluZGV4IDNmZmFmM2VmZDYwZTQ4ZTkwMDM4ODM4OWJkOTM4ZGNkNTk0NWE5ZmEuLmE5YzYxYmFl M2NmNzk1NmMyNjFlOTFiY2JjMDhmZmNlZTg2OTk0ZWYgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L2luc3BlY3Rvci93b3JrZXIvcnVudGltZS1iYXNpYy5odG1sCisrKyBiL0xheW91dFRlc3RzL2lu c3BlY3Rvci93b3JrZXIvcnVudGltZS1iYXNpYy5odG1sCkBAIC00LDcgKzQsNyBAQAogPHNjcmlw dCBzcmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVz dC5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0PgogcGFzc3BocmFzZSA9ICJwYWdlLXBhc3NwaHJhc2Ui OwotbGV0IHdvcmtlciA9IG5ldyBXb3JrZXIoInJlc291cmNlcy93b3JrZXItMS5qcyIpOworbGV0 IHdvcmtlciA9IG5ldyBXb3JrZXIoInJlc291cmNlcy93b3JrZXItMS5qcyIsIHtuYW1lOiAiVGVz dFdvcmtlciJ9KTsKIAogZnVuY3Rpb24gdGVzdCgpCiB7Cg==