212359 2020-05-25 12:13:26 -0700 Expose more network metrics to WebCoreNSURLSession 2020-05-25 17:04:22 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen benjamin cdumez cmarcelo darin ews-watchlist jer.noble webkit-bug-importer oldest_to_newest 1655905 0 achristensen 2020-05-25 12:13:26 -0700 Expose more network metrics to WebCoreNSURLSession 1655907 1 400212 achristensen 2020-05-25 12:14:38 -0700 Created attachment 400212 Patch 1655934 2 400212 darin 2020-05-25 14:29:58 -0700 Comment on attachment 400212 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400212&action=review > Source/WTF/wtf/PlatformHave.h:407 > +#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101500) || (PLATFORM(IOS_FAMILY) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 130000) The second half of this expression has the mistake Tim Horton mentioned recently, where it checks IOS_FAMILY, but checks __IPHONE_OS_VERSION_MIN_REQUIRED, which is frozen at an old value on watchOS and tvOS. It should either just check PLATFORM(IOS) and accept this will be false for tvOS and watchOS, or add minimum versions for those platforms. 1655947 3 400224 achristensen 2020-05-25 16:21:23 -0700 Created attachment 400224 Patch 1655948 4 400224 achristensen 2020-05-25 16:22:12 -0700 Comment on attachment 400224 Patch Since the API is public and clearly marked available on all platforms, I'll expand the good pattern in PlatformHave.h. 1655949 5 400224 darin 2020-05-25 16:26:32 -0700 Comment on attachment 400224 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=400224&action=review > Source/WebCore/platform/network/cocoa/WebCoreNSURLSession.mm:149 > +- (BOOL)cellular Why does the code above say "getter=isCellular" but here it’s named "cellular"? How do we test that this is correctly named or not? 1655950 6 ews-feeder 2020-05-25 17:03:19 -0700 Committed r262131: <https://trac.webkit.org/changeset/262131> All reviewed patches have been landed. Closing bug and clearing flags on attachment 400224. 1655951 7 webkit-bug-importer 2020-05-25 17:04:22 -0700 <rdar://problem/63607042> 400212 2020-05-25 12:14:38 -0700 2020-05-25 16:21:21 -0700 Patch bug-212359-20200525121437.patch text/plain 8759 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjIxMjcpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTA1LTI1ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG1vcmUgbmV0d29yayBt ZXRyaWNzIHRvIFdlYkNvcmVOU1VSTFNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjM1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogd3RmL1BsYXRmb3JtSGF2ZS5oOgorCiAyMDIwLTA1LTIy ICBEYXZpZCBLaWx6ZXIgIDxkZGtpbHplckBhcHBsZS5jb20+CiAKICAgICAgICAgV1RGOjppc1Zh bGlkRW51bSgpIGhhcyBhIHR5cG8gaW4gc3RhdGljX2Fzc2VydCBtYWtpbmcgaXQgYSB0YXV0b2xv Z2ljYWwgY29tcGFyaXNvbgpJbmRleDogU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gU291cmNlL1dURi93dGYvUGxhdGZvcm1IYXZlLmgJKHJldmlzaW9uIDI2MjEy NykKKysrIFNvdXJjZS9XVEYvd3RmL1BsYXRmb3JtSGF2ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC00 MDQsNiArNDA0LDEwIEBACiAjZGVmaW5lIEhBVkVfQ0ZORVRXT1JLX1NBTUVTSVRFX0NPT0tJRV9B UEkgMQogI2VuZGlmCiAKKyNpZiAoUExBVEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05f TUlOX1JFUVVJUkVEID49IDEwMTUwMCkgfHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBI T05FX09TX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEzMDAwMCkKKyNkZWZpbmUgSEFWRV9DRk5F VFdPUktfTUVUUklDU19DT05ORUNUSU9OX1BST1BFUlRJRVMgMQorI2VuZGlmCisKICNpZiAoUExB VEZPUk0oTUFDKSAmJiBfX01BQ19PU19YX1ZFUlNJT05fTUlOX1JFUVVJUkVEID49IDEwMTYwMCkg fHwgKFBMQVRGT1JNKElPU19GQU1JTFkpICYmIF9fSVBIT05FX09TX1ZFUlNJT05fTUlOX1JFUVVJ UkVEID49IDE0MDAwMCkKICNkZWZpbmUgSEFWRV9DRk5FVFdPUktfTUVUUklDU19BUElTX1Y0IDEK ICNlbmRpZgpJbmRleDogU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwkocmV2aXNpb24gMjYyMTI3KQorKysgU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjAtMDUtMjUg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBF eHBvc2UgbW9yZSBuZXR3b3JrIG1ldHJpY3MgdG8gV2ViQ29yZU5TVVJMU2Vzc2lvbgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEyMzU5CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3 b3JrL05ldHdvcmtMb2FkTWV0cmljcy5oOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0xvYWRN ZXRyaWNzOjppc29sYXRlZENvcHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0xv YWRNZXRyaWNzOjpvcGVyYXRvcj09IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtM b2FkTWV0cmljczo6ZW5jb2RlIGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtMb2Fk TWV0cmljczo6ZGVjb2RlKToKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNv cmVOU1VSTFNlc3Npb24ubW06CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25UYXNrVHJh bnNhY3Rpb25NZXRyaWNzIG5ldHdvcmtQcm90b2NvbE5hbWVdKToKKyAgICAgICAgKC1bV2ViQ29y ZU5TVVJMU2Vzc2lvblRhc2tUcmFuc2FjdGlvbk1ldHJpY3MgaXNSZXVzZWRDb25uZWN0aW9uXSk6 CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzIGNl bGx1bGFyXSk6CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25N ZXRyaWNzIGV4cGVuc2l2ZV0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uVGFza1Ry YW5zYWN0aW9uTWV0cmljcyBjb25zdHJhaW5lZF0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxT ZXNzaW9uVGFza1RyYW5zYWN0aW9uTWV0cmljcyBtdWx0aXBhdGhdKToKKwogMjAyMC0wNS0yNSAg WmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtTdWJwaXhlbCBsYXlv dXRdIEJhZCBzY3JvbGxpbmcgb24gbWVyY3VyeW5ld3MuY29tIGFydGljbGUKSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3Mu aAkocmV2aXNpb24gMjYyMTI3KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9O ZXR3b3JrTG9hZE1ldHJpY3MuaAkod29ya2luZyBjb3B5KQpAQCAtNzAsNiArNzAsMTEgQEAgcHVi bGljOgogICAgIC8vIEFMUE4gUHJvdG9jb2wgSUQ6IGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9yZXNv dXJjZS10aW1pbmcvI2JpYi1SRkM3MzAxCiAgICAgU3RyaW5nIHByb3RvY29sOwogICAgIGJvb2wg Y29tcGxldGUgeyBmYWxzZSB9OworICAgIGJvb2wgY2VsbHVsYXIgeyBmYWxzZSB9OworICAgIGJv b2wgZXhwZW5zaXZlIHsgZmFsc2UgfTsKKyAgICBib29sIGNvbnN0cmFpbmVkIHsgZmFsc2UgfTsK KyAgICBib29sIG11bHRpcGF0aCB7IGZhbHNlIH07CisgICAgYm9vbCBpc1JldXNlZENvbm5lY3Rp b24geyBmYWxzZSB9OwogfTsKIAogY2xhc3MgTmV0d29ya0xvYWRNZXRyaWNzIDogcHVibGljIE5l dHdvcmtMb2FkTWV0cmljc1dpdGhvdXROb25UaW1pbmdEYXRhIHsKQEAgLTk1LDYgKzEwMCwxMSBA QCBwdWJsaWM6CiAgICAgICAgIGNvcHkucmVzcG9uc2VFbmQgPSByZXNwb25zZUVuZDsKICAgICAg ICAgY29weS5jb21wbGV0ZSA9IGNvbXBsZXRlOwogICAgICAgICBjb3B5LnByb3RvY29sID0gcHJv dG9jb2wuaXNvbGF0ZWRDb3B5KCk7CisgICAgICAgIGNvcHkuY2VsbHVsYXIgPSBjZWxsdWxhcjsK KyAgICAgICAgY29weS5leHBlbnNpdmUgPSBleHBlbnNpdmU7CisgICAgICAgIGNvcHkuY29uc3Ry YWluZWQgPSBjb25zdHJhaW5lZDsKKyAgICAgICAgY29weS5tdWx0aXBhdGggPSBtdWx0aXBhdGg7 CisgICAgICAgIGNvcHkuaXNSZXVzZWRDb25uZWN0aW9uID0gaXNSZXVzZWRDb25uZWN0aW9uOwog CiAgICAgICAgIGNvcHkucmVtb3RlQWRkcmVzcyA9IHJlbW90ZUFkZHJlc3MuaXNvbGF0ZWRDb3B5 KCk7CiAgICAgICAgIGNvcHkuY29ubmVjdGlvbklkZW50aWZpZXIgPSBjb25uZWN0aW9uSWRlbnRp Zmllci5pc29sYXRlZENvcHkoKTsKQEAgLTEyNCw2ICsxMzQsMTEgQEAgcHVibGljOgogICAgICAg ICAgICAgJiYgcmVzcG9uc2VTdGFydCA9PSBvdGhlci5yZXNwb25zZVN0YXJ0CiAgICAgICAgICAg ICAmJiByZXNwb25zZUVuZCA9PSBvdGhlci5yZXNwb25zZUVuZAogICAgICAgICAgICAgJiYgY29t cGxldGUgPT0gb3RoZXIuY29tcGxldGUKKyAgICAgICAgICAgICYmIGNlbGx1bGFyID09IG90aGVy LmNlbGx1bGFyCisgICAgICAgICAgICAmJiBleHBlbnNpdmUgPT0gb3RoZXIuZXhwZW5zaXZlCisg ICAgICAgICAgICAmJiBjb25zdHJhaW5lZCA9PSBvdGhlci5jb25zdHJhaW5lZAorICAgICAgICAg ICAgJiYgbXVsdGlwYXRoID09IG90aGVyLm11bHRpcGF0aAorICAgICAgICAgICAgJiYgaXNSZXVz ZWRDb25uZWN0aW9uID09IG90aGVyLmlzUmV1c2VkQ29ubmVjdGlvbgogICAgICAgICAgICAgJiYg cHJvdG9jb2wgPT0gb3RoZXIucHJvdG9jb2wKICAgICAgICAgICAgICYmIHJlbW90ZUFkZHJlc3Mg PT0gb3RoZXIucmVtb3RlQWRkcmVzcwogICAgICAgICAgICAgJiYgY29ubmVjdGlvbklkZW50aWZp ZXIgPT0gb3RoZXIuY29ubmVjdGlvbklkZW50aWZpZXIKQEAgLTE4MCw2ICsxOTUsMTEgQEAgdm9p ZCBOZXR3b3JrTG9hZE1ldHJpY3M6OmVuY29kZShFbmNvZGVyJgogICAgIGVuY29kZXIgPDwgcmVz cG9uc2VTdGFydDsKICAgICBlbmNvZGVyIDw8IHJlc3BvbnNlRW5kOwogICAgIGVuY29kZXIgPDwg Y29tcGxldGU7CisgICAgZW5jb2RlciA8PCBjZWxsdWxhcjsKKyAgICBlbmNvZGVyIDw8IGV4cGVu c2l2ZTsKKyAgICBlbmNvZGVyIDw8IGNvbnN0cmFpbmVkOworICAgIGVuY29kZXIgPDwgbXVsdGlw YXRoOworICAgIGVuY29kZXIgPDwgaXNSZXVzZWRDb25uZWN0aW9uOwogICAgIGVuY29kZXIgPDwg cHJvdG9jb2w7CiAgICAgZW5jb2RlciA8PCByZW1vdGVBZGRyZXNzOwogICAgIGVuY29kZXIgPDwg Y29ubmVjdGlvbklkZW50aWZpZXI7CkBAIC0yMDcsNiArMjI3LDExIEBAIGJvb2wgTmV0d29ya0xv YWRNZXRyaWNzOjpkZWNvZGUoRGVjb2RlciYKICAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0 cmljcy5yZXNwb25zZVN0YXJ0KQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnJl c3BvbnNlRW5kKQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLmNvbXBsZXRlKQor ICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLmNlbGx1bGFyKQorICAgICAgICAmJiBk ZWNvZGVyLmRlY29kZShtZXRyaWNzLmV4cGVuc2l2ZSkKKyAgICAgICAgJiYgZGVjb2Rlci5kZWNv ZGUobWV0cmljcy5jb25zdHJhaW5lZCkKKyAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0cmlj cy5tdWx0aXBhdGgpCisgICAgICAgICYmIGRlY29kZXIuZGVjb2RlKG1ldHJpY3MuaXNSZXVzZWRD b25uZWN0aW9uKQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnByb3RvY29sKQog ICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnJlbW90ZUFkZHJlc3MpCiAgICAgICAg ICYmIGRlY29kZXIuZGVjb2RlKG1ldHJpY3MuY29ubmVjdGlvbklkZW50aWZpZXIpCkluZGV4OiBT b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24u bW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9X ZWJDb3JlTlNVUkxTZXNzaW9uLm1tCShyZXZpc2lvbiAyNjIxMjcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0JKHdvcmtpbmcg Y29weSkKQEAgLTU5LDYgKzU5LDEyIEBAIC0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhNZXRyaWNz Oihjb25zdCAKIEBwcm9wZXJ0eSAobnVsbGFibGUsIGNvcHksIHJlYWRvbmx5KSBOU0RhdGUgKnJl cXVlc3RTdGFydERhdGU7CiBAcHJvcGVydHkgKG51bGxhYmxlLCBjb3B5LCByZWFkb25seSkgTlNE YXRlICpyZXNwb25zZVN0YXJ0RGF0ZTsKIEBwcm9wZXJ0eSAobnVsbGFibGUsIGNvcHksIHJlYWRv bmx5KSBOU0RhdGUgKnJlc3BvbnNlRW5kRGF0ZTsKK0Bwcm9wZXJ0eSAobnVsbGFibGUsIGNvcHks IHJlYWRvbmx5KSBOU1N0cmluZyAqbmV0d29ya1Byb3RvY29sTmFtZTsKK0Bwcm9wZXJ0eSAoYXNz aWduLCByZWFkb25seSwgZ2V0dGVyPWlzUmV1c2VkQ29ubmVjdGlvbikgQk9PTCByZXVzZWRDb25u ZWN0aW9uOworQHByb3BlcnR5IChyZWFkb25seSwgZ2V0dGVyPWlzQ2VsbHVsYXIpIEJPT0wgY2Vs bHVsYXI7CitAcHJvcGVydHkgKHJlYWRvbmx5LCBnZXR0ZXI9aXNFeHBlbnNpdmUpIEJPT0wgZXhw ZW5zaXZlOworQHByb3BlcnR5IChyZWFkb25seSwgZ2V0dGVyPWlzQ29uc3RyYWluZWQpIEJPT0wg Y29uc3RyYWluZWQ7CitAcHJvcGVydHkgKHJlYWRvbmx5LCBnZXR0ZXI9aXNNdWx0aXBhdGgpIEJP T0wgbXVsdGlwYXRoOwogQGVuZAogCiBAaW1wbGVtZW50YXRpb24gV2ViQ29yZU5TVVJMU2Vzc2lv blRhc2tUcmFuc2FjdGlvbk1ldHJpY3MgewpAQCAtMTI3LDYgKzEzMyw0MiBAQCAtIChudWxsYWJs ZSBOU0RhdGUgKilyZXNwb25zZUVuZERhdGUKICAgICByZXR1cm4gbmV0d29ya0xvYWRNZXRyaWNz RGF0ZShfbWV0cmljcy5mZXRjaFN0YXJ0LCBfbWV0cmljcy5yZXNwb25zZUVuZCk7CiB9CiAKK0Bk eW5hbWljIG5ldHdvcmtQcm90b2NvbE5hbWU7CistIChudWxsYWJsZSBOU1N0cmluZyAqKW5ldHdv cmtQcm90b2NvbE5hbWUKK3sKKyAgICByZXR1cm4gX21ldHJpY3MucHJvdG9jb2w7Cit9CisKK0Bk eW5hbWljIHJldXNlZENvbm5lY3Rpb247CistIChCT09MKWlzUmV1c2VkQ29ubmVjdGlvbgorewor ICAgIHJldHVybiBfbWV0cmljcy5pc1JldXNlZENvbm5lY3Rpb247Cit9CisKK0BkeW5hbWljIGNl bGx1bGFyOworLSAoQk9PTCljZWxsdWxhcgoreworICAgIHJldHVybiBfbWV0cmljcy5jZWxsdWxh cjsKK30KKworQGR5bmFtaWMgZXhwZW5zaXZlOworLSAoQk9PTClleHBlbnNpdmUKK3sKKyAgICBy ZXR1cm4gX21ldHJpY3MuZXhwZW5zaXZlOworfQorCitAZHluYW1pYyBjb25zdHJhaW5lZDsKKy0g KEJPT0wpY29uc3RyYWluZWQKK3sKKyAgICByZXR1cm4gX21ldHJpY3MuY29uc3RyYWluZWQ7Cit9 CisKK0BkeW5hbWljIG11bHRpcGF0aDsKKy0gKEJPT0wpbXVsdGlwYXRoCit7CisgICAgcmV0dXJu IF9tZXRyaWNzLm11bHRpcGF0aDsKK30KKwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYkNvcmVOU1VS TFNlc3Npb25UYXNrTWV0cmljcyA6IE5TT2JqZWN0CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5n ZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjYy MTI4KQorKysgU291cmNlL1dlYktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyAr MSwxMyBAQAorMjAyMC0wNS0yNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJr aXQub3JnPgorCisgICAgICAgIEV4cG9zZSBtb3JlIG5ldHdvcmsgbWV0cmljcyB0byBXZWJDb3Jl TlNVUkxTZXNzaW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMTIzNTkKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAg ICAgICAqIE5ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW06CisgICAg ICAgICgtW1dLTmV0d29ya1Nlc3Npb25EZWxlZ2F0ZSBVUkxTZXNzaW9uOnRhc2s6ZGlkRmluaXNo Q29sbGVjdGluZ01ldHJpY3M6XSk6CisKIDIwMjAtMDUtMjQgIFNhbSBXZWluaWcgIDx3ZWluaWdA YXBwbGUuY29tPgogCiAgICAgICAgIEV4dGVuZGVkIENvbG9yIENsZWFudXA6IFVzZSB0aGUgbmFt ZSBTaW1wbGVDb2xvciBjb25zaXN0ZW50bHkKSW5kZXg6IFNvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25Db2NvYS5tbQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL2NvY29hL05ldHdvcmtTZXNzaW9uQ29jb2EubW0JKHJldmlz aW9uIDI2MjEyNykKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29y a1Nlc3Npb25Db2NvYS5tbQkod29ya2luZyBjb3B5KQpAQCAtNzkyLDYgKzc5MiwxMyBAQCAtICh2 b2lkKVVSTFNlc3Npb246KE5TVVJMU2Vzc2lvbiAqKXNlc3NpCiAgICAgICAgIG5ldHdvcmtMb2Fk TWV0cmljcy5yZXNwb25zZUVuZCA9IFNlY29uZHMocmVzcG9uc2VFbmRJbnRlcnZhbCk7CiAgICAg ICAgIG5ldHdvcmtMb2FkTWV0cmljcy5tYXJrQ29tcGxldGUoKTsKICAgICAgICAgbmV0d29ya0xv YWRNZXRyaWNzLnByb3RvY29sID0gU3RyaW5nKG0ubmV0d29ya1Byb3RvY29sTmFtZSk7CisjaWYg SEFWRShDRk5FVFdPUktfTUVUUklDU19DT05ORUNUSU9OX1BST1BFUlRJRVMpCisgICAgICAgIG5l dHdvcmtMb2FkTWV0cmljcy5jZWxsdWxhciA9IG0uY2VsbHVsYXI7CisgICAgICAgIG5ldHdvcmtM b2FkTWV0cmljcy5leHBlbnNpdmUgPSBtLmV4cGVuc2l2ZTsKKyAgICAgICAgbmV0d29ya0xvYWRN ZXRyaWNzLmNvbnN0cmFpbmVkID0gbS5jb25zdHJhaW5lZDsKKyAgICAgICAgbmV0d29ya0xvYWRN ZXRyaWNzLm11bHRpcGF0aCA9IG0ubXVsdGlwYXRoOworI2VuZGlmCisgICAgICAgIG5ldHdvcmtM b2FkTWV0cmljcy5pc1JldXNlZENvbm5lY3Rpb24gPSBtLmlzUmV1c2VkQ29ubmVjdGlvbjsKIAog ICAgICAgICBpZiAobmV0d29ya0RhdGFUYXNrLT5zaG91bGRDYXB0dXJlRXh0cmFOZXR3b3JrTG9h ZE1ldHJpY3MoKSkgewogICAgICAgICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLnByaW9yaXR5ID0g dG9OZXR3b3JrTG9hZFByaW9yaXR5KHRhc2sucHJpb3JpdHkpOwo= 400224 2020-05-25 16:21:23 -0700 2020-05-25 17:03:20 -0700 Patch bug-212359-20200525162122.patch text/plain 9001 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNjIxMjcpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDIwLTA1LTI1ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgRXhwb3NlIG1vcmUgbmV0d29yayBt ZXRyaWNzIHRvIFdlYkNvcmVOU1VSTFNlc3Npb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjM1OQorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjI5 MDk0NDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiB3 dGYvUGxhdGZvcm1IYXZlLmg6CisKIDIwMjAtMDUtMjIgIERhdmlkIEtpbHplciAgPGRka2lsemVy QGFwcGxlLmNvbT4KIAogICAgICAgICBXVEY6OmlzVmFsaWRFbnVtKCkgaGFzIGEgdHlwbyBpbiBz dGF0aWNfYXNzZXJ0IG1ha2luZyBpdCBhIHRhdXRvbG9naWNhbCBjb21wYXJpc29uCkluZGV4OiBT b3VyY2UvV1RGL3d0Zi9QbGF0Zm9ybUhhdmUuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV1RGL3d0 Zi9QbGF0Zm9ybUhhdmUuaAkocmV2aXNpb24gMjYyMTI3KQorKysgU291cmNlL1dURi93dGYvUGxh dGZvcm1IYXZlLmgJKHdvcmtpbmcgY29weSkKQEAgLTQwNCw2ICs0MDQsMTMgQEAKICNkZWZpbmUg SEFWRV9DRk5FVFdPUktfU0FNRVNJVEVfQ09PS0lFX0FQSSAxCiAjZW5kaWYKIAorI2lmIChQTEFU Rk9STShNQUMpICYmIF9fTUFDX09TX1hfVkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gMTAxNTAwKSBc CisgICAgfHwgKFBMQVRGT1JNKElPUykgJiYgX19JUEhPTkVfT1NfVkVSU0lPTl9NSU5fUkVRVUlS RUQgPj0gMTMwMDAwKSBcCisgICAgfHwgKFBMQVRGT1JNKFdBVENIT1MpICYmIF9fV0FUQ0hfT1Nf VkVSU0lPTl9NSU5fUkVRVUlSRUQgPj0gNjAwMDApIFwKKyAgICB8fCAoUExBVEZPUk0oQVBQTEVU VikgJiYgX19UVl9PU19WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAxMzAwMDApCisjZGVmaW5lIEhB VkVfQ0ZORVRXT1JLX01FVFJJQ1NfQ09OTkVDVElPTl9QUk9QRVJUSUVTIDEKKyNlbmRpZgorCiAj aWYgKFBMQVRGT1JNKE1BQykgJiYgX19NQUNfT1NfWF9WRVJTSU9OX01JTl9SRVFVSVJFRCA+PSAx MDE2MDApIHx8IChQTEFURk9STShJT1NfRkFNSUxZKSAmJiBfX0lQSE9ORV9PU19WRVJTSU9OX01J Tl9SRVFVSVJFRCA+PSAxNDAwMDApCiAjZGVmaW5lIEhBVkVfQ0ZORVRXT1JLX01FVFJJQ1NfQVBJ U19WNCAxCiAjZW5kaWYKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2MjEyNykKKysrIFNvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDIw LTA1LTI1ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgRXhwb3NlIG1vcmUgbmV0d29yayBtZXRyaWNzIHRvIFdlYkNvcmVOU1VSTFNlc3Npb24K KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMjM1OQor ICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjI5MDk0NDA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkg RGFyaW4gQWRsZXIuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtMb2FkTWV0 cmljcy5oOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0xvYWRNZXRyaWNzOjppc29sYXRlZENv cHkgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TmV0d29ya0xvYWRNZXRyaWNzOjpvcGVyYXRv cj09IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtMb2FkTWV0cmljczo6ZW5jb2Rl IGNvbnN0KToKKyAgICAgICAgKFdlYkNvcmU6Ok5ldHdvcmtMb2FkTWV0cmljczo6ZGVjb2RlKToK KyAgICAgICAgKiBwbGF0Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW06 CisgICAgICAgICgtW1dlYkNvcmVOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzIG5l dHdvcmtQcm90b2NvbE5hbWVdKToKKyAgICAgICAgKC1bV2ViQ29yZU5TVVJMU2Vzc2lvblRhc2tU cmFuc2FjdGlvbk1ldHJpY3MgaXNSZXVzZWRDb25uZWN0aW9uXSk6CisgICAgICAgICgtW1dlYkNv cmVOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzIGNlbGx1bGFyXSk6CisgICAgICAg ICgtW1dlYkNvcmVOU1VSTFNlc3Npb25UYXNrVHJhbnNhY3Rpb25NZXRyaWNzIGV4cGVuc2l2ZV0p OgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0aW9uTWV0cmljcyBj b25zdHJhaW5lZF0pOgorICAgICAgICAoLVtXZWJDb3JlTlNVUkxTZXNzaW9uVGFza1RyYW5zYWN0 aW9uTWV0cmljcyBtdWx0aXBhdGhdKToKKwogMjAyMC0wNS0yNSAgWmFsYW4gQnVqdGFzICA8emFs YW5AYXBwbGUuY29tPgogCiAgICAgICAgIFtTdWJwaXhlbCBsYXlvdXRdIEJhZCBzY3JvbGxpbmcg b24gbWVyY3VyeW5ld3MuY29tIGFydGljbGUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvTmV0d29ya0xvYWRNZXRyaWNzLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNv cmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3MuaAkocmV2aXNpb24gMjYyMTI3 KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrTG9hZE1ldHJpY3Mu aAkod29ya2luZyBjb3B5KQpAQCAtNzAsNiArNzAsMTEgQEAgcHVibGljOgogICAgIC8vIEFMUE4g UHJvdG9jb2wgSUQ6IGh0dHBzOi8vdzNjLmdpdGh1Yi5pby9yZXNvdXJjZS10aW1pbmcvI2JpYi1S RkM3MzAxCiAgICAgU3RyaW5nIHByb3RvY29sOwogICAgIGJvb2wgY29tcGxldGUgeyBmYWxzZSB9 OworICAgIGJvb2wgY2VsbHVsYXIgeyBmYWxzZSB9OworICAgIGJvb2wgZXhwZW5zaXZlIHsgZmFs c2UgfTsKKyAgICBib29sIGNvbnN0cmFpbmVkIHsgZmFsc2UgfTsKKyAgICBib29sIG11bHRpcGF0 aCB7IGZhbHNlIH07CisgICAgYm9vbCBpc1JldXNlZENvbm5lY3Rpb24geyBmYWxzZSB9OwogfTsK IAogY2xhc3MgTmV0d29ya0xvYWRNZXRyaWNzIDogcHVibGljIE5ldHdvcmtMb2FkTWV0cmljc1dp dGhvdXROb25UaW1pbmdEYXRhIHsKQEAgLTk1LDYgKzEwMCwxMSBAQCBwdWJsaWM6CiAgICAgICAg IGNvcHkucmVzcG9uc2VFbmQgPSByZXNwb25zZUVuZDsKICAgICAgICAgY29weS5jb21wbGV0ZSA9 IGNvbXBsZXRlOwogICAgICAgICBjb3B5LnByb3RvY29sID0gcHJvdG9jb2wuaXNvbGF0ZWRDb3B5 KCk7CisgICAgICAgIGNvcHkuY2VsbHVsYXIgPSBjZWxsdWxhcjsKKyAgICAgICAgY29weS5leHBl bnNpdmUgPSBleHBlbnNpdmU7CisgICAgICAgIGNvcHkuY29uc3RyYWluZWQgPSBjb25zdHJhaW5l ZDsKKyAgICAgICAgY29weS5tdWx0aXBhdGggPSBtdWx0aXBhdGg7CisgICAgICAgIGNvcHkuaXNS ZXVzZWRDb25uZWN0aW9uID0gaXNSZXVzZWRDb25uZWN0aW9uOwogCiAgICAgICAgIGNvcHkucmVt b3RlQWRkcmVzcyA9IHJlbW90ZUFkZHJlc3MuaXNvbGF0ZWRDb3B5KCk7CiAgICAgICAgIGNvcHku Y29ubmVjdGlvbklkZW50aWZpZXIgPSBjb25uZWN0aW9uSWRlbnRpZmllci5pc29sYXRlZENvcHko KTsKQEAgLTEyNCw2ICsxMzQsMTEgQEAgcHVibGljOgogICAgICAgICAgICAgJiYgcmVzcG9uc2VT dGFydCA9PSBvdGhlci5yZXNwb25zZVN0YXJ0CiAgICAgICAgICAgICAmJiByZXNwb25zZUVuZCA9 PSBvdGhlci5yZXNwb25zZUVuZAogICAgICAgICAgICAgJiYgY29tcGxldGUgPT0gb3RoZXIuY29t cGxldGUKKyAgICAgICAgICAgICYmIGNlbGx1bGFyID09IG90aGVyLmNlbGx1bGFyCisgICAgICAg ICAgICAmJiBleHBlbnNpdmUgPT0gb3RoZXIuZXhwZW5zaXZlCisgICAgICAgICAgICAmJiBjb25z dHJhaW5lZCA9PSBvdGhlci5jb25zdHJhaW5lZAorICAgICAgICAgICAgJiYgbXVsdGlwYXRoID09 IG90aGVyLm11bHRpcGF0aAorICAgICAgICAgICAgJiYgaXNSZXVzZWRDb25uZWN0aW9uID09IG90 aGVyLmlzUmV1c2VkQ29ubmVjdGlvbgogICAgICAgICAgICAgJiYgcHJvdG9jb2wgPT0gb3RoZXIu cHJvdG9jb2wKICAgICAgICAgICAgICYmIHJlbW90ZUFkZHJlc3MgPT0gb3RoZXIucmVtb3RlQWRk cmVzcwogICAgICAgICAgICAgJiYgY29ubmVjdGlvbklkZW50aWZpZXIgPT0gb3RoZXIuY29ubmVj dGlvbklkZW50aWZpZXIKQEAgLTE4MCw2ICsxOTUsMTEgQEAgdm9pZCBOZXR3b3JrTG9hZE1ldHJp Y3M6OmVuY29kZShFbmNvZGVyJgogICAgIGVuY29kZXIgPDwgcmVzcG9uc2VTdGFydDsKICAgICBl bmNvZGVyIDw8IHJlc3BvbnNlRW5kOwogICAgIGVuY29kZXIgPDwgY29tcGxldGU7CisgICAgZW5j b2RlciA8PCBjZWxsdWxhcjsKKyAgICBlbmNvZGVyIDw8IGV4cGVuc2l2ZTsKKyAgICBlbmNvZGVy IDw8IGNvbnN0cmFpbmVkOworICAgIGVuY29kZXIgPDwgbXVsdGlwYXRoOworICAgIGVuY29kZXIg PDwgaXNSZXVzZWRDb25uZWN0aW9uOwogICAgIGVuY29kZXIgPDwgcHJvdG9jb2w7CiAgICAgZW5j b2RlciA8PCByZW1vdGVBZGRyZXNzOwogICAgIGVuY29kZXIgPDwgY29ubmVjdGlvbklkZW50aWZp ZXI7CkBAIC0yMDcsNiArMjI3LDExIEBAIGJvb2wgTmV0d29ya0xvYWRNZXRyaWNzOjpkZWNvZGUo RGVjb2RlciYKICAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0cmljcy5yZXNwb25zZVN0YXJ0 KQogICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnJlc3BvbnNlRW5kKQogICAgICAg ICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLmNvbXBsZXRlKQorICAgICAgICAmJiBkZWNvZGVy LmRlY29kZShtZXRyaWNzLmNlbGx1bGFyKQorICAgICAgICAmJiBkZWNvZGVyLmRlY29kZShtZXRy aWNzLmV4cGVuc2l2ZSkKKyAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0cmljcy5jb25zdHJh aW5lZCkKKyAgICAgICAgJiYgZGVjb2Rlci5kZWNvZGUobWV0cmljcy5tdWx0aXBhdGgpCisgICAg ICAgICYmIGRlY29kZXIuZGVjb2RlKG1ldHJpY3MuaXNSZXVzZWRDb25uZWN0aW9uKQogICAgICAg ICAmJiBkZWNvZGVyLmRlY29kZShtZXRyaWNzLnByb3RvY29sKQogICAgICAgICAmJiBkZWNvZGVy LmRlY29kZShtZXRyaWNzLnJlbW90ZUFkZHJlc3MpCiAgICAgICAgICYmIGRlY29kZXIuZGVjb2Rl KG1ldHJpY3MuY29ubmVjdGlvbklkZW50aWZpZXIpCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0KPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9jb2NvYS9XZWJDb3JlTlNVUkxTZXNzaW9u Lm1tCShyZXZpc2lvbiAyNjIxMjcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L2NvY29hL1dlYkNvcmVOU1VSTFNlc3Npb24ubW0JKHdvcmtpbmcgY29weSkKQEAgLTU5LDYgKzU5 LDEyIEBAIC0gKGluc3RhbmNldHlwZSlfaW5pdFdpdGhNZXRyaWNzOihjb25zdCAKIEBwcm9wZXJ0 eSAobnVsbGFibGUsIGNvcHksIHJlYWRvbmx5KSBOU0RhdGUgKnJlcXVlc3RTdGFydERhdGU7CiBA cHJvcGVydHkgKG51bGxhYmxlLCBjb3B5LCByZWFkb25seSkgTlNEYXRlICpyZXNwb25zZVN0YXJ0 RGF0ZTsKIEBwcm9wZXJ0eSAobnVsbGFibGUsIGNvcHksIHJlYWRvbmx5KSBOU0RhdGUgKnJlc3Bv bnNlRW5kRGF0ZTsKK0Bwcm9wZXJ0eSAobnVsbGFibGUsIGNvcHksIHJlYWRvbmx5KSBOU1N0cmlu ZyAqbmV0d29ya1Byb3RvY29sTmFtZTsKK0Bwcm9wZXJ0eSAoYXNzaWduLCByZWFkb25seSwgZ2V0 dGVyPWlzUmV1c2VkQ29ubmVjdGlvbikgQk9PTCByZXVzZWRDb25uZWN0aW9uOworQHByb3BlcnR5 IChyZWFkb25seSwgZ2V0dGVyPWlzQ2VsbHVsYXIpIEJPT0wgY2VsbHVsYXI7CitAcHJvcGVydHkg KHJlYWRvbmx5LCBnZXR0ZXI9aXNFeHBlbnNpdmUpIEJPT0wgZXhwZW5zaXZlOworQHByb3BlcnR5 IChyZWFkb25seSwgZ2V0dGVyPWlzQ29uc3RyYWluZWQpIEJPT0wgY29uc3RyYWluZWQ7CitAcHJv cGVydHkgKHJlYWRvbmx5LCBnZXR0ZXI9aXNNdWx0aXBhdGgpIEJPT0wgbXVsdGlwYXRoOwogQGVu ZAogCiBAaW1wbGVtZW50YXRpb24gV2ViQ29yZU5TVVJMU2Vzc2lvblRhc2tUcmFuc2FjdGlvbk1l dHJpY3MgewpAQCAtMTI3LDYgKzEzMyw0MiBAQCAtIChudWxsYWJsZSBOU0RhdGUgKilyZXNwb25z ZUVuZERhdGUKICAgICByZXR1cm4gbmV0d29ya0xvYWRNZXRyaWNzRGF0ZShfbWV0cmljcy5mZXRj aFN0YXJ0LCBfbWV0cmljcy5yZXNwb25zZUVuZCk7CiB9CiAKK0BkeW5hbWljIG5ldHdvcmtQcm90 b2NvbE5hbWU7CistIChudWxsYWJsZSBOU1N0cmluZyAqKW5ldHdvcmtQcm90b2NvbE5hbWUKK3sK KyAgICByZXR1cm4gX21ldHJpY3MucHJvdG9jb2w7Cit9CisKK0BkeW5hbWljIHJldXNlZENvbm5l Y3Rpb247CistIChCT09MKWlzUmV1c2VkQ29ubmVjdGlvbgoreworICAgIHJldHVybiBfbWV0cmlj cy5pc1JldXNlZENvbm5lY3Rpb247Cit9CisKK0BkeW5hbWljIGNlbGx1bGFyOworLSAoQk9PTClj ZWxsdWxhcgoreworICAgIHJldHVybiBfbWV0cmljcy5jZWxsdWxhcjsKK30KKworQGR5bmFtaWMg ZXhwZW5zaXZlOworLSAoQk9PTClleHBlbnNpdmUKK3sKKyAgICByZXR1cm4gX21ldHJpY3MuZXhw ZW5zaXZlOworfQorCitAZHluYW1pYyBjb25zdHJhaW5lZDsKKy0gKEJPT0wpY29uc3RyYWluZWQK K3sKKyAgICByZXR1cm4gX21ldHJpY3MuY29uc3RyYWluZWQ7Cit9CisKK0BkeW5hbWljIG11bHRp cGF0aDsKKy0gKEJPT0wpbXVsdGlwYXRoCit7CisgICAgcmV0dXJuIF9tZXRyaWNzLm11bHRpcGF0 aDsKK30KKwogQGVuZAogCiBAaW50ZXJmYWNlIFdlYkNvcmVOU1VSTFNlc3Npb25UYXNrTWV0cmlj cyA6IE5TT2JqZWN0CkluZGV4OiBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwkocmV2aXNpb24gMjYyMTI4KQorKysgU291cmNlL1dl YktpdC9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxNCBAQAorMjAyMC0wNS0y NSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAg IEV4cG9zZSBtb3JlIG5ldHdvcmsgbWV0cmljcyB0byBXZWJDb3JlTlNVUkxTZXNzaW9uCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTIzNTkKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzYyOTA5NDQwPgorCisgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbToKKyAgICAgICAgKC1bV0tOZXR3b3JrU2Vzc2lvbkRlbGVnYXRlIFVSTFNlc3Npb246 dGFzazpkaWRGaW5pc2hDb2xsZWN0aW5nTWV0cmljczpdKToKKwogMjAyMC0wNS0yNCAgU2FtIFdl aW5pZyAgPHdlaW5pZ0BhcHBsZS5jb20+CiAKICAgICAgICAgRXh0ZW5kZWQgQ29sb3IgQ2xlYW51 cDogVXNlIHRoZSBuYW1lIFNpbXBsZUNvbG9yIGNvbnNpc3RlbnRseQpJbmRleDogU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCj09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvY29jb2EvTmV0d29ya1Nlc3Npb25D b2NvYS5tbQkocmV2aXNpb24gMjYyMTI3KQorKysgU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9jb2NvYS9OZXR3b3JrU2Vzc2lvbkNvY29hLm1tCSh3b3JraW5nIGNvcHkpCkBAIC03OTIsNiAr NzkyLDEzIEBAIC0gKHZvaWQpVVJMU2Vzc2lvbjooTlNVUkxTZXNzaW9uICopc2Vzc2kKICAgICAg ICAgbmV0d29ya0xvYWRNZXRyaWNzLnJlc3BvbnNlRW5kID0gU2Vjb25kcyhyZXNwb25zZUVuZElu dGVydmFsKTsKICAgICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLm1hcmtDb21wbGV0ZSgpOwogICAg ICAgICBuZXR3b3JrTG9hZE1ldHJpY3MucHJvdG9jb2wgPSBTdHJpbmcobS5uZXR3b3JrUHJvdG9j b2xOYW1lKTsKKyNpZiBIQVZFKENGTkVUV09SS19NRVRSSUNTX0NPTk5FQ1RJT05fUFJPUEVSVElF UykKKyAgICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLmNlbGx1bGFyID0gbS5jZWxsdWxhcjsKKyAg ICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLmV4cGVuc2l2ZSA9IG0uZXhwZW5zaXZlOworICAgICAg ICBuZXR3b3JrTG9hZE1ldHJpY3MuY29uc3RyYWluZWQgPSBtLmNvbnN0cmFpbmVkOworICAgICAg ICBuZXR3b3JrTG9hZE1ldHJpY3MubXVsdGlwYXRoID0gbS5tdWx0aXBhdGg7CisjZW5kaWYKKyAg ICAgICAgbmV0d29ya0xvYWRNZXRyaWNzLmlzUmV1c2VkQ29ubmVjdGlvbiA9IG0uaXNSZXVzZWRD b25uZWN0aW9uOwogCiAgICAgICAgIGlmIChuZXR3b3JrRGF0YVRhc2stPnNob3VsZENhcHR1cmVF eHRyYU5ldHdvcmtMb2FkTWV0cmljcygpKSB7CiAgICAgICAgICAgICBuZXR3b3JrTG9hZE1ldHJp Y3MucHJpb3JpdHkgPSB0b05ldHdvcmtMb2FkUHJpb3JpdHkodGFzay5wcmlvcml0eSk7Cg==