203302 2019-10-23 10:30:02 -0700 WKWebView: WKURLSchemeHandler request don't have Range headers 2021-05-03 15:53:43 -0700 1 1 1 Unclassified WebKit Media Other iPhone / iPad All RESOLVED FIXED InRadar P2 Major --- 1 juliosincesar achristensen achristensen beidson felix741 ggaren jean-baptiste.martin jer.noble kewlbear lindsay-needs-sleep mjs thkim webkit-bug-importer youennf oldest_to_newest 1582869 0 juliosincesar 2019-10-23 10:30:02 -0700 The problem: When serving an Apache Cordova or Ionic Capacitor app from a custom scheme, if the app contains a video tag, it makes multiple requests to the video file (I guess it's to return the video in chunks). The problem is, the requests don't include Range headers, so it's impossible to return just the chunks, and also, as it's requested multiple times, the memory increases a lot. Expected: When using a WKURLSchemeHandler, the requests should include Range headers so the video can be returned by the requested chunks. Alternatively, if the app is being served from a custom scheme, then a single request should be made to the WKURLSchemeHandler (when serving the app from file:// protocol only a request is made) Sample project reproducing the issue (without using Apache Cordova nor Ionic Capacitor to simplify the code) https://github.com/jcesarmobile/no-ranges-bug Check the WebViewHandler class, it prints urlSchemeTask.request.allHTTPHeaderFields content and it doesn't include Range. https://github.com/jcesarmobile/no-ranges-bug/blob/master/no-ranges-bug/WebViewHandler.swift#L34 Also if the app is inspected in Safari remote inspector, the requests don't show Range in headers neither. 1583092 1 webkit-bug-importer 2019-10-23 15:32:45 -0700 <rdar://problem/56557566> 1583167 2 achristensen 2019-10-23 17:25:53 -0700 WKURLSchemeHandler is behaving correctly here, and on Mac the same code has a range request. The problem is on iOS the request we receive from AVAssetResourceLoader does not have a range request, but on Mac the request we receive in the WebCoreNSURLSession has a range request. I'm uploading a test that verifies this is the case. 1583168 3 381757 achristensen 2019-10-23 17:27:19 -0700 Created attachment 381757 Patch 1583201 4 381757 ggaren 2019-10-23 20:08:45 -0700 Comment on attachment 381757 Patch r=me Can you file a bug report for AVAssetResourceLoader? 1584522 5 juliosincesar 2019-10-28 11:44:51 -0700 Are you asking me or somebody else? In case it's me, where should I report the new issue? 1584632 6 achristensen 2019-10-28 14:34:14 -0700 I think he was asking me to report another bug and use this just to commit the test that verifies existing behavior. I'm still talking to people and deciding what to do about this. 1644657 7 thkim 2020-04-22 21:13:52 -0700 We have faced the same no Range header problem using WKURLSchemeHandler for custom video scheme on iOS. Does it still remain an unresolved bug even after 6 months later from the first report? Nonetheless, is there any one who happens to know how to detour this bug so that we can manage to catch the Range data from AVAssetResourceLoader? It is so desperate to finalize our project. 1685238 8 jean-baptiste.martin 2020-09-03 06:10:43 -0700 Hi, any new on this? Is there anywhere we can follow this issue(AVAssetResourceLoader or something else)? 1739645 9 felix741 2021-03-15 13:46:14 -0700 Hello, is there anything new in this Bug? The problem persists and makes it impossible to view larger files from local storage. 1755839 10 427459 achristensen 2021-04-30 15:34:36 -0700 Created attachment 427459 Patch 1755845 11 427459 ggaren 2021-04-30 15:48:51 -0700 Comment on attachment 427459 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=427459&action=review r=me - plz fix test build > Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm:1514 > + @"Content-Range" : [NSString stringWithFormat:@"bytes %llu-%llu/%lu", rangeBegin, rangeEnd, [videoData length]], > + @"Content-Length" : [NSString stringWithFormat:@"%llu", rangeEnd - rangeBegin + 1] /Volumes/Data/worker/watchOS-7-Build-EWS/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm:1513:105: error: values of type 'NSUInteger' should not be used as format arguments; add an explicit cast to 'unsigned long' instead [-Werror,-Wformat] 1755849 12 427464 achristensen 2021-04-30 15:51:46 -0700 Created attachment 427464 Patch 1756008 13 achristensen 2021-05-01 18:29:27 -0700 iOS test failures look related. Will investigate. 1756277 14 achristensen 2021-05-03 12:45:14 -0700 It seems like blob URLs are going through this path too. I'm going to exclude the blob protocol. 1756278 15 427587 achristensen 2021-05-03 12:46:09 -0700 Created attachment 427587 Patch 1756348 16 achristensen 2021-05-03 15:53:43 -0700 r276932 381757 2019-10-23 17:27:19 -0700 2021-04-30 15:34:34 -0700 Patch bug-203302-20191023172717.patch text/plain 2533 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MTUxNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDE5LTEwLTIzICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJWaWV3OiBXS1VSTFNjaGVtZUhhbmRsZXIgcmVxdWVz dCBkb24ndCBoYXZlIFJhbmdlIGhlYWRlcnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwMzMwMgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VS TFNjaGVtZUhhbmRsZXItMS5tbToKKwogMjAxOS0xMC0yMyAgQWFrYXNoIEphaW4gIDxhYWthc2hf amFpbkBhcHBsZS5jb20+CiAKICAgICAgICAgW0VXU10gTXVsdGlwbGUgYnVpbGRzIGFyZSB0cmln Z2VyZWQgZm9yIG9uZSBwYXRjaCBzb21ldGltZXMgaW4gbmV3IEVXUwpJbmRleDogVG9vbHMvVGVz dFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2No ZW1lSGFuZGxlci0xLm1tCShyZXZpc2lvbiAyNTE0NTIpCisrKyBUb29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tCSh3b3JraW5nIGNvcHkp CkBAIC03NDgsMyArNzQ4LDM0IEBAIFRFU1QoVVJMU2NoZW1lSGFuZGxlciwgVGhyZWFkcykKICAg ICAgICAgdGhlVGFzayA9IG5pbDsKICAgICB9KS0+d2FpdEZvckNvbXBsZXRpb24oKTsKIH0KKwor VEVTVChVUkxTY2hlbWVIYW5kbGVyLCBSYW5nZXMpCit7CisgICAgYXV0byBoYW5kbGVyID0gYWRv cHROUyhbW1Rlc3RVUkxTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBjb25m aWd1cmF0aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRd KTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkg Zm9yVVJMU2NoZW1lOkAicmFuZ2VzIl07CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rl c3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYw MCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgX19ibG9jayBib29s IGRvbmUgPSBmYWxzZTsKKyAgICBbaGFuZGxlciBzZXRTdGFydFVSTFNjaGVtZVRhc2tIYW5kbGVy Ol4oV0tXZWJWaWV3ICosIGlkPFdLVVJMU2NoZW1lVGFzaz4gdGFzaykgeworICAgICAgICBpZiAo W3Rhc2sucmVxdWVzdC5VUkwucGF0aCBpc0VxdWFsVG9TdHJpbmc6QCIvbWFpbi5odG1sIl0pIHsK KyAgICAgICAgICAgIE5TU3RyaW5nICpodG1sID0gQCI8dmlkZW8+PHNvdXJjZSBzcmM9Jy92aWRl by5tNHYnIHR5cGU9J3ZpZGVvL21wNCc+PC92aWRlbz4iOworICAgICAgICAgICAgW3Rhc2sgZGlk UmVjZWl2ZVJlc3BvbnNlOltbW05TVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2su cmVxdWVzdC5VUkwgTUlNRVR5cGU6QCJ0ZXh0L2h0bWwiIGV4cGVjdGVkQ29udGVudExlbmd0aDpo dG1sLmxlbmd0aCB0ZXh0RW5jb2RpbmdOYW1lOm5pbF0gYXV0b3JlbGVhc2VdXTsKKyAgICAgICAg ICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRhOltodG1sIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0 cmluZ0VuY29kaW5nXV07CisgICAgICAgICAgICBbdGFzayBkaWRGaW5pc2hdOworICAgICAgICAg ICAgV1RGTG9nQWx3YXlzKCJNQUlOIik7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0K KworICAgICAgICBib29sIGhhc1JhbmdlUmVxdWVzdCA9ICEhW3Rhc2sucmVxdWVzdC5hbGxIVFRQ SGVhZGVyRmllbGRzIG9iamVjdEZvcktleTpAIlJhbmdlIl07CisjaWYgUExBVEZPUk0oTUFDKQor ICAgICAgICBFWFBFQ1RfVFJVRShoYXNSYW5nZVJlcXVlc3QpOworI2Vsc2UKKyAgICAgICAgLy8g RklYTUU6IFRoaXMgc2hvdWxkIGJlIHRydWUuCisgICAgICAgIC8vIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDMzMDIKKyAgICAgICAgRVhQRUNUX0ZBTFNFKGhhc1Jh bmdlUmVxdWVzdCk7CisjZW5kaWYKKyAgICAgICAgZG9uZSA9IHRydWU7CisgICAgfV07CisgICAg W3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0V2l0aFVSTDpbTlNVUkwg VVJMV2l0aFN0cmluZzpAInJhbmdlczovLy9tYWluLmh0bWwiXV1dOworICAgIFRlc3RXZWJLaXRB UEk6OlV0aWw6OnJ1bigmZG9uZSk7Cit9Cg== 427459 2021-04-30 15:34:36 -0700 2021-04-30 15:51:37 -0700 Patch bug-203302-20210430153435.patch text/plain 6457 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY0OTEwM2NhY2UzZWIx ZmE0ZjhmYTRiYzBhNTNjNzA0YWZiZDRjZi4uYmZmN2IwNGJlMmJkYzNkNzYzYjEzYTdhM2VhZTdk NDA5M2MyZGI5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA0LTMwICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJW aWV3OiBXS1VSTFNjaGVtZUhhbmRsZXIgcmVxdWVzdCBkb24ndCBoYXZlIFJhbmdlIGhlYWRlcnMg Zm9yIGN1c3RvbSBzY2hlbWUgdmlkZW9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDMzMDIKKyAgICAgICAgPHJkYXI6Ly82Mzc1MDMyMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHBsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbToKKyAg ICAgICAgKFdlYkNvcmU6OldlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKToK KwogMjAyMS0wNC0zMCAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAg ICAgUkVHUkVTU0lPTiAocjI3NjYzMyk6IEFTU0VSVElPTiBGQUlMRUQ6ICFmb3JiaWRNYWxsb2NV c2VTY29wZUNvdW50IHx8IGRpc2FibGVNYWxsb2NSZXN0cmljdGlvblNjb3BlQ291bnQgdW5kZXIg V2ViQ29yZTo6QXVkaW9TYW1wbGVEYXRhU291cmNlOjpjcmVhdGUoKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFW RlJlc291cmNlTG9hZGVyLm1tIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvYXZm b3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9hZGVyLm1tCmluZGV4IDRkNWYzNTgw ZWJhZDMwYmYwMGMzNjlkYTAxNWYwMzhlNjBmZTViYTAuLjdjMDhmNmU4MDJiY2E3ZGRhMDhjZmVi MmQzNDQ2YWExN2E2NTRlYmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dy YXBoaWNzL2F2Zm91bmRhdGlvbi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQorKysg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJD b3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KQEAgLTI0Niw2ICsyNDYsMTEgQEAgdm9pZCBXZWJDb3Jl QVZGUmVzb3VyY2VMb2FkZXI6OnN0YXJ0TG9hZGluZygpCiAgICAgUmVzb3VyY2VSZXF1ZXN0IHJl cXVlc3QobnNSZXF1ZXN0KTsKICAgICByZXF1ZXN0LnNldFByaW9yaXR5KFJlc291cmNlTG9hZFBy aW9yaXR5OjpMb3cpOwogCisgICAgaWYgKEFWQXNzZXRSZXNvdXJjZUxvYWRpbmdEYXRhUmVxdWVz dCAqZGF0YVJlcXVlc3QgPSBbbV9hdlJlcXVlc3QgZGF0YVJlcXVlc3RdOyBkYXRhUmVxdWVzdC5y ZXF1ZXN0ZWRMZW5ndGggJiYgIXJlcXVlc3QuaGFzSFRUUEhlYWRlckZpZWxkKEhUVFBIZWFkZXJO YW1lOjpSYW5nZSkpIHsKKyAgICAgICAgU3RyaW5nIHJhbmdlRW5kID0gZGF0YVJlcXVlc3QucmVx dWVzdHNBbGxEYXRhVG9FbmRPZlJlc291cmNlID8gIioiX3MgOiBtYWtlU3RyaW5nKGRhdGFSZXF1 ZXN0LnJlcXVlc3RlZE9mZnNldCArIGRhdGFSZXF1ZXN0LnJlcXVlc3RlZExlbmd0aCAtIDEpOwor ICAgICAgICByZXF1ZXN0LmFkZEhUVFBIZWFkZXJGaWVsZChIVFRQSGVhZGVyTmFtZTo6UmFuZ2Us IG1ha2VTdHJpbmcoImJ5dGVzPSIsIGRhdGFSZXF1ZXN0LnJlcXVlc3RlZE9mZnNldCwgJy0nLCBy YW5nZUVuZCkpOworICAgIH0KKwogICAgIGlmIChhdXRvKiBsb2FkZXIgPSBtX3BhcmVudC0+cGxh eWVyKCktPmNhY2hlZFJlc291cmNlTG9hZGVyKCkpIHsKICAgICAgICAgbV9yZXNvdXJjZU1lZGlh TG9hZGVyID0gQ2FjaGVkUmVzb3VyY2VNZWRpYUxvYWRlcjo6Y3JlYXRlKCp0aGlzLCAqbG9hZGVy LCBSZXNvdXJjZVJlcXVlc3QocmVxdWVzdCkpOwogICAgICAgICBpZiAobV9yZXNvdXJjZU1lZGlh TG9hZGVyKQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmlu ZGV4IGQ4YTM5MjI5MzUyYWNjZWIzZWQ0MWM4ODQyNWIzMDdjM2IwYTZkMjQuLjAwOWJiZjZjY2E5 ZmI5ZjE1ZWYyZmYxZTBhYmM2N2I2YzUwNzU2NDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxv ZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNC0zMCAgQWxl eCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgorCisgICAgICAgIFdLV2Vi VmlldzogV0tVUkxTY2hlbWVIYW5kbGVyIHJlcXVlc3QgZG9uJ3QgaGF2ZSBSYW5nZSBoZWFkZXJz IGZvciBjdXN0b20gc2NoZW1lIHZpZGVvcworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjAzMzAyCisgICAgICAgIDxyZGFyOi8vNjM3NTAzMjE+CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tOgorCiAyMDIxLTA0 LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Vi a2l0c2NweV0gU3VwcG9ydCBhcmd1bWVudHMgdG8gVGFza1Bvb2wgc2V0dXAgYW5kIHRlYXJkb3du CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJM U2NoZW1lSGFuZGxlci0xLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQppbmRleCAzZjk1YjdlMzY1ZmZjN2M2Mjk1NGExYjUw ZWM5OGY4MTk0M2YxMzA3Li41ZjA0N2U3MTY3OGEwZDg4Nzc1OWU2OWVlMzg2MWUxYTg2MzU0NjMz IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJM U2NoZW1lSGFuZGxlci0xLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV0tVUkxTY2hlbWVIYW5kbGVyLTEubW0KQEAgLTE0NzMsMyArMTQ3Myw1MyBAQCBURVNU KFVSTFNjaGVtZUhhbmRsZXIsIEFQSVJlZGlyZWN0KQogICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6 OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoQCJEb2N1 bWVudCBVUkw6IHJlZGlyZWN0b25lOi8vYmFyLmNvbS9hbm90aGVydGVzdC5odG1sIiwgW2xhc3RT Y3JpcHRNZXNzYWdlIGJvZHldKTsKIH0KKworVEVTVChVUkxTY2hlbWVIYW5kbGVyLCBSYW5nZXMp Cit7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gdmlkZW9EYXRhID0gW05TRGF0YSBkYXRhV2l0aENv bnRlbnRzT2ZVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAInRlc3Qi IHdpdGhFeHRlbnNpb246QCJtcDQiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3Vy Y2VzIl1dOworCisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhbW1Rlc3RVUkxTY2hlbWVIYW5k bGVyIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAgICBbY29uZmlndXJhdGlvbiBz ZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJMU2NoZW1lOkAicmFuZ2VzIl07 CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS5tZWRpYVR5cGVzUmVxdWlyaW5nVXNlckFjdGlvbkZv clBsYXliYWNrID0gV0tBdWRpb3Zpc3VhbE1lZGlhVHlwZU5vbmU7CisgICAgYXV0byB3ZWJWaWV3 ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0TWFr ZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1cmF0aW9uLmdldCgpXSk7Cisg ICAgX19ibG9jayBib29sIGZvdW5kUmFuZ2VSZXF1ZXN0ID0gZmFsc2U7CisgICAgW2hhbmRsZXIg c2V0U3RhcnRVUkxTY2hlbWVUYXNrSGFuZGxlcjpeKFdLV2ViVmlldyAqLCBpZDxXS1VSTFNjaGVt ZVRhc2s+IHRhc2spIHsKKyAgICAgICAgaWYgKFt0YXNrLnJlcXVlc3QuVVJMLnBhdGggaXNFcXVh bFRvU3RyaW5nOkAiL21haW4uaHRtbCJdKSB7CisgICAgICAgICAgICBOU1N0cmluZyAqaHRtbCA9 IEAiPHZpZGVvIGF1dG9wbGF5IG9ucGxheWluZz1cImFsZXJ0KCdwbGF5aW5nJylcIj48c291cmNl IHNyYz0nL3ZpZGVvLm00dicgdHlwZT0ndmlkZW8vbXA0Jz48L3ZpZGVvPiI7CisgICAgICAgICAg ICBbdGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6W1tbTlNVUkxSZXNwb25zZSBhbGxvY10gaW5pdFdp dGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpAInRleHQvaHRtbCIgZXhwZWN0ZWRDb250 ZW50TGVuZ3RoOmh0bWwubGVuZ3RoIHRleHRFbmNvZGluZ05hbWU6bmlsXSBhdXRvcmVsZWFzZV1d OworICAgICAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6W2h0bWwgZGF0YVVzaW5nRW5jb2Rp bmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddXTsKKyAgICAgICAgICAgIFt0YXNrIGRpZEZpbmlzaF07 CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAgICAgICBOU1N0cmluZyAqcmVx dWVzdFJhbmdlID0gW3Rhc2sucmVxdWVzdC5hbGxIVFRQSGVhZGVyRmllbGRzIG9iamVjdEZvcktl eTpAIlJhbmdlIl07CisgICAgICAgIEVYUEVDVF9UUlVFKHJlcXVlc3RSYW5nZSk7CisKKyAgICAg ICAgU3RyaW5nIHJlcXVlc3RSYW5nZVN0cmluZyhyZXF1ZXN0UmFuZ2UpOworICAgICAgICBTdHJp bmcgcmFuZ2VCeXRlcyA9ICJieXRlcz0iX3M7CisgICAgICAgIGF1dG8gYmVnaW4gPSByZXF1ZXN0 UmFuZ2VTdHJpbmcuZmluZChyYW5nZUJ5dGVzLCAwKTsKKyAgICAgICAgQVNTRVJUKGJlZ2luICE9 IG5vdEZvdW5kKTsKKyAgICAgICAgYXV0byBkYXNoID0gcmVxdWVzdFJhbmdlU3RyaW5nLmZpbmQo Jy0nLCBiZWdpbik7CisgICAgICAgIEFTU0VSVChkYXNoICE9IG5vdEZvdW5kKTsKKyAgICAgICAg YXV0byBlbmQgPSByZXF1ZXN0UmFuZ2VTdHJpbmcubGVuZ3RoKCk7CisKKyAgICAgICAgYXV0byBy YW5nZUJlZ2luU3RyaW5nID0gcmVxdWVzdFJhbmdlU3RyaW5nLnN1YnN0cmluZyhiZWdpbiArIHJh bmdlQnl0ZXMubGVuZ3RoKCksIGRhc2ggLSBiZWdpbiAtIHJhbmdlQnl0ZXMubGVuZ3RoKCkpOwor ICAgICAgICBhdXRvIHJhbmdlRW5kU3RyaW5nID0gcmVxdWVzdFJhbmdlU3RyaW5nLnN1YnN0cmlu ZyhkYXNoICsgMSwgZW5kIC0gZGFzaCAtIDEpOworICAgICAgICBhdXRvIHJhbmdlQmVnaW4gPSBy YW5nZUJlZ2luU3RyaW5nLnRvVUludDY0U3RyaWN0KCk7CisgICAgICAgIGF1dG8gcmFuZ2VFbmQg PSByYW5nZUVuZFN0cmluZyA9PSAiKiIgPyBbdmlkZW9EYXRhIGxlbmd0aF0gOiByYW5nZUVuZFN0 cmluZy50b1VJbnQ2NFN0cmljdCgpOworCisgICAgICAgIGF1dG8gcmVzcG9uc2UgPSBhZG9wdE5T KFtbTlNIVFRQVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3Ry aW5nOkAiaHR0cHM6Ly93ZWJraXQub3JnLyJdIHN0YXR1c0NvZGU6MjA2IEhUVFBWZXJzaW9uOkAi SFRUUC8xLjEiIGhlYWRlckZpZWxkczpAeworICAgICAgICAgICAgQCJDb250ZW50LVJhbmdlIiA6 IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiYnl0ZXMgJWxsdS0lbGx1LyVsdSIsIHJhbmdl QmVnaW4sIHJhbmdlRW5kLCBbdmlkZW9EYXRhIGxlbmd0aF1dLAorICAgICAgICAgICAgQCJDb250 ZW50LUxlbmd0aCIgOiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAIiVsbHUiLCByYW5nZUVu ZCAtIHJhbmdlQmVnaW4gKyAxXQorICAgICAgICB9XSk7CisKKyAgICAgICAgW3Rhc2sgZGlkUmVj ZWl2ZVJlc3BvbnNlOnJlc3BvbnNlLmdldCgpXTsKKyAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURh dGE6W3ZpZGVvRGF0YSBzdWJkYXRhV2l0aFJhbmdlOk5TTWFrZVJhbmdlKHJhbmdlQmVnaW4sIHJh bmdlRW5kIC0gcmFuZ2VCZWdpbildXTsKKyAgICAgICAgW3Rhc2sgZGlkRmluaXNoXTsKKyAgICAg ICAgZm91bmRSYW5nZVJlcXVlc3QgPSB0cnVlOworICAgIH1dOworICAgIFt3ZWJWaWV3IGxvYWRS ZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVxdWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6 QCJyYW5nZXM6Ly8vbWFpbi5odG1sIl1dXTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcg X3Rlc3Rfd2FpdEZvckFsZXJ0XSwgInBsYXlpbmciKTsKKyAgICBFWFBFQ1RfVFJVRShmb3VuZFJh bmdlUmVxdWVzdCk7Cit9Cg== 427464 2021-04-30 15:51:46 -0700 2021-05-03 12:46:06 -0700 Patch bug-203302-20210430155136.patch text/plain 6494 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY0OTEwM2NhY2UzZWIx ZmE0ZjhmYTRiYzBhNTNjNzA0YWZiZDRjZi4uMmU4ODg3MzNhNGU4YzYzNzYwYjlmYmU5ODcwNmFl ODg3ZGZhMzQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA0LTMwICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJW aWV3OiBXS1VSTFNjaGVtZUhhbmRsZXIgcmVxdWVzdCBkb24ndCBoYXZlIFJhbmdlIGhlYWRlcnMg Zm9yIGN1c3RvbSBzY2hlbWUgdmlkZW9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDMzMDIKKyAgICAgICAgPHJkYXI6Ly82Mzc1MDMyMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUgYW5kIEdlb2ZmIEdhcmVuLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9h ZGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpzdGFy dExvYWRpbmcpOgorCiAyMDIxLTA0LTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjc2NjMzKTogQVNTRVJUSU9OIEZBSUxFRDogIWZv cmJpZE1hbGxvY1VzZVNjb3BlQ291bnQgfHwgZGlzYWJsZU1hbGxvY1Jlc3RyaWN0aW9uU2NvcGVD b3VudCB1bmRlciBXZWJDb3JlOjpBdWRpb1NhbXBsZURhdGFTb3VyY2U6OmNyZWF0ZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KaW5k ZXggNGQ1ZjM1ODBlYmFkMzBiZjAwYzM2OWRhMDE1ZjAzOGU2MGZlNWJhMC4uN2MwOGY2ZTgwMmJj YTdkZGEwOGNmZWIyZDM0NDZhYTE3YTY1NGViYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9h ZGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQpAQCAtMjQ2LDYgKzI0NiwxMSBAQCB2 b2lkIFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKCkKICAgICBSZXNvdXJj ZVJlcXVlc3QgcmVxdWVzdChuc1JlcXVlc3QpOwogICAgIHJlcXVlc3Quc2V0UHJpb3JpdHkoUmVz b3VyY2VMb2FkUHJpb3JpdHk6Okxvdyk7CiAKKyAgICBpZiAoQVZBc3NldFJlc291cmNlTG9hZGlu Z0RhdGFSZXF1ZXN0ICpkYXRhUmVxdWVzdCA9IFttX2F2UmVxdWVzdCBkYXRhUmVxdWVzdF07IGRh dGFSZXF1ZXN0LnJlcXVlc3RlZExlbmd0aCAmJiAhcmVxdWVzdC5oYXNIVFRQSGVhZGVyRmllbGQo SFRUUEhlYWRlck5hbWU6OlJhbmdlKSkgeworICAgICAgICBTdHJpbmcgcmFuZ2VFbmQgPSBkYXRh UmVxdWVzdC5yZXF1ZXN0c0FsbERhdGFUb0VuZE9mUmVzb3VyY2UgPyAiKiJfcyA6IG1ha2VTdHJp bmcoZGF0YVJlcXVlc3QucmVxdWVzdGVkT2Zmc2V0ICsgZGF0YVJlcXVlc3QucmVxdWVzdGVkTGVu Z3RoIC0gMSk7CisgICAgICAgIHJlcXVlc3QuYWRkSFRUUEhlYWRlckZpZWxkKEhUVFBIZWFkZXJO YW1lOjpSYW5nZSwgbWFrZVN0cmluZygiYnl0ZXM9IiwgZGF0YVJlcXVlc3QucmVxdWVzdGVkT2Zm c2V0LCAnLScsIHJhbmdlRW5kKSk7CisgICAgfQorCiAgICAgaWYgKGF1dG8qIGxvYWRlciA9IG1f cGFyZW50LT5wbGF5ZXIoKS0+Y2FjaGVkUmVzb3VyY2VMb2FkZXIoKSkgewogICAgICAgICBtX3Jl c291cmNlTWVkaWFMb2FkZXIgPSBDYWNoZWRSZXNvdXJjZU1lZGlhTG9hZGVyOjpjcmVhdGUoKnRo aXMsICpsb2FkZXIsIFJlc291cmNlUmVxdWVzdChyZXF1ZXN0KSk7CiAgICAgICAgIGlmIChtX3Jl c291cmNlTWVkaWFMb2FkZXIpCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggZDhhMzkyMjkzNTJhY2NlYjNlZDQxYzg4NDI1YjMwN2MzYjBhNmQyNC4u MDFhNGYyMTM0NWFiZTA4YTE4N2NiNjE2OTc0ZWM2Nzk1MWVmYjZmZSAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEzIEBACisyMDIx LTA0LTMwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgV0tXZWJWaWV3OiBXS1VSTFNjaGVtZUhhbmRsZXIgcmVxdWVzdCBkb24ndCBoYXZlIFJh bmdlIGhlYWRlcnMgZm9yIGN1c3RvbSBzY2hlbWUgdmlkZW9zCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDMzMDIKKyAgICAgICAgPHJkYXI6Ly82Mzc1 MDMyMT4KKworICAgICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUgYW5kIEdlb2ZmIEdhcmVuLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhh bmRsZXItMS5tbToKKwogMjAyMS0wNC0zMCAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW3dlYmtpdHNjcHldIFN1cHBvcnQgYXJndW1lbnRzIHRvIFRhc2tQ b29sIHNldHVwIGFuZCB0ZWFyZG93bgpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbSBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tVUkxTY2hlbWVIYW5kbGVyLTEubW0KaW5kZXggM2Y5 NWI3ZTM2NWZmYzdjNjI5NTRhMWI1MGVjOThmODE5NDNmMTMwNy4uN2FhNGM5ZDk3NThkNjhkMzg2 ZjNhMDkyNGNlMDI2YjM4NmRlMmFjOSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQorKysgYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tCkBAIC0x NDczLDMgKzE0NzMsNTMgQEAgVEVTVChVUkxTY2hlbWVIYW5kbGVyLCBBUElSZWRpcmVjdCkKICAg ICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJnJlY2VpdmVkU2NyaXB0TWVzc2FnZSk7CiAgICAg RVhQRUNUX1dLX1NUUkVRKEAiRG9jdW1lbnQgVVJMOiByZWRpcmVjdG9uZTovL2Jhci5jb20vYW5v dGhlcnRlc3QuaHRtbCIsIFtsYXN0U2NyaXB0TWVzc2FnZSBib2R5XSk7CiB9CisKK1RFU1QoVVJM U2NoZW1lSGFuZGxlciwgUmFuZ2VzKQoreworICAgIFJldGFpblB0cjxOU0RhdGE+IHZpZGVvRGF0 YSA9IFtOU0RhdGEgZGF0YVdpdGhDb250ZW50c09mVVJMOltbTlNCdW5kbGUgbWFpbkJ1bmRsZV0g VVJMRm9yUmVzb3VyY2U6QCJ0ZXN0IiB3aXRoRXh0ZW5zaW9uOkAibXA0IiBzdWJkaXJlY3Rvcnk6 QCJUZXN0V2ViS2l0QVBJLnJlc291cmNlcyJdXTsKKworICAgIGF1dG8gaGFuZGxlciA9IGFkb3B0 TlMoW1tUZXN0VVJMU2NoZW1lSGFuZGxlciBhbGxvY10gaW5pdF0pOworICAgIGF1dG8gY29uZmln dXJhdGlvbiA9IGFkb3B0TlMoW1tXS1dlYlZpZXdDb25maWd1cmF0aW9uIGFsbG9jXSBpbml0XSk7 CisgICAgW2NvbmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpoYW5kbGVyLmdldCgpIGZv clVSTFNjaGVtZTpAInJhbmdlcyJdOworICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCkubWVkaWFUeXBl c1JlcXVpcmluZ1VzZXJBY3Rpb25Gb3JQbGF5YmFjayA9IFdLQXVkaW92aXN1YWxNZWRpYVR5cGVO b25lOworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tUZXN0V0tXZWJWaWV3IGFsbG9jXSBp bml0V2l0aEZyYW1lOkNHUmVjdE1ha2UoMCwgMCwgODAwLCA2MDApIGNvbmZpZ3VyYXRpb246Y29u ZmlndXJhdGlvbi5nZXQoKV0pOworICAgIF9fYmxvY2sgYm9vbCBmb3VuZFJhbmdlUmVxdWVzdCA9 IGZhbHNlOworICAgIFtoYW5kbGVyIHNldFN0YXJ0VVJMU2NoZW1lVGFza0hhbmRsZXI6XihXS1dl YlZpZXcgKiwgaWQ8V0tVUkxTY2hlbWVUYXNrPiB0YXNrKSB7CisgICAgICAgIGlmIChbdGFzay5y ZXF1ZXN0LlVSTC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9tYWluLmh0bWwiXSkgeworICAgICAg ICAgICAgTlNTdHJpbmcgKmh0bWwgPSBAIjx2aWRlbyBhdXRvcGxheSBvbnBsYXlpbmc9XCJhbGVy dCgncGxheWluZycpXCI+PHNvdXJjZSBzcmM9Jy92aWRlby5tNHYnIHR5cGU9J3ZpZGVvL21wNCc+ PC92aWRlbz4iOworICAgICAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZVJlc3BvbnNlOltbW05TVVJM UmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwgTUlNRVR5cGU6QCJ0 ZXh0L2h0bWwiIGV4cGVjdGVkQ29udGVudExlbmd0aDpodG1sLmxlbmd0aCB0ZXh0RW5jb2RpbmdO YW1lOm5pbF0gYXV0b3JlbGVhc2VdXTsKKyAgICAgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRh OltodG1sIGRhdGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXV07CisgICAgICAg ICAgICBbdGFzayBkaWRGaW5pc2hdOworICAgICAgICAgICAgcmV0dXJuOworICAgICAgICB9CisK KyAgICAgICAgTlNTdHJpbmcgKnJlcXVlc3RSYW5nZSA9IFt0YXNrLnJlcXVlc3QuYWxsSFRUUEhl YWRlckZpZWxkcyBvYmplY3RGb3JLZXk6QCJSYW5nZSJdOworICAgICAgICBFWFBFQ1RfVFJVRShy ZXF1ZXN0UmFuZ2UpOworCisgICAgICAgIFN0cmluZyByZXF1ZXN0UmFuZ2VTdHJpbmcocmVxdWVz dFJhbmdlKTsKKyAgICAgICAgU3RyaW5nIHJhbmdlQnl0ZXMgPSAiYnl0ZXM9Il9zOworICAgICAg ICBhdXRvIGJlZ2luID0gcmVxdWVzdFJhbmdlU3RyaW5nLmZpbmQocmFuZ2VCeXRlcywgMCk7Cisg ICAgICAgIEFTU0VSVChiZWdpbiAhPSBub3RGb3VuZCk7CisgICAgICAgIGF1dG8gZGFzaCA9IHJl cXVlc3RSYW5nZVN0cmluZy5maW5kKCctJywgYmVnaW4pOworICAgICAgICBBU1NFUlQoZGFzaCAh PSBub3RGb3VuZCk7CisgICAgICAgIGF1dG8gZW5kID0gcmVxdWVzdFJhbmdlU3RyaW5nLmxlbmd0 aCgpOworCisgICAgICAgIGF1dG8gcmFuZ2VCZWdpblN0cmluZyA9IHJlcXVlc3RSYW5nZVN0cmlu Zy5zdWJzdHJpbmcoYmVnaW4gKyByYW5nZUJ5dGVzLmxlbmd0aCgpLCBkYXNoIC0gYmVnaW4gLSBy YW5nZUJ5dGVzLmxlbmd0aCgpKTsKKyAgICAgICAgYXV0byByYW5nZUVuZFN0cmluZyA9IHJlcXVl c3RSYW5nZVN0cmluZy5zdWJzdHJpbmcoZGFzaCArIDEsIGVuZCAtIGRhc2ggLSAxKTsKKyAgICAg ICAgYXV0byByYW5nZUJlZ2luID0gcmFuZ2VCZWdpblN0cmluZy50b1VJbnQ2NFN0cmljdCgpOwor ICAgICAgICBhdXRvIHJhbmdlRW5kID0gcmFuZ2VFbmRTdHJpbmcgPT0gIioiID8gW3ZpZGVvRGF0 YSBsZW5ndGhdIDogcmFuZ2VFbmRTdHJpbmcudG9VSW50NjRTdHJpY3QoKTsKKworICAgICAgICBh dXRvIHJlc3BvbnNlID0gYWRvcHROUyhbW05TSFRUUFVSTFJlc3BvbnNlIGFsbG9jXSBpbml0V2l0 aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzpAImh0dHBzOi8vd2Via2l0Lm9yZy8iXSBzdGF0dXND b2RlOjIwNiBIVFRQVmVyc2lvbjpAIkhUVFAvMS4xIiBoZWFkZXJGaWVsZHM6QHsKKyAgICAgICAg ICAgIEAiQ29udGVudC1SYW5nZSIgOiBbTlNTdHJpbmcgc3RyaW5nV2l0aEZvcm1hdDpAImJ5dGVz ICVsbHUtJWxsdS8lbHUiLCByYW5nZUJlZ2luLCByYW5nZUVuZCwgKHVuc2lnbmVkIGxvbmcpW3Zp ZGVvRGF0YSBsZW5ndGhdXSwKKyAgICAgICAgICAgIEAiQ29udGVudC1MZW5ndGgiIDogW05TU3Ry aW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCIlbGx1IiwgcmFuZ2VFbmQgLSByYW5nZUJlZ2luICsgMV0K KyAgICAgICAgfV0pOworCisgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVSZXNwb25zZTpyZXNwb25z ZS5nZXQoKV07CisgICAgICAgIFt0YXNrIGRpZFJlY2VpdmVEYXRhOlt2aWRlb0RhdGEgc3ViZGF0 YVdpdGhSYW5nZTpOU01ha2VSYW5nZShyYW5nZUJlZ2luLCByYW5nZUVuZCAtIHJhbmdlQmVnaW4p XV07CisgICAgICAgIFt0YXNrIGRpZEZpbmlzaF07CisgICAgICAgIGZvdW5kUmFuZ2VSZXF1ZXN0 ID0gdHJ1ZTsKKyAgICB9XTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0 IHJlcXVlc3RXaXRoVVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOkAicmFuZ2VzOi8vL21haW4uaHRt bCJdXV07CisgICAgRVhQRUNUX1dLX1NUUkVRKFt3ZWJWaWV3IF90ZXN0X3dhaXRGb3JBbGVydF0s ICJwbGF5aW5nIik7CisgICAgRVhQRUNUX1RSVUUoZm91bmRSYW5nZVJlcXVlc3QpOworfQo= 427587 2021-05-03 12:46:09 -0700 2021-05-03 15:35:30 -0700 Patch bug-203302-20210503124608.patch text/plain 6547 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjc2ODQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjY0OTEwM2NhY2UzZWIx ZmE0ZjhmYTRiYzBhNTNjNzA0YWZiZDRjZi4uMmU4ODg3MzNhNGU4YzYzNzYwYjlmYmU5ODcwNmFl ODg3ZGZhMzQ5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTA0LTMwICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJW aWV3OiBXS1VSTFNjaGVtZUhhbmRsZXIgcmVxdWVzdCBkb24ndCBoYXZlIFJhbmdlIGhlYWRlcnMg Zm9yIGN1c3RvbSBzY2hlbWUgdmlkZW9zCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMDMzMDIKKyAgICAgICAgPHJkYXI6Ly82Mzc1MDMyMT4KKworICAg ICAgICBSZXZpZXdlZCBieSBKZXIgTm9ibGUgYW5kIEdlb2ZmIEdhcmVuLgorCisgICAgICAgICog cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9h ZGVyLm1tOgorICAgICAgICAoV2ViQ29yZTo6V2ViQ29yZUFWRlJlc291cmNlTG9hZGVyOjpzdGFy dExvYWRpbmcpOgorCiAyMDIxLTA0LTMwICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNv bT4KIAogICAgICAgICBSRUdSRVNTSU9OIChyMjc2NjMzKTogQVNTRVJUSU9OIEZBSUxFRDogIWZv cmJpZE1hbGxvY1VzZVNjb3BlQ291bnQgfHwgZGlzYWJsZU1hbGxvY1Jlc3RyaWN0aW9uU2NvcGVD b3VudCB1bmRlciBXZWJDb3JlOjpBdWRpb1NhbXBsZURhdGFTb3VyY2U6OmNyZWF0ZSgpCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9hdmZvdW5kYXRpb24vb2Jq Yy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0gYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9hdmZvdW5kYXRpb24vb2JqYy9XZWJDb3JlQVZGUmVzb3VyY2VMb2FkZXIubW0KaW5k ZXggNGQ1ZjM1ODBlYmFkMzBiZjAwYzM2OWRhMDE1ZjAzOGU2MGZlNWJhMC4uMzBjZjc5ZWNmZGYy NTgyZjU0NTJhYmYyMTI5NjEyODU2MzNmNzgzMCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv cGxhdGZvcm0vZ3JhcGhpY3MvYXZmb3VuZGF0aW9uL29iamMvV2ViQ29yZUFWRlJlc291cmNlTG9h ZGVyLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2F2Zm91bmRhdGlv bi9vYmpjL1dlYkNvcmVBVkZSZXNvdXJjZUxvYWRlci5tbQpAQCAtMjQ2LDYgKzI0NiwxMyBAQCB2 b2lkIFdlYkNvcmVBVkZSZXNvdXJjZUxvYWRlcjo6c3RhcnRMb2FkaW5nKCkKICAgICBSZXNvdXJj ZVJlcXVlc3QgcmVxdWVzdChuc1JlcXVlc3QpOwogICAgIHJlcXVlc3Quc2V0UHJpb3JpdHkoUmVz b3VyY2VMb2FkUHJpb3JpdHk6Okxvdyk7CiAKKyAgICBpZiAoQVZBc3NldFJlc291cmNlTG9hZGlu Z0RhdGFSZXF1ZXN0ICpkYXRhUmVxdWVzdCA9IFttX2F2UmVxdWVzdCBkYXRhUmVxdWVzdF07IGRh dGFSZXF1ZXN0LnJlcXVlc3RlZExlbmd0aAorICAgICAgICAmJiAhcmVxdWVzdC5oYXNIVFRQSGVh ZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6OlJhbmdlKQorICAgICAgICAmJiAhcmVxdWVzdC51cmwo KS5wcm90b2NvbElzQmxvYigpKSB7CisgICAgICAgIFN0cmluZyByYW5nZUVuZCA9IGRhdGFSZXF1 ZXN0LnJlcXVlc3RzQWxsRGF0YVRvRW5kT2ZSZXNvdXJjZSA/ICIqIl9zIDogbWFrZVN0cmluZyhk YXRhUmVxdWVzdC5yZXF1ZXN0ZWRPZmZzZXQgKyBkYXRhUmVxdWVzdC5yZXF1ZXN0ZWRMZW5ndGgg LSAxKTsKKyAgICAgICAgcmVxdWVzdC5hZGRIVFRQSGVhZGVyRmllbGQoSFRUUEhlYWRlck5hbWU6 OlJhbmdlLCBtYWtlU3RyaW5nKCJieXRlcz0iLCBkYXRhUmVxdWVzdC5yZXF1ZXN0ZWRPZmZzZXQs ICctJywgcmFuZ2VFbmQpKTsKKyAgICB9CisKICAgICBpZiAoYXV0byogbG9hZGVyID0gbV9wYXJl bnQtPnBsYXllcigpLT5jYWNoZWRSZXNvdXJjZUxvYWRlcigpKSB7CiAgICAgICAgIG1fcmVzb3Vy Y2VNZWRpYUxvYWRlciA9IENhY2hlZFJlc291cmNlTWVkaWFMb2FkZXI6OmNyZWF0ZSgqdGhpcywg KmxvYWRlciwgUmVzb3VyY2VSZXF1ZXN0KHJlcXVlc3QpKTsKICAgICAgICAgaWYgKG1fcmVzb3Vy Y2VNZWRpYUxvYWRlcikKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5n ZUxvZwppbmRleCBkOGEzOTIyOTM1MmFjY2ViM2VkNDFjODg0MjViMzA3YzNiMGE2ZDI0Li4wMWE0 ZjIxMzQ1YWJlMDhhMTg3Y2I2MTY5NzRlYzY3OTUxZWZiNmZlIDEwMDY0NAotLS0gYS9Ub29scy9D aGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjEtMDQt MzAgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAg ICBXS1dlYlZpZXc6IFdLVVJMU2NoZW1lSGFuZGxlciByZXF1ZXN0IGRvbid0IGhhdmUgUmFuZ2Ug aGVhZGVycyBmb3IgY3VzdG9tIHNjaGVtZSB2aWRlb3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMzMwMgorICAgICAgICA8cmRhcjovLzYzNzUwMzIx PgorCisgICAgICAgIFJldmlld2VkIGJ5IEplciBOb2JsZSBhbmQgR2VvZmYgR2FyZW4uCisKKyAg ICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxl ci0xLm1tOgorCiAyMDIxLTA0LTMwICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KIAogICAgICAgICBbd2Via2l0c2NweV0gU3VwcG9ydCBhcmd1bWVudHMgdG8gVGFza1Bvb2wg c2V0dXAgYW5kIHRlYXJkb3duCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJLaXRDb2NvYS9XS1VSTFNjaGVtZUhhbmRsZXItMS5tbQppbmRleCAzZjk1Yjdl MzY1ZmZjN2M2Mjk1NGExYjUwZWM5OGY4MTk0M2YxMzA3Li43YWE0YzlkOTc1OGQ2OGQzODZmM2Ew OTI0Y2UwMjZiMzg2ZGUyYWM5IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1dLVVJMU2NoZW1lSGFuZGxlci0xLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV0tVUkxTY2hlbWVIYW5kbGVyLTEubW0KQEAgLTE0NzMs MyArMTQ3Myw1MyBAQCBURVNUKFVSTFNjaGVtZUhhbmRsZXIsIEFQSVJlZGlyZWN0KQogICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmcmVjZWl2ZWRTY3JpcHRNZXNzYWdlKTsKICAgICBFWFBF Q1RfV0tfU1RSRVEoQCJEb2N1bWVudCBVUkw6IHJlZGlyZWN0b25lOi8vYmFyLmNvbS9hbm90aGVy dGVzdC5odG1sIiwgW2xhc3RTY3JpcHRNZXNzYWdlIGJvZHldKTsKIH0KKworVEVTVChVUkxTY2hl bWVIYW5kbGVyLCBSYW5nZXMpCit7CisgICAgUmV0YWluUHRyPE5TRGF0YT4gdmlkZW9EYXRhID0g W05TRGF0YSBkYXRhV2l0aENvbnRlbnRzT2ZVUkw6W1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxG b3JSZXNvdXJjZTpAInRlc3QiIHdpdGhFeHRlbnNpb246QCJtcDQiIHN1YmRpcmVjdG9yeTpAIlRl c3RXZWJLaXRBUEkucmVzb3VyY2VzIl1dOworCisgICAgYXV0byBoYW5kbGVyID0gYWRvcHROUyhb W1Rlc3RVUkxTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgYXV0byBjb25maWd1cmF0 aW9uID0gYWRvcHROUyhbW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKKyAg ICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOmhhbmRsZXIuZ2V0KCkgZm9yVVJM U2NoZW1lOkAicmFuZ2VzIl07CisgICAgY29uZmlndXJhdGlvbi5nZXQoKS5tZWRpYVR5cGVzUmVx dWlyaW5nVXNlckFjdGlvbkZvclBsYXliYWNrID0gV0tBdWRpb3Zpc3VhbE1lZGlhVHlwZU5vbmU7 CisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1Rlc3RXS1dlYlZpZXcgYWxsb2NdIGluaXRX aXRoRnJhbWU6Q0dSZWN0TWFrZSgwLCAwLCA4MDAsIDYwMCkgY29uZmlndXJhdGlvbjpjb25maWd1 cmF0aW9uLmdldCgpXSk7CisgICAgX19ibG9jayBib29sIGZvdW5kUmFuZ2VSZXF1ZXN0ID0gZmFs c2U7CisgICAgW2hhbmRsZXIgc2V0U3RhcnRVUkxTY2hlbWVUYXNrSGFuZGxlcjpeKFdLV2ViVmll dyAqLCBpZDxXS1VSTFNjaGVtZVRhc2s+IHRhc2spIHsKKyAgICAgICAgaWYgKFt0YXNrLnJlcXVl c3QuVVJMLnBhdGggaXNFcXVhbFRvU3RyaW5nOkAiL21haW4uaHRtbCJdKSB7CisgICAgICAgICAg ICBOU1N0cmluZyAqaHRtbCA9IEAiPHZpZGVvIGF1dG9wbGF5IG9ucGxheWluZz1cImFsZXJ0KCdw bGF5aW5nJylcIj48c291cmNlIHNyYz0nL3ZpZGVvLm00dicgdHlwZT0ndmlkZW8vbXA0Jz48L3Zp ZGVvPiI7CisgICAgICAgICAgICBbdGFzayBkaWRSZWNlaXZlUmVzcG9uc2U6W1tbTlNVUkxSZXNw b25zZSBhbGxvY10gaW5pdFdpdGhVUkw6dGFzay5yZXF1ZXN0LlVSTCBNSU1FVHlwZTpAInRleHQv aHRtbCIgZXhwZWN0ZWRDb250ZW50TGVuZ3RoOmh0bWwubGVuZ3RoIHRleHRFbmNvZGluZ05hbWU6 bmlsXSBhdXRvcmVsZWFzZV1dOworICAgICAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6W2h0 bWwgZGF0YVVzaW5nRW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmddXTsKKyAgICAgICAgICAg IFt0YXNrIGRpZEZpbmlzaF07CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKworICAg ICAgICBOU1N0cmluZyAqcmVxdWVzdFJhbmdlID0gW3Rhc2sucmVxdWVzdC5hbGxIVFRQSGVhZGVy RmllbGRzIG9iamVjdEZvcktleTpAIlJhbmdlIl07CisgICAgICAgIEVYUEVDVF9UUlVFKHJlcXVl c3RSYW5nZSk7CisKKyAgICAgICAgU3RyaW5nIHJlcXVlc3RSYW5nZVN0cmluZyhyZXF1ZXN0UmFu Z2UpOworICAgICAgICBTdHJpbmcgcmFuZ2VCeXRlcyA9ICJieXRlcz0iX3M7CisgICAgICAgIGF1 dG8gYmVnaW4gPSByZXF1ZXN0UmFuZ2VTdHJpbmcuZmluZChyYW5nZUJ5dGVzLCAwKTsKKyAgICAg ICAgQVNTRVJUKGJlZ2luICE9IG5vdEZvdW5kKTsKKyAgICAgICAgYXV0byBkYXNoID0gcmVxdWVz dFJhbmdlU3RyaW5nLmZpbmQoJy0nLCBiZWdpbik7CisgICAgICAgIEFTU0VSVChkYXNoICE9IG5v dEZvdW5kKTsKKyAgICAgICAgYXV0byBlbmQgPSByZXF1ZXN0UmFuZ2VTdHJpbmcubGVuZ3RoKCk7 CisKKyAgICAgICAgYXV0byByYW5nZUJlZ2luU3RyaW5nID0gcmVxdWVzdFJhbmdlU3RyaW5nLnN1 YnN0cmluZyhiZWdpbiArIHJhbmdlQnl0ZXMubGVuZ3RoKCksIGRhc2ggLSBiZWdpbiAtIHJhbmdl Qnl0ZXMubGVuZ3RoKCkpOworICAgICAgICBhdXRvIHJhbmdlRW5kU3RyaW5nID0gcmVxdWVzdFJh bmdlU3RyaW5nLnN1YnN0cmluZyhkYXNoICsgMSwgZW5kIC0gZGFzaCAtIDEpOworICAgICAgICBh dXRvIHJhbmdlQmVnaW4gPSByYW5nZUJlZ2luU3RyaW5nLnRvVUludDY0U3RyaWN0KCk7CisgICAg ICAgIGF1dG8gcmFuZ2VFbmQgPSByYW5nZUVuZFN0cmluZyA9PSAiKiIgPyBbdmlkZW9EYXRhIGxl bmd0aF0gOiByYW5nZUVuZFN0cmluZy50b1VJbnQ2NFN0cmljdCgpOworCisgICAgICAgIGF1dG8g cmVzcG9uc2UgPSBhZG9wdE5TKFtbTlNIVFRQVVJMUmVzcG9uc2UgYWxsb2NdIGluaXRXaXRoVVJM OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiaHR0cHM6Ly93ZWJraXQub3JnLyJdIHN0YXR1c0NvZGU6 MjA2IEhUVFBWZXJzaW9uOkAiSFRUUC8xLjEiIGhlYWRlckZpZWxkczpAeworICAgICAgICAgICAg QCJDb250ZW50LVJhbmdlIiA6IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiYnl0ZXMgJWxs dS0lbGx1LyVsdSIsIHJhbmdlQmVnaW4sIHJhbmdlRW5kLCAodW5zaWduZWQgbG9uZylbdmlkZW9E YXRhIGxlbmd0aF1dLAorICAgICAgICAgICAgQCJDb250ZW50LUxlbmd0aCIgOiBbTlNTdHJpbmcg c3RyaW5nV2l0aEZvcm1hdDpAIiVsbHUiLCByYW5nZUVuZCAtIHJhbmdlQmVnaW4gKyAxXQorICAg ICAgICB9XSk7CisKKyAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZVJlc3BvbnNlOnJlc3BvbnNlLmdl dCgpXTsKKyAgICAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6W3ZpZGVvRGF0YSBzdWJkYXRhV2l0 aFJhbmdlOk5TTWFrZVJhbmdlKHJhbmdlQmVnaW4sIHJhbmdlRW5kIC0gcmFuZ2VCZWdpbildXTsK KyAgICAgICAgW3Rhc2sgZGlkRmluaXNoXTsKKyAgICAgICAgZm91bmRSYW5nZVJlcXVlc3QgPSB0 cnVlOworICAgIH1dOworICAgIFt3ZWJWaWV3IGxvYWRSZXF1ZXN0OltOU1VSTFJlcXVlc3QgcmVx dWVzdFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6QCJyYW5nZXM6Ly8vbWFpbi5odG1sIl1d XTsKKyAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwgInBs YXlpbmciKTsKKyAgICBFWFBFQ1RfVFJVRShmb3VuZFJhbmdlUmVxdWVzdCk7Cit9Cg==