205692 2020-01-02 14:01:42 -0800 Improve release logging in ServiceWorkerFetchTask 2020-01-03 09:25:25 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez achristensen beidson ggaren krollin webkit-bug-importer youennf oldest_to_newest 1602229 0 cdumez 2020-01-02 14:01:42 -0800 Improve release logging in ServiceWorkerFetchTask to facilitate debugging. 1602230 1 386628 cdumez 2020-01-02 14:04:25 -0800 Created attachment 386628 Patch 1602263 2 krollin 2020-01-02 15:40:16 -0800 Looks good to me. 1602351 3 386628 youennf 2020-01-03 01:04:43 -0800 Comment on attachment 386628 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=386628&action=review > Source/WebKit/NetworkProcess/ServiceWorker/ServiceWorkerFetchTask.cpp:252 > + RELEASE_LOG_IF_ALLOWED("softUpdateIfNeeded: Scheduling soft update"); Would probably be better added in SWServerRegistration::scheduleSoftUpdate given scheduleSoftUpdate is called in two places. 1602457 4 386688 cdumez 2020-01-03 09:04:41 -0800 Created attachment 386688 Patch 1602462 5 386688 cdumez 2020-01-03 09:24:12 -0800 Comment on attachment 386688 Patch Clearing flags on attachment: 386688 Committed r254002: <https://trac.webkit.org/changeset/254002> 1602463 6 cdumez 2020-01-03 09:24:15 -0800 All reviewed patches have been landed. Closing bug. 1602464 7 webkit-bug-importer 2020-01-03 09:25:25 -0800 <rdar://problem/58299315> 386628 2020-01-02 14:04:25 -0800 2020-01-03 09:04:39 -0800 Patch bug-205692-20200102140424.patch text/plain 9869 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzOTc0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDFlZGVkYzQ3YjQwN2E0OGJi MDkzMzE1ZDRlODc1MTgzOWQxMDcyNzguLjdmZTYzOTQ3MjZjNzlhZGZlOTEzMzI3MDU3NjI1ODZi MDlmYWEzNzEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDEtMDIgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIHJlbGVhc2UgbG9nZ2lu ZyBpbiBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU2OTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbXByb3ZlIHJlbGVhc2UgbG9nZ2luZyBpbiBTZXJ2aWNlV29y a2VyRmV0Y2hUYXNrIHRvIGZhY2lsaXRhdGUgZGVidWdnaW5nLgorCisgICAgICAgICogTmV0d29y a1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmNwcDoKKyAgICAg ICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6U2VydmljZVdvcmtlckZldGNoVGFz ayk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6On5TZXJ2aWNlV29y a2VyRmV0Y2hUYXNrKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6 c3RhcnQpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpjb250ZXh0 Q2xvc2VkKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6c3RhcnRG ZXRjaCk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRpZFJlY2Vp dmVSZWRpcmVjdFJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNo VGFzazo6ZGlkUmVjZWl2ZVJlc3BvbnNlKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtl ckZldGNoVGFzazo6ZGlkRmluaXNoKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZl dGNoVGFzazo6ZGlkRmFpbCk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRh c2s6OmRpZE5vdEhhbmRsZSk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRh c2s6OmNhbm5vdEhhbmRsZSk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRh c2s6OmNhbmNlbEZyb21DbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0 Y2hUYXNrOjpjb250aW51ZURpZFJlY2VpdmVGZXRjaFJlc3BvbnNlKToKKyAgICAgICAgKFdlYktp dDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6Y29udGludWVGZXRjaFRhc2tXaXRoKToKKyAgICAg ICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6dGltZW91dFRpbWVyRmlyZWQpOgor ICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpzb2Z0VXBkYXRlSWZOZWVk ZWQpOgorCiAyMDIwLTAxLTAyICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gUmVwbGFjZSAidW5leHBlY3RlZGx5IHJlc3VtZWQiIG9ic2VydmVyIHdpdGgg UnVubmluZ0JvYXJkIHN1c3BlbmRpYmxlIGFzc2VydGlvbnMKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNr LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNl V29ya2VyRmV0Y2hUYXNrLmNwcAppbmRleCBjMjNhMWU2ZTc0MDI2Nzc0NjM4NDEwNTgyOTlmNDc5 YWI1ODM4ZGU4Li5hNzNhZWY5MzhlNzUxZDE4Y2YxMDc3MDY0NDJiMzE0ZjY5NGQ1MDk1IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2Vydmlj ZVdvcmtlckZldGNoVGFzay5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9T ZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwCkBAIC00Myw4ICs0Myw4IEBA CiAjaW5jbHVkZSA8V2ViQ29yZS9Dcm9zc09yaWdpbkFjY2Vzc0NvbnRyb2wuaD4KICNpbmNsdWRl IDxXZWJDb3JlL1NXU2VydmVyUmVnaXN0cmF0aW9uLmg+CiAKLSNkZWZpbmUgUkVMRUFTRV9MT0df SUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9MT0dfSUYobV9sb2FkZXIuc2Vzc2lvbklEKCku aXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIFNlcnZpY2VXb3JrZXIsICIlcCAtIFNlcnZpY2VX b3JrZXJGZXRjaFRhc2s6OiIgZm10LCB0aGlzLCAjI19fVkFfQVJHU19fKQotI2RlZmluZSBSRUxF QVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKGZtdCwgLi4uKSBSRUxFQVNFX0xPR19FUlJPUl9JRiht X2xvYWRlci5zZXNzaW9uSUQoKS5pc0Fsd2F5c09uTG9nZ2luZ0FsbG93ZWQoKSwgU2VydmljZVdv cmtlciwgIiVwIC0gU2VydmljZVdvcmtlckZldGNoVGFzazo6IiBmbXQsIHRoaXMsICMjX19WQV9B UkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoZm10LCAuLi4pIFJFTEVBU0Vf TE9HX0lGKG1fbG9hZGVyLnNlc3Npb25JRCgpLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBT ZXJ2aWNlV29ya2VyLCAiJXAgLSBbZmV0Y2hJZGVudGlmaWVyPSUiIFBSSXU2NCAiXSBTZXJ2aWNl V29ya2VyRmV0Y2hUYXNrOjoiIGZtdCwgdGhpcywgbV9mZXRjaElkZW50aWZpZXIudG9VSW50NjQo KSwgIyNfX1ZBX0FSR1NfXykKKyNkZWZpbmUgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChm bXQsIC4uLikgUkVMRUFTRV9MT0dfRVJST1JfSUYobV9sb2FkZXIuc2Vzc2lvbklEKCkuaXNBbHdh eXNPbkxvZ2dpbmdBbGxvd2VkKCksIFNlcnZpY2VXb3JrZXIsICIlcCAtIFtmZXRjaElkZW50aWZp ZXI9JSIgUFJJdTY0ICJdIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OiIgZm10LCB0aGlzLCBtX2Zl dGNoSWRlbnRpZmllci50b1VJbnQ2NCgpLCAjI19fVkFfQVJHU19fKQogCiB1c2luZyBuYW1lc3Bh Y2UgV2ViQ29yZTsKIApAQCAtNjAsMTEgKzYwLDEzIEBAIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6 OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2soTmV0d29ya1Jlc291cmNlTG9hZGVyJiBsb2FkZXIsIFJl CiAgICAgLCBtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyKHNlcnZpY2VXb3Jr ZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyKQogICAgICwgbV9zaG91bGRTb2Z0VXBkYXRlKHNob3Vs ZFNvZnRVcGRhdGUpCiB7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiU2VydmljZVdvcmtl ckZldGNoVGFzazogKHNlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyPSUiIFBSSXU2NCAiLCBzZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcj0lIiBQUkl1NjQgIiwgc2VydmljZVdvcmtl cklkZW50aWZpZXI9JSIgUFJJdTY0ICIpIiwgbV9zZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllci50 b1VJbnQ2NCgpLCBtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyLnRvVUludDY0 KCksIG1fc2VydmljZVdvcmtlcklkZW50aWZpZXIudG9VSW50NjQoKSk7CiAgICAgbV90aW1lb3V0 VGltZXIuc3RhcnRPbmVTaG90KGxvYWRlci5jb25uZWN0aW9uVG9XZWJQcm9jZXNzKCkubmV0d29y a1Byb2Nlc3MoKS5zZXJ2aWNlV29ya2VyRmV0Y2hUaW1lb3V0KCkpOwogfQogCiBTZXJ2aWNlV29y a2VyRmV0Y2hUYXNrOjp+U2VydmljZVdvcmtlckZldGNoVGFzaygpCiB7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRCgiflNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6Iik7CiAgICAgaWYgKG1fc2Vy dmljZVdvcmtlckNvbm5lY3Rpb24pCiAgICAgICAgIG1fc2VydmljZVdvcmtlckNvbm5lY3Rpb24t PnVucmVnaXN0ZXJGZXRjaCgqdGhpcyk7CiB9CkBAIC04MSw2ICs4Myw3IEBAIHRlbXBsYXRlPHR5 cGVuYW1lIE1lc3NhZ2U+IGJvb2wgU2VydmljZVdvcmtlckZldGNoVGFzazo6c2VuZFRvQ2xpZW50 KE1lc3NhZ2UmJiBtCiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6c3RhcnQoV2ViU1dT ZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uJiBzZXJ2aWNlV29ya2VyQ29ubmVjdGlvbikKIHsKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydDoiKTsKICAgICBtX3NlcnZpY2VXb3JrZXJD b25uZWN0aW9uID0gbWFrZVdlYWtQdHIoc2VydmljZVdvcmtlckNvbm5lY3Rpb24pOwogICAgIHNl cnZpY2VXb3JrZXJDb25uZWN0aW9uLnJlZ2lzdGVyRmV0Y2goKnRoaXMpOwogCkBAIC04OSw2ICs5 Miw3IEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6c3RhcnQoV2ViU1dTZXJ2ZXJUb0Nv bnRleHRDb25uZWN0aW9uJiBzZXJ2aWNlV29ya2VyCiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNo VGFzazo6Y29udGV4dENsb3NlZCgpCiB7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY29u dGV4dENsb3NlZDogKG1faXNEb25lPSVkLCBtX3dhc0hhbmRsZWQ9JWQpIiwgbV9pc0RvbmUsIG1f d2FzSGFuZGxlZCk7CiAgICAgaWYgKG1faXNEb25lKQogICAgICAgICByZXR1cm47CiAKQEAgLTEw MSw2ICsxMDUsNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmNvbnRleHRDbG9zZWQo KQogCiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OnN0YXJ0RmV0Y2goKQogeworICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0RmV0Y2giKTsKICAgICBtX2xvYWRlci5jb25zdW1l U2FuZGJveEV4dGVuc2lvbnNJZk5lZWRlZCgpOwogICAgIGF1dG8mIG9wdGlvbnMgPSBtX2xvYWRl ci5wYXJhbWV0ZXJzKCkub3B0aW9uczsKICAgICBhdXRvIHJlZmVycmVyID0gbV9jdXJyZW50UmVx dWVzdC5odHRwUmVmZXJyZXIoKTsKQEAgLTExOCw3ICsxMjMsNyBAQCB2b2lkIFNlcnZpY2VXb3Jr ZXJGZXRjaFRhc2s6OmRpZFJlY2VpdmVSZWRpcmVjdFJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2Um JiByZXNwbwogICAgIGlmIChtX2lzRG9uZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgUkVMRUFT RV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2U6ICVzIiwgbV9mZXRj aElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIFJFTEVBU0Vf TE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZWRpcmVjdFJlc3BvbnNlOiIpOwogICAgIG1fd2Fz SGFuZGxlZCA9IHRydWU7CiAgICAgbV90aW1lb3V0VGltZXIuc3RvcCgpOwogICAgIHNvZnRVcGRh dGVJZk5lZWRlZCgpOwpAQCAtMTM0LDcgKzEzOSw3IEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNo VGFzazo6ZGlkUmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2UmJiByZXNwb25zZSwgYm9v CiAgICAgaWYgKG1faXNEb25lKQogICAgICAgICByZXR1cm47CiAKLSAgICBSRUxFQVNFX0xPR19J Rl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9n Z2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo ImRpZFJlY2VpdmVSZXNwb25zZTogKGh0dHBTdGF0dXNDb2RlPSVkLCBNSU1FVHlwZT0le3B1Ymxp Y31zLCBleHBlY3RlZENvbnRlbnRMZW5ndGg9JSIgUFJJZDY0ICIsIG5lZWRzQ29udGludWVEaWRS ZWNlaXZlUmVzcG9uc2VNZXNzYWdlPSVkKSIsIHJlc3BvbnNlLmh0dHBTdGF0dXNDb2RlKCksIHJl c3BvbnNlLm1pbWVUeXBlKCkudXRmOCgpLmRhdGEoKSwgcmVzcG9uc2UuZXhwZWN0ZWRDb250ZW50 TGVuZ3RoKCksIG5lZWRzQ29udGludWVEaWRSZWNlaXZlUmVzcG9uc2VNZXNzYWdlKTsKICAgICBt X3dhc0hhbmRsZWQgPSB0cnVlOwogICAgIG1fdGltZW91dFRpbWVyLnN0b3AoKTsKICAgICBzb2Z0 VXBkYXRlSWZOZWVkZWQoKTsKQEAgLTE2NCw3ICsxNjksNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJG ZXRjaFRhc2s6OmRpZFJlY2VpdmVGb3JtRGF0YShjb25zdCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNl JiBmbwogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpkaWRGaW5pc2goKQogewogICAgIEFT U0VSVCghbV90aW1lb3V0VGltZXIuaXNBY3RpdmUoKSk7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxM T1dFRCgiZGlkRmluaXNoRmV0Y2g6IGZldGNoSWRlbnRpZmllcjogJXMiLCBtX2ZldGNoSWRlbnRp Zmllci5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgUkVMRUFTRV9MT0dfSUZf QUxMT1dFRCgiZGlkRmluaXNoOiIpOwogCiAgICAgbV9pc0RvbmUgPSB0cnVlOwogICAgIG1fdGlt ZW91dFRpbWVyLnN0b3AoKTsKQEAgLTE3OCwxNiArMTgzLDE2IEBAIHZvaWQgU2VydmljZVdvcmtl ckZldGNoVGFzazo6ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKICAgICAgICAg bV90aW1lb3V0VGltZXIuc3RvcCgpOwogICAgICAgICBzb2Z0VXBkYXRlSWZOZWVkZWQoKTsKICAg ICB9Ci0gICAgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgiZGlkRmFpbEZldGNoOiBmZXRj aElkZW50aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygpLnV0Zjgo KS5kYXRhKCkpOworICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImRpZEZhaWw6IChl cnJvci5kb21haW49JXtwdWJsaWN9cywgZXJyb3IuY29kZT0lZCkiLCBlcnJvci5kb21haW4oKS51 dGY4KCkuZGF0YSgpLCBlcnJvci5lcnJvckNvZGUoKSk7CiAgICAgbV9sb2FkZXIuZGlkRmFpbExv YWRpbmcoZXJyb3IpOwogfQogCiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRpZE5vdEhh bmRsZSgpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkTm90SGFuZGxlRmV0Y2g6 IGZldGNoSWRlbnRpZmllcjogJXMiLCBtX2ZldGNoSWRlbnRpZmllci5sb2dnaW5nU3RyaW5nKCku dXRmOCgpLmRhdGEoKSk7CiAgICAgaWYgKG1faXNEb25lKQogICAgICAgICByZXR1cm47CiAKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWROb3RIYW5kbGU6Iik7CiAgICAgbV9pc0RvbmUg PSB0cnVlOwogICAgIG1fdGltZW91dFRpbWVyLnN0b3AoKTsKICAgICBzb2Z0VXBkYXRlSWZOZWVk ZWQoKTsKQEAgLTE5Nyw3ICsyMDIsNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRp ZE5vdEhhbmRsZSgpCiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6Y2Fubm90SGFuZGxl KCkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJjYW5ub3RIYW5kbGU6IGZldGNoSWRl bnRpZmllcjogJXMiLCBtX2ZldGNoSWRlbnRpZmllci5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRh dGEoKSk7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY2Fubm90SGFuZGxlOiIpOwogICAg IC8vIE1ha2Ugc3VyZSB3ZSBjYWxsIGRpZE5vdEhhbmRsZSBhc3luY2hyb25vdXNseSBiZWNhdXNl IGZhaWxpbmcgc3luY2hyb25vdXNseSB3b3VsZCBnZXQgdGhlIE5ldHdvcmtSZXNvdXJjZUxvYWRl ciBpbiBhIGJhZCBzdGF0ZS4KICAgICBSdW5Mb29wOjptYWluKCkuZGlzcGF0Y2goW3dlYWtUaGlz ID0gbWFrZVdlYWtQdHIodGhpcyldIHsKICAgICAgICAgaWYgKHdlYWtUaGlzKQpAQCAtMjA3LDE3 ICsyMTIsMTkgQEAgdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpjYW5ub3RIYW5kbGUoKQog CiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmNhbmNlbEZyb21DbGllbnQoKQogewotICAg IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNhbmNlbEZyb21DbGllbnQ6IGZldGNoSWRlbnRpZmll cjogJXMiLCBtX2ZldGNoSWRlbnRpZmllci5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7 CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY2FuY2VsRnJvbUNsaWVudDoiKTsKICAgICBz ZW5kVG9TZXJ2aWNlV29ya2VyKE1lc3NhZ2VzOjpXZWJTV0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlv bjo6Q2FuY2VsRmV0Y2ggeyBtX3NlcnZlckNvbm5lY3Rpb25JZGVudGlmaWVyLCBtX3NlcnZpY2VX b3JrZXJJZGVudGlmaWVyLCBtX2ZldGNoSWRlbnRpZmllciB9KTsKIH0KIAogdm9pZCBTZXJ2aWNl V29ya2VyRmV0Y2hUYXNrOjpjb250aW51ZURpZFJlY2VpdmVGZXRjaFJlc3BvbnNlKCkKIHsKKyAg ICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJjb250aW51ZURpZFJlY2VpdmVGZXRjaFJlc3BvbnNl OiIpOwogICAgIHNlbmRUb1NlcnZpY2VXb3JrZXIoTWVzc2FnZXM6OldlYlNXQ29udGV4dE1hbmFn ZXJDb25uZWN0aW9uOjpDb250aW51ZURpZFJlY2VpdmVGZXRjaFJlc3BvbnNlIHsgbV9zZXJ2ZXJD b25uZWN0aW9uSWRlbnRpZmllciwgbV9zZXJ2aWNlV29ya2VySWRlbnRpZmllciwgbV9mZXRjaElk ZW50aWZpZXIgfSk7CiB9CiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6Y29udGludWVG ZXRjaFRhc2tXaXRoKFJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QpCiB7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRCgiY29udGludWVGZXRjaFRhc2tXaXRoOiAoaGFzU2VydmljZVdvcmtlckNv bm5lY3Rpb249JWQpIiwgISFtX3NlcnZpY2VXb3JrZXJDb25uZWN0aW9uKTsKICAgICBpZiAoIW1f c2VydmljZVdvcmtlckNvbm5lY3Rpb24pIHsKICAgICAgICAgbV9sb2FkZXIuc2VydmljZVdvcmtl ckRpZE5vdEhhbmRsZSh0aGlzKTsKICAgICAgICAgcmV0dXJuOwpAQCAtMjMxLDE3ICsyMzgsMjAg QEAgdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjp0aW1lb3V0VGltZXJGaXJlZCgpCiB7CiAg ICAgc29mdFVwZGF0ZUlmTmVlZGVkKCk7CiAKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJ0 aW1lb3V0VGltZXJGaXJlZDogZmV0Y2hJZGVudGlmaWVyOiAlcyIsIG1fZmV0Y2hJZGVudGlmaWVy LmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBSRUxFQVNFX0xPR19FUlJPUl9J Rl9BTExPV0VEKCJ0aW1lb3V0VGltZXJGaXJlZDogKGhhc1NlcnZpY2VXb3JrZXJDb25uZWN0aW9u PSVkKSIsICEhbV9zZXJ2aWNlV29ya2VyQ29ubmVjdGlvbik7CiAgICAgaWYgKG1fc2VydmljZVdv cmtlckNvbm5lY3Rpb24pCiAgICAgICAgIG1fc2VydmljZVdvcmtlckNvbm5lY3Rpb24tPmZldGNo VGFza1RpbWVkT3V0KHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyKCkpOwogfQogCiB2b2lkIFNlcnZp Y2VXb3JrZXJGZXRjaFRhc2s6OnNvZnRVcGRhdGVJZk5lZWRlZCgpCiB7CisgICAgUkVMRUFTRV9M T0dfSUZfQUxMT1dFRCgic29mdFVwZGF0ZUlmTmVlZGVkOiAobV9zaG91bGRTb2Z0VXBkYXRlPSVk KSIsIG1fc2hvdWxkU29mdFVwZGF0ZSk7CiAgICAgaWYgKCFtX3Nob3VsZFNvZnRVcGRhdGUpCiAg ICAgICAgIHJldHVybjsKLSAgICBpZiAoYXV0byogcmVnaXN0cmF0aW9uID0gbV9sb2FkZXIuY29u bmVjdGlvblRvV2ViUHJvY2VzcygpLnN3Q29ubmVjdGlvbigpLnNlcnZlcigpLmdldFJlZ2lzdHJh dGlvbihtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyKSkKKyAgICBpZiAoYXV0 byogcmVnaXN0cmF0aW9uID0gbV9sb2FkZXIuY29ubmVjdGlvblRvV2ViUHJvY2VzcygpLnN3Q29u bmVjdGlvbigpLnNlcnZlcigpLmdldFJlZ2lzdHJhdGlvbihtX3NlcnZpY2VXb3JrZXJSZWdpc3Ry YXRpb25JZGVudGlmaWVyKSkgeworICAgICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzb2Z0 VXBkYXRlSWZOZWVkZWQ6IFNjaGVkdWxpbmcgc29mdCB1cGRhdGUiKTsKICAgICAgICAgcmVnaXN0 cmF0aW9uLT5zY2hlZHVsZVNvZnRVcGRhdGUoKTsKKyAgICB9CiB9CiAKIH0gLy8gbmFtZXNwYWNl IFdlYktpdAo= 386688 2020-01-03 09:04:41 -0800 2020-01-03 09:24:12 -0800 Patch bug-205692-20200103090439.patch text/plain 10375 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjU0MDAxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGI3OTg1OTMzYjQyOGQxY2I0 YmM1MjRmMTUzYjczMzkzNGI3ODMwODguLjlhOTE1NzEyNGNmMTU0NzYxOTY5MTQ5YzU4ZWU4MzM1 Y2RhMTJiMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzAgQEAKKzIwMjAtMDEtMDMgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBJbXByb3ZlIHJlbGVhc2UgbG9nZ2lu ZyBpbiBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD0yMDU2OTIKKworICAgICAgICBSZXZpZXdlZCBieSBZb3Vlbm4g RmFibGV0LgorCisgICAgICAgIEltcHJvdmUgcmVsZWFzZSBsb2dnaW5nIGluIFNlcnZpY2VXb3Jr ZXJGZXRjaFRhc2sgdG8gZmFjaWxpdGF0ZSBkZWJ1Z2dpbmcuCisKKyAgICAgICAgKiBOZXR3b3Jr UHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwOgorICAgICAg ICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNr KToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6flNlcnZpY2VXb3Jr ZXJGZXRjaFRhc2spOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpz dGFydCk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmNvbnRleHRD bG9zZWQpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpzdGFydEZl dGNoKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVjZWl2 ZVJlZGlyZWN0UmVzcG9uc2UpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hU YXNrOjpkaWRSZWNlaXZlUmVzcG9uc2UpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2Vy RmV0Y2hUYXNrOjpkaWRGaW5pc2gpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0 Y2hUYXNrOjpkaWRGYWlsKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFz azo6ZGlkTm90SGFuZGxlKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFz azo6Y2Fubm90SGFuZGxlKToKKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFz azo6Y2FuY2VsRnJvbUNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRj aFRhc2s6OmNvbnRpbnVlRGlkUmVjZWl2ZUZldGNoUmVzcG9uc2UpOgorICAgICAgICAoV2ViS2l0 OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpjb250aW51ZUZldGNoVGFza1dpdGgpOgorICAgICAg ICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjp0aW1lb3V0VGltZXJGaXJlZCk6Cisg ICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OnNvZnRVcGRhdGVJZk5lZWRl ZCk6CisKIDIwMjAtMDEtMDMgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAg ICAgICAgIEZpeCBub24tbGlid2VicnRjIGJ1aWxkcyBhZnRlciByMjUzOTU3CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyUmVnaXN0cmF0 aW9uLmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJS ZWdpc3RyYXRpb24uY3BwCmluZGV4IDkwYTE2ZDdiMzQ5MWJlYjAxNjdkNjNkNTE4YTY3ZDhkYWZh YWE3OGQuLmE1OGJiMDMzNWQyYTdhYzNmZDg0MTdmNWYxMDljMmM4YTM0YTgzZjEgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJSZWdpc3Ry YXRpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dT ZXJ2ZXJSZWdpc3RyYXRpb24uY3BwCkBAIC0zNzQsNiArMzc0LDEwIEBAIHZvaWQgU1dTZXJ2ZXJS ZWdpc3RyYXRpb246OnNjaGVkdWxlU29mdFVwZGF0ZSgpCiB7CiAgICAgLy8gVG8gYXZvaWQgc2No ZWR1bGluZyBtYW55IHVwZGF0ZXMgZHVyaW5nIGEgc2luZ2xlIHBhZ2UgbG9hZCwgd2UgZG8gc29m dCB1cGRhdGVzIG9uIGEgMSBzZWNvbmQgZGVsYXkgYW5kIGtlZXAgZGVsYXlpbmcKICAgICAvLyBh cyBsb25nIGFzIHNvZnQgdXBkYXRlIHJlcXVlc3RzIGtlZXAgY29taW5nLiBUaGlzIHNlZW1zIHRv IG1hdGNoIENocm9tZSdzIGJlaGF2aW9yLgorICAgIGlmIChtX3NvZnRVcGRhdGVUaW1lci5pc0Fj dGl2ZSgpKQorICAgICAgICByZXR1cm47CisKKyAgICBSRUxFQVNFX0xPRyhTZXJ2aWNlV29ya2Vy LCAiU1dTZXJ2ZXJSZWdpc3RyYXRpb246OnNvZnRVcGRhdGVJZk5lZWRlZCIpOwogICAgIG1fc29m dFVwZGF0ZVRpbWVyLnN0YXJ0T25lU2hvdChzb2Z0VXBkYXRlRGVsYXkpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdv cmtlckZldGNoVGFzay5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VX b3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5jcHAKaW5kZXggYzIzYTFlNmU3NDAyNjc3NDYz ODQxMDU4Mjk5ZjQ3OWFiNTgzOGRlOC4uM2Y1ZDE3OWQyZjM3NDdmZTU1NzNjZDkwMWZhYWUxOGU4 NTRkZGJjZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNl V29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmNwcApAQCAt NDMsOCArNDMsOCBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9s Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9TV1NlcnZlclJlZ2lzdHJhdGlvbi5oPgogCi0jZGVmaW5l IFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoZm10LCAuLi4pIFJFTEVBU0VfTE9HX0lGKG1fbG9hZGVy LnNlc3Npb25JRCgpLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBTZXJ2aWNlV29ya2VyLCAi JXAgLSBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjoiIGZtdCwgdGhpcywgIyNfX1ZBX0FSR1NfXykK LSNkZWZpbmUgUkVMRUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRChmbXQsIC4uLikgUkVMRUFTRV9M T0dfRVJST1JfSUYobV9sb2FkZXIuc2Vzc2lvbklEKCkuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2Vk KCksIFNlcnZpY2VXb3JrZXIsICIlcCAtIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OiIgZm10LCB0 aGlzLCAjI19fVkFfQVJHU19fKQorI2RlZmluZSBSRUxFQVNFX0xPR19JRl9BTExPV0VEKGZtdCwg Li4uKSBSRUxFQVNFX0xPR19JRihtX2xvYWRlci5zZXNzaW9uSUQoKS5pc0Fsd2F5c09uTG9nZ2lu Z0FsbG93ZWQoKSwgU2VydmljZVdvcmtlciwgIiVwIC0gW2ZldGNoSWRlbnRpZmllcj0lIiBQUkl1 NjQgIl0gU2VydmljZVdvcmtlckZldGNoVGFzazo6IiBmbXQsIHRoaXMsIG1fZmV0Y2hJZGVudGlm aWVyLnRvVUludDY0KCksICMjX19WQV9BUkdTX18pCisjZGVmaW5lIFJFTEVBU0VfTE9HX0VSUk9S X0lGX0FMTE9XRUQoZm10LCAuLi4pIFJFTEVBU0VfTE9HX0VSUk9SX0lGKG1fbG9hZGVyLnNlc3Np b25JRCgpLmlzQWx3YXlzT25Mb2dnaW5nQWxsb3dlZCgpLCBTZXJ2aWNlV29ya2VyLCAiJXAgLSBb ZmV0Y2hJZGVudGlmaWVyPSUiIFBSSXU2NCAiXSBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjoiIGZt dCwgdGhpcywgbV9mZXRjaElkZW50aWZpZXIudG9VSW50NjQoKSwgIyNfX1ZBX0FSR1NfXykKIAog dXNpbmcgbmFtZXNwYWNlIFdlYkNvcmU7CiAKQEAgLTYwLDExICs2MCwxMyBAQCBTZXJ2aWNlV29y a2VyRmV0Y2hUYXNrOjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrKE5ldHdvcmtSZXNvdXJjZUxvYWRl ciYgbG9hZGVyLCBSZQogICAgICwgbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmll cihzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcikKICAgICAsIG1fc2hvdWxkU29m dFVwZGF0ZShzaG91bGRTb2Z0VXBkYXRlKQogeworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQo IlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6IChzZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmllcj0lIiBQ Ukl1NjQgIiwgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXI9JSIgUFJJdTY0ICIs IHNlcnZpY2VXb3JrZXJJZGVudGlmaWVyPSUiIFBSSXU2NCAiKSIsIG1fc2VydmVyQ29ubmVjdGlv bklkZW50aWZpZXIudG9VSW50NjQoKSwgbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRp Zmllci50b1VJbnQ2NCgpLCBtX3NlcnZpY2VXb3JrZXJJZGVudGlmaWVyLnRvVUludDY0KCkpOwog ICAgIG1fdGltZW91dFRpbWVyLnN0YXJ0T25lU2hvdChsb2FkZXIuY29ubmVjdGlvblRvV2ViUHJv Y2VzcygpLm5ldHdvcmtQcm9jZXNzKCkuc2VydmljZVdvcmtlckZldGNoVGltZW91dCgpKTsKIH0K IAogU2VydmljZVdvcmtlckZldGNoVGFzazo6flNlcnZpY2VXb3JrZXJGZXRjaFRhc2soKQogewor ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoIn5TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOiIpOwog ICAgIGlmIChtX3NlcnZpY2VXb3JrZXJDb25uZWN0aW9uKQogICAgICAgICBtX3NlcnZpY2VXb3Jr ZXJDb25uZWN0aW9uLT51bnJlZ2lzdGVyRmV0Y2goKnRoaXMpOwogfQpAQCAtODEsNiArODMsNyBA QCB0ZW1wbGF0ZTx0eXBlbmFtZSBNZXNzYWdlPiBib29sIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6 OnNlbmRUb0NsaWVudChNZXNzYWdlJiYgbQogCiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6 OnN0YXJ0KFdlYlNXU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbiYgc2VydmljZVdvcmtlckNvbm5l Y3Rpb24pCiB7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgic3RhcnQ6Iik7CiAgICAgbV9z ZXJ2aWNlV29ya2VyQ29ubmVjdGlvbiA9IG1ha2VXZWFrUHRyKHNlcnZpY2VXb3JrZXJDb25uZWN0 aW9uKTsKICAgICBzZXJ2aWNlV29ya2VyQ29ubmVjdGlvbi5yZWdpc3RlckZldGNoKCp0aGlzKTsK IApAQCAtODksNiArOTIsNyBAQCB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OnN0YXJ0KFdl YlNXU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbiYgc2VydmljZVdvcmtlcgogCiB2b2lkIFNlcnZp Y2VXb3JrZXJGZXRjaFRhc2s6OmNvbnRleHRDbG9zZWQoKQogeworICAgIFJFTEVBU0VfTE9HX0lG X0FMTE9XRUQoImNvbnRleHRDbG9zZWQ6IChtX2lzRG9uZT0lZCwgbV93YXNIYW5kbGVkPSVkKSIs IG1faXNEb25lLCBtX3dhc0hhbmRsZWQpOwogICAgIGlmIChtX2lzRG9uZSkKICAgICAgICAgcmV0 dXJuOwogCkBAIC0xMDEsNiArMTA1LDcgQEAgdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpj b250ZXh0Q2xvc2VkKCkKIAogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpzdGFydEZldGNo KCkKIHsKKyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJzdGFydEZldGNoIik7CiAgICAgbV9s b2FkZXIuY29uc3VtZVNhbmRib3hFeHRlbnNpb25zSWZOZWVkZWQoKTsKICAgICBhdXRvJiBvcHRp b25zID0gbV9sb2FkZXIucGFyYW1ldGVycygpLm9wdGlvbnM7CiAgICAgYXV0byByZWZlcnJlciA9 IG1fY3VycmVudFJlcXVlc3QuaHR0cFJlZmVycmVyKCk7CkBAIC0xMTgsNyArMTIzLDcgQEAgdm9p ZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZShSZXNv dXJjZVJlc3BvbnNlJiYgcmVzcG8KICAgICBpZiAobV9pc0RvbmUpCiAgICAgICAgIHJldHVybjsK IAotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZWRpcmVjdFJlc3BvbnNl OiAlcyIsIG1fZmV0Y2hJZGVudGlmaWVyLmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsK KyAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZToi KTsKICAgICBtX3dhc0hhbmRsZWQgPSB0cnVlOwogICAgIG1fdGltZW91dFRpbWVyLnN0b3AoKTsK ICAgICBzb2Z0VXBkYXRlSWZOZWVkZWQoKTsKQEAgLTEzNCw3ICsxMzksNyBAQCB2b2lkIFNlcnZp Y2VXb3JrZXJGZXRjaFRhc2s6OmRpZFJlY2VpdmVSZXNwb25zZShSZXNvdXJjZVJlc3BvbnNlJiYg cmVzcG9uc2UsIGJvbwogICAgIGlmIChtX2lzRG9uZSkKICAgICAgICAgcmV0dXJuOwogCi0gICAg UkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlc3BvbnNlOiAlcyIsIG1fZmV0Y2hJ ZGVudGlmaWVyLmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBSRUxFQVNFX0xP R19JRl9BTExPV0VEKCJkaWRSZWNlaXZlUmVzcG9uc2U6IChodHRwU3RhdHVzQ29kZT0lZCwgTUlN RVR5cGU9JXtwdWJsaWN9cywgZXhwZWN0ZWRDb250ZW50TGVuZ3RoPSUiIFBSSWQ2NCAiLCBuZWVk c0NvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlTWVzc2FnZT0lZCkiLCByZXNwb25zZS5odHRwU3Rh dHVzQ29kZSgpLCByZXNwb25zZS5taW1lVHlwZSgpLnV0ZjgoKS5kYXRhKCksIHJlc3BvbnNlLmV4 cGVjdGVkQ29udGVudExlbmd0aCgpLCBuZWVkc0NvbnRpbnVlRGlkUmVjZWl2ZVJlc3BvbnNlTWVz c2FnZSk7CiAgICAgbV93YXNIYW5kbGVkID0gdHJ1ZTsKICAgICBtX3RpbWVvdXRUaW1lci5zdG9w KCk7CiAgICAgc29mdFVwZGF0ZUlmTmVlZGVkKCk7CkBAIC0xNjQsNyArMTY5LDcgQEAgdm9pZCBT ZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpkaWRSZWNlaXZlRm9ybURhdGEoY29uc3QgSVBDOjpGb3Jt RGF0YVJlZmVyZW5jZSYgZm8KIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkRmluaXNo KCkKIHsKICAgICBBU1NFUlQoIW1fdGltZW91dFRpbWVyLmlzQWN0aXZlKCkpOwotICAgIFJFTEVB U0VfTE9HX0lGX0FMTE9XRUQoImRpZEZpbmlzaEZldGNoOiBmZXRjaElkZW50aWZpZXI6ICVzIiwg bV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIFJF TEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZEZpbmlzaDoiKTsKIAogICAgIG1faXNEb25lID0gdHJ1 ZTsKICAgICBtX3RpbWVvdXRUaW1lci5zdG9wKCk7CkBAIC0xNzgsMTYgKzE4MywxNiBAQCB2b2lk IFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRpZEZhaWwoY29uc3QgUmVzb3VyY2VFcnJvciYgZXJy b3IpCiAgICAgICAgIG1fdGltZW91dFRpbWVyLnN0b3AoKTsKICAgICAgICAgc29mdFVwZGF0ZUlm TmVlZGVkKCk7CiAgICAgfQotICAgIFJFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoImRpZEZh aWxGZXRjaDogZmV0Y2hJZGVudGlmaWVyOiAlcyIsIG1fZmV0Y2hJZGVudGlmaWVyLmxvZ2dpbmdT dHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBSRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VE KCJkaWRGYWlsOiAoZXJyb3IuZG9tYWluPSV7cHVibGljfXMsIGVycm9yLmNvZGU9JWQpIiwgZXJy b3IuZG9tYWluKCkudXRmOCgpLmRhdGEoKSwgZXJyb3IuZXJyb3JDb2RlKCkpOwogICAgIG1fbG9h ZGVyLmRpZEZhaWxMb2FkaW5nKGVycm9yKTsKIH0KIAogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hU YXNrOjpkaWROb3RIYW5kbGUoKQogewotICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZE5v dEhhbmRsZUZldGNoOiBmZXRjaElkZW50aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9n Z2luZ1N0cmluZygpLnV0ZjgoKS5kYXRhKCkpOwogICAgIGlmIChtX2lzRG9uZSkKICAgICAgICAg cmV0dXJuOwogCisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkTm90SGFuZGxlOiIpOwog ICAgIG1faXNEb25lID0gdHJ1ZTsKICAgICBtX3RpbWVvdXRUaW1lci5zdG9wKCk7CiAgICAgc29m dFVwZGF0ZUlmTmVlZGVkKCk7CkBAIC0xOTcsNyArMjAyLDcgQEAgdm9pZCBTZXJ2aWNlV29ya2Vy RmV0Y2hUYXNrOjpkaWROb3RIYW5kbGUoKQogCiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6 OmNhbm5vdEhhbmRsZSgpCiB7Ci0gICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY2Fubm90SGFu ZGxlOiBmZXRjaElkZW50aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmlu ZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNhbm5vdEhh bmRsZToiKTsKICAgICAvLyBNYWtlIHN1cmUgd2UgY2FsbCBkaWROb3RIYW5kbGUgYXN5bmNocm9u b3VzbHkgYmVjYXVzZSBmYWlsaW5nIHN5bmNocm9ub3VzbHkgd291bGQgZ2V0IHRoZSBOZXR3b3Jr UmVzb3VyY2VMb2FkZXIgaW4gYSBiYWQgc3RhdGUuCiAgICAgUnVuTG9vcDo6bWFpbigpLmRpc3Bh dGNoKFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpXSB7CiAgICAgICAgIGlmICh3ZWFrVGhp cykKQEAgLTIwNywxNyArMjEyLDE5IEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6Y2Fu bm90SGFuZGxlKCkKIAogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpjYW5jZWxGcm9tQ2xp ZW50KCkKIHsKLSAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJjYW5jZWxGcm9tQ2xpZW50OiBm ZXRjaElkZW50aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygpLnV0 ZjgoKS5kYXRhKCkpOworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNhbmNlbEZyb21DbGll bnQ6Iik7CiAgICAgc2VuZFRvU2VydmljZVdvcmtlcihNZXNzYWdlczo6V2ViU1dDb250ZXh0TWFu YWdlckNvbm5lY3Rpb246OkNhbmNlbEZldGNoIHsgbV9zZXJ2ZXJDb25uZWN0aW9uSWRlbnRpZmll ciwgbV9zZXJ2aWNlV29ya2VySWRlbnRpZmllciwgbV9mZXRjaElkZW50aWZpZXIgfSk7CiB9CiAK IHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6Y29udGludWVEaWRSZWNlaXZlRmV0Y2hSZXNw b25zZSgpCiB7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY29udGludWVEaWRSZWNlaXZl RmV0Y2hSZXNwb25zZToiKTsKICAgICBzZW5kVG9TZXJ2aWNlV29ya2VyKE1lc3NhZ2VzOjpXZWJT V0NvbnRleHRNYW5hZ2VyQ29ubmVjdGlvbjo6Q29udGludWVEaWRSZWNlaXZlRmV0Y2hSZXNwb25z ZSB7IG1fc2VydmVyQ29ubmVjdGlvbklkZW50aWZpZXIsIG1fc2VydmljZVdvcmtlcklkZW50aWZp ZXIsIG1fZmV0Y2hJZGVudGlmaWVyIH0pOwogfQogCiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRh c2s6OmNvbnRpbnVlRmV0Y2hUYXNrV2l0aChSZXNvdXJjZVJlcXVlc3QmJiByZXF1ZXN0KQogewor ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNvbnRpbnVlRmV0Y2hUYXNrV2l0aDogKGhhc1Nl cnZpY2VXb3JrZXJDb25uZWN0aW9uPSVkKSIsICEhbV9zZXJ2aWNlV29ya2VyQ29ubmVjdGlvbik7 CiAgICAgaWYgKCFtX3NlcnZpY2VXb3JrZXJDb25uZWN0aW9uKSB7CiAgICAgICAgIG1fbG9hZGVy LnNlcnZpY2VXb3JrZXJEaWROb3RIYW5kbGUodGhpcyk7CiAgICAgICAgIHJldHVybjsKQEAgLTIz MSwxMyArMjM4LDE0IEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6dGltZW91dFRpbWVy RmlyZWQoKQogewogICAgIHNvZnRVcGRhdGVJZk5lZWRlZCgpOwogCi0gICAgUkVMRUFTRV9MT0df SUZfQUxMT1dFRCgidGltZW91dFRpbWVyRmlyZWQ6IGZldGNoSWRlbnRpZmllcjogJXMiLCBtX2Zl dGNoSWRlbnRpZmllci5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgUkVMRUFT RV9MT0dfRVJST1JfSUZfQUxMT1dFRCgidGltZW91dFRpbWVyRmlyZWQ6IChoYXNTZXJ2aWNlV29y a2VyQ29ubmVjdGlvbj0lZCkiLCAhIW1fc2VydmljZVdvcmtlckNvbm5lY3Rpb24pOwogICAgIGlm IChtX3NlcnZpY2VXb3JrZXJDb25uZWN0aW9uKQogICAgICAgICBtX3NlcnZpY2VXb3JrZXJDb25u ZWN0aW9uLT5mZXRjaFRhc2tUaW1lZE91dChzZXJ2aWNlV29ya2VySWRlbnRpZmllcigpKTsKIH0K IAogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpzb2Z0VXBkYXRlSWZOZWVkZWQoKQogewor ICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInNvZnRVcGRhdGVJZk5lZWRlZDogKG1fc2hvdWxk U29mdFVwZGF0ZT0lZCkiLCBtX3Nob3VsZFNvZnRVcGRhdGUpOwogICAgIGlmICghbV9zaG91bGRT b2Z0VXBkYXRlKQogICAgICAgICByZXR1cm47CiAgICAgaWYgKGF1dG8qIHJlZ2lzdHJhdGlvbiA9 IG1fbG9hZGVyLmNvbm5lY3Rpb25Ub1dlYlByb2Nlc3MoKS5zd0Nvbm5lY3Rpb24oKS5zZXJ2ZXIo KS5nZXRSZWdpc3RyYXRpb24obV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllcikp Cg==