176731 2017-09-11 14:07:28 -0700 Web Inspector: Cleanup and test MIMETypeUtilities 2017-09-27 12:34:33 -0700 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue inspector-bugzilla-changes joepeck mattbaker webkit-bug-importer oldest_to_newest 1347595 0 joepeck 2017-09-11 14:07:28 -0700 Cleanup and test MIMETypeUtilities • fileExtensionForURL ending in "script.min.js" produces ".min.js" expected ".js" • fileExtensionForMIMEType for "application/vnd.api+json" produces `null` expected "json" 1347596 1 320472 joepeck 2017-09-11 14:09:18 -0700 Created attachment 320472 [PATCH] Proposed Fix 1347646 2 320472 mattbaker 2017-09-11 15:05:21 -0700 Comment on attachment 320472 [PATCH] Proposed Fix View in context: https://bugs.webkit.org/attachment.cgi?id=320472&action=review r=me > LayoutTests/inspector/unit-tests/mimetype-utilities.html:24 > + InspectorTest.expectEqual(WI.fileExtensionForURL("https://example.com/script.min.js"), "js", `File extension for "script.min.js" should be "js".`); Should there also be a test for filenames with a trailing period? I know it's odd but AFAIK it is allowed (on UNIX and Windows at least). Also, WI.fileExtensionForURL("https://example.com/foo.") returns "" instead of null. This should probably return null for consistency 1347685 3 320491 joepeck 2017-09-11 15:45:40 -0700 Created attachment 320491 [PATCH] For Landing 1347686 4 joepeck 2017-09-11 15:46:07 -0700 > Should there also be a test for filenames with a trailing period? I know > it's odd but AFAIK it is allowed (on UNIX and Windows at least). > > Also, WI.fileExtensionForURL("https://example.com/foo.") returns "" instead > of null. This should probably return null for consistency Sounds good. Added. 1347709 5 320491 commit-queue 2017-09-11 16:16:10 -0700 Comment on attachment 320491 [PATCH] For Landing Clearing flags on attachment: 320491 Committed r221891: <http://trac.webkit.org/changeset/221891> 1353489 6 webkit-bug-importer 2017-09-27 12:34:33 -0700 <rdar://problem/34693513> 320472 2017-09-11 14:09:18 -0700 2017-09-11 15:36:53 -0700 [PATCH] Proposed Fix mime-1.patch text/plain 11299 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjOTI4MjI0OGE4YS4uZDMyZjhlMmEwMGEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxNy0wOS0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IENsZWFudXAgYW5kIHRlc3QgTUlNRVR5cGVVdGlsaXRpZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjczMQorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogaW5zcGVjdG9y L3VuaXQtdGVzdHMvbWltZXR5cGUtdXRpbGl0aWVzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAg ICAgICogaW5zcGVjdG9yL3VuaXQtdGVzdHMvbWltZXR5cGUtdXRpbGl0aWVzLmh0bWw6IEFkZGVk LgorCiAyMDE3LTA5LTExICBaYW4gRG9iZXJzZWsgIDx6ZG9iZXJzZWtAaWdhbGlhLmNvbT4KIAog ICAgICAgICBbRU1FXSBDbGVhcktleTogaW1wbGVtZW50IENETUluc3RhbmNlQ2xlYXJLZXkgc3Rh dGUgbW9kaWZpZXJzLCBjYWxsYmFjayBkaXNwYXRjaGVzCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9taW1ldHlwZS11dGlsaXRpZXMtZXhwZWN0ZWQudHh0IGIv TGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvbWltZXR5cGUtdXRpbGl0aWVzLWV4cGVj dGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uYjEyMDk4M2Jk Y2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9t aW1ldHlwZS11dGlsaXRpZXMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMjcgQEAKKworPT0gUnVu bmluZyB0ZXN0IHN1aXRlOiBNSU1FVHlwZVV0aWxpdGllcworLS0gUnVubmluZyB0ZXN0IGNhc2U6 IGZpbGVFeHRlbnNpb25Gb3JVUkwKK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciBpbnZhbGlkIFVS TCBzaG91bGQgYmUgbnVsbC4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciBVUkwgd2l0aG91dCBs YXN0IHBhdGggY29tcG9uZW50IHNob3VsZCBiZSBudWxsLgorUEFTUzogRmlsZSBleHRlbnNpb24g Zm9yIFVSTCB3aXRob3V0IGxhc3QgcGF0aCBjb21wb25lbnQgc2hvdWxkIGJlIG51bGwuCitQQVNT OiBGaWxlIGV4dGVuc2lvbiBmb3IgVVJMIHdpdGggbGFzdCBwYXRoIGNvbXBvbmVudCB3aXRob3V0 IGEgcGVyaW9kIHNob3VsZCBiZSBudWxsLgorUEFTUzogRmlsZSBleHRlbnNpb24gZm9yIFVSTCB3 aXRoIGxhc3QgcGF0aCBjb21wb25lbnQgd2l0aG91dCBhIHBlcmlvZCBzaG91bGQgYmUgbnVsbC4K K1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciAiZm9vLnh5eiIgc2hvdWxkIGJlICJ4eXoiLgorUEFT UzogRmlsZSBleHRlbnNpb24gZm9yICJpbWFnZS5wbmciIHNob3VsZCBiZSAicG5nIi4KK1BBU1M6 IEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2UucG5nIiBzaG91bGQgYmUgImdpZiIuCitQQVNTOiBG aWxlIGV4dGVuc2lvbiBmb3IgInNjcmlwdC5qcyIgc2hvdWxkIGJlICJqcyIuCitQQVNTOiBGaWxl IGV4dGVuc2lvbiBmb3IgInNjcmlwdC5taW4uanMiIHNob3VsZCBiZSAianMiLgorCistLSBSdW5u aW5nIHRlc3QgY2FzZTogZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlCitQQVNTOiBGaWxlIGV4dGVu c2lvbiBmb3IgaW52YWxpZCBtaW1lIHR5cGUgc2hvdWxkIGJlIG51bGwuCitQQVNTOiBGaWxlIGV4 dGVuc2lvbiBmb3IgdW5rbm93biBtaW1lIHR5cGUgc2hvdWxkIGJlIG51bGwuCitQQVNTOiBGaWxl IGV4dGVuc2lvbiBmb3IgImltYWdlL2pwZWciIHNob3VsZCBiZSAianBnIi4KK1BBU1M6IEZpbGUg ZXh0ZW5zaW9uIGZvciAiaW1hZ2UvcG5nIiBzaG91bGQgYmUgInBuZyIuCitQQVNTOiBGaWxlIGV4 dGVuc2lvbiBmb3IgImltYWdlL2dpZiIgc2hvdWxkIGJlICJnaWYiLgorUEFTUzogRmlsZSBleHRl bnNpb24gZm9yICJ0ZXh0L2phdmFzY3JpcHQiIHNob3VsZCBiZSAianMiLgorUEFTUzogRmlsZSBl eHRlbnNpb24gZm9yICJhcHBsaWNhdGlvbi9qc29uIiBzaG91bGQgYmUgImpzb24iLgorUEFTUzog RmlsZSBleHRlbnNpb24gZm9yICJhcHBsaWNhdGlvbi92bmQuYXBpK2pzb24iIHNob3VsZCBiZSAi anNvbiIuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgImFwcGxpY2F0aW9uL3hodG1sK3htbCIg c2hvdWxkIGJlICJ4aHRtbCIuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgImltYWdlL3N2Zyt4 bWwiIHNob3VsZCBiZSAic3ZnIi4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciAidGV4dC9mb28r eG1sIiBzaG91bGQgYmUgInhtbCIuCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2luc3BlY3Rv ci91bml0LXRlc3RzL21pbWV0eXBlLXV0aWxpdGllcy5odG1sIGIvTGF5b3V0VGVzdHMvaW5zcGVj dG9yL3VuaXQtdGVzdHMvbWltZXR5cGUtdXRpbGl0aWVzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2 NDQKaW5kZXggMDAwMDAwMDAwMDAuLjlmMGExMTM0YjhiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvbWltZXR5cGUtdXRpbGl0aWVzLmh0bWwKQEAg LTAsMCArMSw1NyBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxoZWFkPgorPHNjcmlwdCBz cmM9Ii4uLy4uL2h0dHAvdGVzdHMvaW5zcGVjdG9yL3Jlc291cmNlcy9pbnNwZWN0b3ItdGVzdC5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0PgorZnVuY3Rpb24gdGVzdCgpCit7CisgICAgbGV0IHN1aXRl ID0gSW5zcGVjdG9yVGVzdC5jcmVhdGVTeW5jU3VpdGUoIk1JTUVUeXBlVXRpbGl0aWVzIik7CisK KyAgICBzdWl0ZS5hZGRUZXN0Q2FzZSh7CisgICAgICAgIG5hbWU6ICJmaWxlRXh0ZW5zaW9uRm9y VVJMIiwKKyAgICAgICAgdGVzdCgpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0 RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvclVSTCgiaW52YWxpZC11cmwiKSwgbnVsbCwgYEZpbGUg ZXh0ZW5zaW9uIGZvciBpbnZhbGlkIFVSTCBzaG91bGQgYmUgbnVsbC5gKTsKKyAgICAgICAgICAg IEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvclVSTCgiaHR0cHM6 Ly9leGFtcGxlLmNvbSIpLCBudWxsLCBgRmlsZSBleHRlbnNpb24gZm9yIFVSTCB3aXRob3V0IGxh c3QgcGF0aCBjb21wb25lbnQgc2hvdWxkIGJlIG51bGwuYCk7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwoImh0dHBzOi8vZXhhbXBs ZS5jb20vIiksIG51bGwsIGBGaWxlIGV4dGVuc2lvbiBmb3IgVVJMIHdpdGhvdXQgbGFzdCBwYXRo IGNvbXBvbmVudCBzaG91bGQgYmUgbnVsbC5gKTsKKworICAgICAgICAgICAgSW5zcGVjdG9yVGVz dC5leHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9yVVJMKCJodHRwczovL2V4YW1wbGUuY29t L3Rlc3QiKSwgbnVsbCwgYEZpbGUgZXh0ZW5zaW9uIGZvciBVUkwgd2l0aCBsYXN0IHBhdGggY29t cG9uZW50IHdpdGhvdXQgYSBwZXJpb2Qgc2hvdWxkIGJlIG51bGwuYCk7CisgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwoImh0dHBzOi8v ZXhhbXBsZS5jb20vZm9vLmJhci90ZXN0IiksIG51bGwsIGBGaWxlIGV4dGVuc2lvbiBmb3IgVVJM IHdpdGggbGFzdCBwYXRoIGNvbXBvbmVudCB3aXRob3V0IGEgcGVyaW9kIHNob3VsZCBiZSBudWxs LmApOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRl bnNpb25Gb3JVUkwoImh0dHBzOi8vZXhhbXBsZS5jb20vZm9vLnh5eiIpLCAieHl6IiwgYEZpbGUg ZXh0ZW5zaW9uIGZvciAiZm9vLnh5eiIgc2hvdWxkIGJlICJ4eXoiLmApOworICAgICAgICAgICAg SW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9yVVJMKCJodHRwczov L2V4YW1wbGUuY29tL2ltYWdlLnBuZyIpLCAicG5nIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1h Z2UucG5nIiBzaG91bGQgYmUgInBuZyIuYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4 cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwoImh0dHBzOi8vZXhhbXBsZS5jb20vaW1h Z2UuZ2lmIiksICJnaWYiLCBgRmlsZSBleHRlbnNpb24gZm9yICJpbWFnZS5wbmciIHNob3VsZCBi ZSAiZ2lmIi5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmls ZUV4dGVuc2lvbkZvclVSTCgiaHR0cHM6Ly9leGFtcGxlLmNvbS9zY3JpcHQuanMiKSwgImpzIiwg YEZpbGUgZXh0ZW5zaW9uIGZvciAic2NyaXB0LmpzIiBzaG91bGQgYmUgImpzIi5gKTsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvclVSTCgi aHR0cHM6Ly9leGFtcGxlLmNvbS9zY3JpcHQubWluLmpzIiksICJqcyIsIGBGaWxlIGV4dGVuc2lv biBmb3IgInNjcmlwdC5taW4uanMiIHNob3VsZCBiZSAianMiLmApOworCisgICAgICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICAgICAgfQorICAgIH0pOworCisgICAgc3VpdGUuYWRkVGVzdENhc2Uo eworICAgICAgICBuYW1lOiAiZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlIiwKKyAgICAgICAgdGVz dCgpIHsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVu c2lvbkZvck1JTUVUeXBlKCJpbnZhbGlkLW1pbWV0eXBlIiksIG51bGwsIGBGaWxlIGV4dGVuc2lv biBmb3IgaW52YWxpZCBtaW1lIHR5cGUgc2hvdWxkIGJlIG51bGwuYCk7CisgICAgICAgICAgICBJ bnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlwZSgiYXBw bGljYXRpb24vdW5rbm93biIpLCBudWxsLCBgRmlsZSBleHRlbnNpb24gZm9yIHVua25vd24gbWlt ZSB0eXBlIHNob3VsZCBiZSBudWxsLmApOworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4 cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlwZSgiaW1hZ2UvanBlZyIpLCAianBn IiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2UvanBlZyIgc2hvdWxkIGJlICJqcGciLmApOwor ICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9y TUlNRVR5cGUoImltYWdlL3BuZyIpLCAicG5nIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2Uv cG5nIiBzaG91bGQgYmUgInBuZyIuYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVj dEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlwZSgiaW1hZ2UvZ2lmIiksICJnaWYiLCBg RmlsZSBleHRlbnNpb24gZm9yICJpbWFnZS9naWYiIHNob3VsZCBiZSAiZ2lmIi5gKTsKKyAgICAg ICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvck1JTUVU eXBlKCJ0ZXh0L2phdmFzY3JpcHQiKSwgImpzIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAidGV4dC9q YXZhc2NyaXB0IiBzaG91bGQgYmUgImpzIi5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlKCJhcHBsaWNhdGlvbi9qc29u IiksICJqc29uIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAiYXBwbGljYXRpb24vanNvbiIgc2hvdWxk IGJlICJqc29uIi5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0ku ZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlKCJhcHBsaWNhdGlvbi92bmQuYXBpK2pzb24iKSwgImpz b24iLCBgRmlsZSBleHRlbnNpb24gZm9yICJhcHBsaWNhdGlvbi92bmQuYXBpK2pzb24iIHNob3Vs ZCBiZSAianNvbiIuYCk7CisKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwo V0kuZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlKCJhcHBsaWNhdGlvbi94aHRtbCt4bWwiKSwgInho dG1sIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAiYXBwbGljYXRpb24veGh0bWwreG1sIiBzaG91bGQg YmUgInhodG1sIi5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0ku ZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlKCJpbWFnZS9zdmcreG1sIiksICJzdmciLCBgRmlsZSBl eHRlbnNpb24gZm9yICJpbWFnZS9zdmcreG1sIiBzaG91bGQgYmUgInN2ZyIuYCk7CisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlw ZSgidGV4dC9mb28reG1sIiksICJ4bWwiLCBgRmlsZSBleHRlbnNpb24gZm9yICJ0ZXh0L2Zvbyt4 bWwiIHNob3VsZCBiZSAieG1sIi5gKTsKKworICAgICAgICAgICAgcmV0dXJuIHRydWU7CisgICAg ICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRlLnJ1blRlc3RDYXNlc0FuZEZpbmlzaCgpOworfQor PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keSBvbkxvYWQ9InJ1blRlc3QoKSI+Cis8L2JvZHk+Cis8 L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCA4MTE1Y2U0N2NiZS4uYmZlMzQwZDk0 YWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDI5IEBACiAyMDE3LTA5LTEx ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIElu c3BlY3RvcjogQ2xlYW51cCBhbmQgdGVzdCBNSU1FVHlwZVV0aWxpdGllcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2NzMxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2Uv RmlsZVV0aWxpdGllcy5qczoKKyAgICAgICAgKFdJLnNhdmVEYXRhVG9GaWxlKToKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qczoKKyAgICAgICAgKFdJ LlNvdXJjZU1hcFJlc291cmNlKToKKyAgICAgICAgVXBkYXRlIGNhbGxlcnMgdG8gaGFuZGxlIG5l dyByZXR1cm4gdmFsdWVzLgorCisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01JTUVUeXBl VXRpbGl0aWVzLmpzOgorICAgICAgICAoV0kuZmlsZUV4dGVuc2lvbkZvclVSTCk6CisgICAgICAg IFJldHVybiBudWxsIGluIGVycm9yIGNhc2VzLgorICAgICAgICBPbmx5IHByb3ZpZGUgdGhlIGNv bnRlbnQgYWZ0ZXIgdGhlIGxhc3QgcGVyaW9kLgorCisgICAgICAgIChXSS5maWxlRXh0ZW5zaW9u Rm9yTUlNRVR5cGUpOgorICAgICAgICBIYW5kbGUgZ2VuZXJpYyAiK2pzb24iIGFuZCAiK3htbCIg Y2FzZXMuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1Rlc3QuaHRtbDoKKyAgICAgICAgSW5j bHVkZSBNSU1FVHlwZVV0aWxpdGllcyBmb3IgdGVzdGluZy4KKworMjAxNy0wOS0xMSAgSm9zZXBo IFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6 IERvIG5vdCBhbGxvdyB0aGUgc3BsaXQgY29uc29sZSBpbiB0aGUgU2V0dGluZ3MgdGFiCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzY3MjYKIApkaWZm IC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRp bGl0aWVzLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxl VXRpbGl0aWVzLmpzCmluZGV4IDg4M2ZkZWYwOWUyLi4zZjA1NTdjY2QxMSAxMDA2NDQKLS0tIGEv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9GaWxlVXRpbGl0aWVzLmpz CisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxp dGllcy5qcwpAQCAtNDMsOCArNDMsMTEgQEAgV0kuc2F2ZURhdGFUb0ZpbGUgPSBmdW5jdGlvbihz YXZlRGF0YSwgZm9yY2VTYXZlQXMpCiAgICAgaWYgKCFzdWdnZXN0ZWROYW1lKSB7CiAgICAgICAg IHN1Z2dlc3RlZE5hbWUgPSBXSS5VSVN0cmluZygiVW50aXRsZWQiKTsKICAgICAgICAgbGV0IGRh dGFVUkxUeXBlTWF0Y2ggPSAvXmRhdGE6KFteO10rKS8uZXhlYyh1cmwpOwotICAgICAgICBpZiAo ZGF0YVVSTFR5cGVNYXRjaCkKLSAgICAgICAgICAgIHN1Z2dlc3RlZE5hbWUgKz0gV0kuZmlsZUV4 dGVuc2lvbkZvck1JTUVUeXBlKGRhdGFVUkxUeXBlTWF0Y2hbMV0pIHx8ICIiOworICAgICAgICBp ZiAoZGF0YVVSTFR5cGVNYXRjaCkgeworICAgICAgICAgICAgbGV0IGZpbGVFeHRlbnNpb24gPSBX SS5maWxlRXh0ZW5zaW9uRm9yTUlNRVR5cGUoZGF0YVVSTFR5cGVNYXRjaFsxXSk7CisgICAgICAg ICAgICBpZiAoZmlsZUV4dGVuc2lvbikKKyAgICAgICAgICAgICAgICBzdWdnZXN0ZWROYW1lICs9 ICIuIiArIGZpbGVFeHRlbnNpb247CisgICAgICAgIH0KICAgICB9CiAKICAgICBpZiAodHlwZW9m IHNhdmVEYXRhLmNvbnRlbnQgPT09ICJzdHJpbmciKSB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01JTUVUeXBlVXRpbGl0aWVzLmpzIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NSU1FVHlwZVV0aWxpdGllcy5q cwppbmRleCA5OGYzZjRmZTJiYS4uMWU1ZTQ2Y2E3ZDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTUlNRVR5cGVVdGlsaXRpZXMuanMKKysrIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NSU1FVHlwZVV0aWxpdGll cy5qcwpAQCAtMjUsMTMgKzI1LDEzIEBACiAKIFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwgPSBmdW5j dGlvbih1cmwpCiB7Ci0gICAgdmFyIGxhc3RQYXRoQ29tcG9uZW50ID0gcGFyc2VVUkwodXJsKS5s YXN0UGF0aENvbXBvbmVudDsKKyAgICBsZXQgbGFzdFBhdGhDb21wb25lbnQgPSBwYXJzZVVSTCh1 cmwpLmxhc3RQYXRoQ29tcG9uZW50OwogICAgIGlmICghbGFzdFBhdGhDb21wb25lbnQpCi0gICAg ICAgIHJldHVybiAiIjsKKyAgICAgICAgcmV0dXJuIG51bGw7CiAKLSAgICB2YXIgaW5kZXggPSBs YXN0UGF0aENvbXBvbmVudC5pbmRleE9mKCIuIik7CisgICAgbGV0IGluZGV4ID0gbGFzdFBhdGhD b21wb25lbnQubGFzdEluZGV4T2YoIi4iKTsKICAgICBpZiAoaW5kZXggPT09IC0xKQotICAgICAg ICByZXR1cm4gIiI7CisgICAgICAgIHJldHVybiBudWxsOwogCiAgICAgcmV0dXJuIGxhc3RQYXRo Q29tcG9uZW50LnN1YnN0cihpbmRleCArIDEpOwogfTsKQEAgLTExOCw1ICsxMTgsMTMgQEAgV0ku ZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlID0gZnVuY3Rpb24obWltZVR5cGUpCiAgICAgfTsKIAog ICAgIGxldCBleHRlbnNpb24gPSBtaW1lVHlwZVRvRXh0ZW5zaW9uW21pbWVUeXBlXTsKLSAgICBy ZXR1cm4gZXh0ZW5zaW9uID8gYC4ke2V4dGVuc2lvbn1gIDogbnVsbDsKKyAgICBpZiAoZXh0ZW5z aW9uKQorICAgICAgICByZXR1cm4gZXh0ZW5zaW9uOworCisgICAgaWYgKG1pbWVUeXBlLmVuZHNX aXRoKCIranNvbiIpKQorICAgICAgICByZXR1cm4gImpzb24iOworICAgIGlmIChtaW1lVHlwZS5l bmRzV2l0aCgiK3htbCIpKQorICAgICAgICByZXR1cm4gInhtbCI7CisKKyAgICByZXR1cm4gbnVs bDsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9N b2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanMgYi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanMKaW5kZXggYjllNmI1NDA0NTcuLmU1 YTM0NTBkNzBjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL1NvdXJjZU1hcFJlc291cmNlLmpzCkBAIC0zNiw3ICszNiw3 IEBAIFdJLlNvdXJjZU1hcFJlc291cmNlID0gY2xhc3MgU291cmNlTWFwUmVzb3VyY2UgZXh0ZW5k cyBXSS5SZXNvdXJjZQogCiAgICAgICAgIHZhciBpbmhlcml0ZWRNSU1FVHlwZSA9IHRoaXMuX3Nv dXJjZU1hcC5vcmlnaW5hbFNvdXJjZUNvZGUgaW5zdGFuY2VvZiBXSS5SZXNvdXJjZSA/IHRoaXMu X3NvdXJjZU1hcC5vcmlnaW5hbFNvdXJjZUNvZGUuc3ludGhldGljTUlNRVR5cGUgOiBudWxsOwog Ci0gICAgICAgIHZhciBmaWxlRXh0ZW5zaW9uID0gV0kuZmlsZUV4dGVuc2lvbkZvclVSTCh1cmwp OworICAgICAgICB2YXIgZmlsZUV4dGVuc2lvbiA9IFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwodXJs KSB8fCAiIjsKICAgICAgICAgdmFyIGZpbGVFeHRlbnNpb25NSU1FVHlwZSA9IFdJLm1pbWVUeXBl Rm9yRmlsZUV4dGVuc2lvbihmaWxlRXh0ZW5zaW9uLCB0cnVlKTsKIAogICAgICAgICAvLyBGSVhN RTogVGhpcyBpcyBhIGxheWVyaW5nIHZpb2xhdGlvbi4gSXQgc2hvdWxkIHVzZSBhIGhlbHBlciBm dW5jdGlvbiBvbiB0aGUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1Rlc3QuaHRtbCBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rl c3QuaHRtbAppbmRleCA2NDFhMGU3MzU4ZS4uZDU1YTI5MGQzMmUgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbAorKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9UZXN0Lmh0bWwKQEAgLTUwLDYgKzUwLDcgQEAKICAg ICA8c2NyaXB0IHNyYz0iQmFzZS9ET01VdGlsaXRpZXMuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJCYXNlL0V2ZW50TGlzdGVuZXIuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJCYXNlL0V2ZW50TGlzdGVuZXJTZXQuanMiPjwvc2NyaXB0PgorICAgIDxzY3JpcHQgc3JjPSJC YXNlL01JTUVUeXBlVXRpbGl0aWVzLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iQmFz ZS9UZXh0VXRpbGl0aWVzLmpzIj48L3NjcmlwdD4KICAgICA8c2NyaXB0IHNyYz0iQmFzZS9VUkxV dGlsaXRpZXMuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3JjPSJCYXNlL1V0aWxpdGllcy5q cyI+PC9zY3JpcHQ+Cg== 320491 2017-09-11 15:45:40 -0700 2017-09-11 16:16:10 -0700 [PATCH] For Landing mime-v2.patch text/plain 11652 joepeck ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBjOTI4MjI0OGE4YS4uMTk3MjUzYzUzMTggMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3Rz L0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAor MjAxNy0wOS0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgorCisgICAg ICAgIFdlYiBJbnNwZWN0b3I6IENsZWFudXAgYW5kIHRlc3QgTUlNRVR5cGVVdGlsaXRpZXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjczMQorCisg ICAgICAgIFJldmlld2VkIGJ5IE1hdHQgQmFrZXIuCisKKyAgICAgICAgKiBpbnNwZWN0b3IvdW5p dC10ZXN0cy9taW1ldHlwZS11dGlsaXRpZXMtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBpbnNwZWN0b3IvdW5pdC10ZXN0cy9taW1ldHlwZS11dGlsaXRpZXMuaHRtbDogQWRkZWQuCisK IDIwMTctMDktMTEgIFphbiBEb2JlcnNlayAgPHpkb2JlcnNla0BpZ2FsaWEuY29tPgogCiAgICAg ICAgIFtFTUVdIENsZWFyS2V5OiBpbXBsZW1lbnQgQ0RNSW5zdGFuY2VDbGVhcktleSBzdGF0ZSBt b2RpZmllcnMsIGNhbGxiYWNrIGRpc3BhdGNoZXMKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2lu c3BlY3Rvci91bml0LXRlc3RzL21pbWV0eXBlLXV0aWxpdGllcy1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9taW1ldHlwZS11dGlsaXRpZXMtZXhwZWN0ZWQu dHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwLi5mNmY3N2IxYzdiZQot LS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL21pbWV0 eXBlLXV0aWxpdGllcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwyOCBAQAorCis9PSBSdW5uaW5n IHRlc3Qgc3VpdGU6IE1JTUVUeXBlVXRpbGl0aWVzCistLSBSdW5uaW5nIHRlc3QgY2FzZTogZmls ZUV4dGVuc2lvbkZvclVSTAorUEFTUzogRmlsZSBleHRlbnNpb24gZm9yIGludmFsaWQgVVJMIHNo b3VsZCBiZSBudWxsLgorUEFTUzogRmlsZSBleHRlbnNpb24gZm9yIFVSTCB3aXRob3V0IGxhc3Qg cGF0aCBjb21wb25lbnQgc2hvdWxkIGJlIG51bGwuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3Ig VVJMIHdpdGhvdXQgbGFzdCBwYXRoIGNvbXBvbmVudCBzaG91bGQgYmUgbnVsbC4KK1BBU1M6IEZp bGUgZXh0ZW5zaW9uIGZvciBVUkwgd2l0aCBsYXN0IHBhdGggY29tcG9uZW50IHdpdGhvdXQgYSBw ZXJpb2Qgc2hvdWxkIGJlIG51bGwuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgVVJMIHdpdGgg bGFzdCBwYXRoIGNvbXBvbmVudCB3aXRob3V0IGEgcGVyaW9kIHNob3VsZCBiZSBudWxsLgorUEFT UzogRmlsZSBleHRlbnNpb24gZm9yIFVSTCB3aXRoIGxhc3QgcGF0aCBjb21wb25lbnQgZW5kaW5n IGluIGEgcGVyaW9kIHNob3VsZCBiZSBudWxsLgorUEFTUzogRmlsZSBleHRlbnNpb24gZm9yICJm b28ueHl6IiBzaG91bGQgYmUgInh5eiIuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgImltYWdl LnBuZyIgc2hvdWxkIGJlICJwbmciLgorUEFTUzogRmlsZSBleHRlbnNpb24gZm9yICJpbWFnZS5w bmciIHNob3VsZCBiZSAiZ2lmIi4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciAic2NyaXB0Lmpz IiBzaG91bGQgYmUgImpzIi4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciAic2NyaXB0Lm1pbi5q cyIgc2hvdWxkIGJlICJqcyIuCisKKy0tIFJ1bm5pbmcgdGVzdCBjYXNlOiBmaWxlRXh0ZW5zaW9u Rm9yTUlNRVR5cGUKK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciBpbnZhbGlkIG1pbWUgdHlwZSBz aG91bGQgYmUgbnVsbC4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciB1bmtub3duIG1pbWUgdHlw ZSBzaG91bGQgYmUgbnVsbC4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2UvanBlZyIg c2hvdWxkIGJlICJqcGciLgorUEFTUzogRmlsZSBleHRlbnNpb24gZm9yICJpbWFnZS9wbmciIHNo b3VsZCBiZSAicG5nIi4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2UvZ2lmIiBzaG91 bGQgYmUgImdpZiIuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgInRleHQvamF2YXNjcmlwdCIg c2hvdWxkIGJlICJqcyIuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgImFwcGxpY2F0aW9uL2pz b24iIHNob3VsZCBiZSAianNvbiIuCitQQVNTOiBGaWxlIGV4dGVuc2lvbiBmb3IgImFwcGxpY2F0 aW9uL3ZuZC5hcGkranNvbiIgc2hvdWxkIGJlICJqc29uIi4KK1BBU1M6IEZpbGUgZXh0ZW5zaW9u IGZvciAiYXBwbGljYXRpb24veGh0bWwreG1sIiBzaG91bGQgYmUgInhodG1sIi4KK1BBU1M6IEZp bGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2Uvc3ZnK3htbCIgc2hvdWxkIGJlICJzdmciLgorUEFTUzog RmlsZSBleHRlbnNpb24gZm9yICJ0ZXh0L2Zvbyt4bWwiIHNob3VsZCBiZSAieG1sIi4KKwpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW5zcGVjdG9yL3VuaXQtdGVzdHMvbWltZXR5cGUtdXRpbGl0 aWVzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy9taW1ldHlwZS11dGls aXRpZXMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMC4uYzk4NjVi NWUxN2MKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0 cy9taW1ldHlwZS11dGlsaXRpZXMuaHRtbApAQCAtMCwwICsxLDU4IEBACis8IURPQ1RZUEUgaHRt bD4KKzxodG1sPgorPGhlYWQ+Cis8c2NyaXB0IHNyYz0iLi4vLi4vaHR0cC90ZXN0cy9pbnNwZWN0 b3IvcmVzb3VyY2VzL2luc3BlY3Rvci10ZXN0LmpzIj48L3NjcmlwdD4KKzxzY3JpcHQ+CitmdW5j dGlvbiB0ZXN0KCkKK3sKKyAgICBsZXQgc3VpdGUgPSBJbnNwZWN0b3JUZXN0LmNyZWF0ZVN5bmNT dWl0ZSgiTUlNRVR5cGVVdGlsaXRpZXMiKTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAg ICAgICAgbmFtZTogImZpbGVFeHRlbnNpb25Gb3JVUkwiLAorICAgICAgICB0ZXN0KCkgeworICAg ICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9yVVJM KCJpbnZhbGlkLXVybCIpLCBudWxsLCBgRmlsZSBleHRlbnNpb24gZm9yIGludmFsaWQgVVJMIHNo b3VsZCBiZSBudWxsLmApOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChX SS5maWxlRXh0ZW5zaW9uRm9yVVJMKCJodHRwczovL2V4YW1wbGUuY29tIiksIG51bGwsIGBGaWxl IGV4dGVuc2lvbiBmb3IgVVJMIHdpdGhvdXQgbGFzdCBwYXRoIGNvbXBvbmVudCBzaG91bGQgYmUg bnVsbC5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmlsZUV4 dGVuc2lvbkZvclVSTCgiaHR0cHM6Ly9leGFtcGxlLmNvbS8iKSwgbnVsbCwgYEZpbGUgZXh0ZW5z aW9uIGZvciBVUkwgd2l0aG91dCBsYXN0IHBhdGggY29tcG9uZW50IHNob3VsZCBiZSBudWxsLmAp OworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNp b25Gb3JVUkwoImh0dHBzOi8vZXhhbXBsZS5jb20vdGVzdCIpLCBudWxsLCBgRmlsZSBleHRlbnNp b24gZm9yIFVSTCB3aXRoIGxhc3QgcGF0aCBjb21wb25lbnQgd2l0aG91dCBhIHBlcmlvZCBzaG91 bGQgYmUgbnVsbC5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0ku ZmlsZUV4dGVuc2lvbkZvclVSTCgiaHR0cHM6Ly9leGFtcGxlLmNvbS9mb28uYmFyL3Rlc3QiKSwg bnVsbCwgYEZpbGUgZXh0ZW5zaW9uIGZvciBVUkwgd2l0aCBsYXN0IHBhdGggY29tcG9uZW50IHdp dGhvdXQgYSBwZXJpb2Qgc2hvdWxkIGJlIG51bGwuYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JU ZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwoImh0dHBzOi8vZXhhbXBsZS5j b20vdGVzdC4iKSwgbnVsbCwgYEZpbGUgZXh0ZW5zaW9uIGZvciBVUkwgd2l0aCBsYXN0IHBhdGgg Y29tcG9uZW50IGVuZGluZyBpbiBhIHBlcmlvZCBzaG91bGQgYmUgbnVsbC5gKTsKKworICAgICAg ICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9yVVJMKCJo dHRwczovL2V4YW1wbGUuY29tL2Zvby54eXoiKSwgInh5eiIsIGBGaWxlIGV4dGVuc2lvbiBmb3Ig ImZvby54eXoiIHNob3VsZCBiZSAieHl6Ii5gKTsKKyAgICAgICAgICAgIEluc3BlY3RvclRlc3Qu ZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvclVSTCgiaHR0cHM6Ly9leGFtcGxlLmNvbS9p bWFnZS5wbmciKSwgInBuZyIsIGBGaWxlIGV4dGVuc2lvbiBmb3IgImltYWdlLnBuZyIgc2hvdWxk IGJlICJwbmciLmApOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5m aWxlRXh0ZW5zaW9uRm9yVVJMKCJodHRwczovL2V4YW1wbGUuY29tL2ltYWdlLmdpZiIpLCAiZ2lm IiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAiaW1hZ2UucG5nIiBzaG91bGQgYmUgImdpZiIuYCk7Cisg ICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JV UkwoImh0dHBzOi8vZXhhbXBsZS5jb20vc2NyaXB0LmpzIiksICJqcyIsIGBGaWxlIGV4dGVuc2lv biBmb3IgInNjcmlwdC5qcyIgc2hvdWxkIGJlICJqcyIuYCk7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JVUkwoImh0dHBzOi8vZXhhbXBs ZS5jb20vc2NyaXB0Lm1pbi5qcyIpLCAianMiLCBgRmlsZSBleHRlbnNpb24gZm9yICJzY3JpcHQu bWluLmpzIiBzaG91bGQgYmUgImpzIi5gKTsKKworICAgICAgICAgICAgcmV0dXJuIHRydWU7Cisg ICAgICAgIH0KKyAgICB9KTsKKworICAgIHN1aXRlLmFkZFRlc3RDYXNlKHsKKyAgICAgICAgbmFt ZTogImZpbGVFeHRlbnNpb25Gb3JNSU1FVHlwZSIsCisgICAgICAgIHRlc3QoKSB7CisgICAgICAg ICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlw ZSgiaW52YWxpZC1taW1ldHlwZSIpLCBudWxsLCBgRmlsZSBleHRlbnNpb24gZm9yIGludmFsaWQg bWltZSB0eXBlIHNob3VsZCBiZSBudWxsLmApOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5l eHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9yTUlNRVR5cGUoImFwcGxpY2F0aW9uL3Vua25v d24iKSwgbnVsbCwgYEZpbGUgZXh0ZW5zaW9uIGZvciB1bmtub3duIG1pbWUgdHlwZSBzaG91bGQg YmUgbnVsbC5gKTsKKworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5m aWxlRXh0ZW5zaW9uRm9yTUlNRVR5cGUoImltYWdlL2pwZWciKSwgImpwZyIsIGBGaWxlIGV4dGVu c2lvbiBmb3IgImltYWdlL2pwZWciIHNob3VsZCBiZSAianBnIi5gKTsKKyAgICAgICAgICAgIElu c3BlY3RvclRlc3QuZXhwZWN0RXF1YWwoV0kuZmlsZUV4dGVuc2lvbkZvck1JTUVUeXBlKCJpbWFn ZS9wbmciKSwgInBuZyIsIGBGaWxlIGV4dGVuc2lvbiBmb3IgImltYWdlL3BuZyIgc2hvdWxkIGJl ICJwbmciLmApOworICAgICAgICAgICAgSW5zcGVjdG9yVGVzdC5leHBlY3RFcXVhbChXSS5maWxl RXh0ZW5zaW9uRm9yTUlNRVR5cGUoImltYWdlL2dpZiIpLCAiZ2lmIiwgYEZpbGUgZXh0ZW5zaW9u IGZvciAiaW1hZ2UvZ2lmIiBzaG91bGQgYmUgImdpZiIuYCk7CisgICAgICAgICAgICBJbnNwZWN0 b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlwZSgidGV4dC9qYXZh c2NyaXB0IiksICJqcyIsIGBGaWxlIGV4dGVuc2lvbiBmb3IgInRleHQvamF2YXNjcmlwdCIgc2hv dWxkIGJlICJqcyIuYCk7CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJ LmZpbGVFeHRlbnNpb25Gb3JNSU1FVHlwZSgiYXBwbGljYXRpb24vanNvbiIpLCAianNvbiIsIGBG aWxlIGV4dGVuc2lvbiBmb3IgImFwcGxpY2F0aW9uL2pzb24iIHNob3VsZCBiZSAianNvbiIuYCk7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25G b3JNSU1FVHlwZSgiYXBwbGljYXRpb24vdm5kLmFwaStqc29uIiksICJqc29uIiwgYEZpbGUgZXh0 ZW5zaW9uIGZvciAiYXBwbGljYXRpb24vdm5kLmFwaStqc29uIiBzaG91bGQgYmUgImpzb24iLmAp OworCisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNp b25Gb3JNSU1FVHlwZSgiYXBwbGljYXRpb24veGh0bWwreG1sIiksICJ4aHRtbCIsIGBGaWxlIGV4 dGVuc2lvbiBmb3IgImFwcGxpY2F0aW9uL3hodG1sK3htbCIgc2hvdWxkIGJlICJ4aHRtbCIuYCk7 CisgICAgICAgICAgICBJbnNwZWN0b3JUZXN0LmV4cGVjdEVxdWFsKFdJLmZpbGVFeHRlbnNpb25G b3JNSU1FVHlwZSgiaW1hZ2Uvc3ZnK3htbCIpLCAic3ZnIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAi aW1hZ2Uvc3ZnK3htbCIgc2hvdWxkIGJlICJzdmciLmApOworICAgICAgICAgICAgSW5zcGVjdG9y VGVzdC5leHBlY3RFcXVhbChXSS5maWxlRXh0ZW5zaW9uRm9yTUlNRVR5cGUoInRleHQvZm9vK3ht bCIpLCAieG1sIiwgYEZpbGUgZXh0ZW5zaW9uIGZvciAidGV4dC9mb28reG1sIiBzaG91bGQgYmUg InhtbCIuYCk7CisKKyAgICAgICAgICAgIHJldHVybiB0cnVlOworICAgICAgICB9CisgICAgfSk7 CisKKyAgICBzdWl0ZS5ydW5UZXN0Q2FzZXNBbmRGaW5pc2goKTsKK30KKzwvc2NyaXB0PgorPC9o ZWFkPgorPGJvZHkgb25Mb2FkPSJydW5UZXN0KCkiPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKaW5kZXggNzE2NDk2NzJlOWYuLmJkZTMzMzRiMDY1IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9DaGFuZ2VMb2cKQEAgLTEsNSArMSwyOSBAQAogMjAxNy0wOS0xMSAgSm9zZXBoIFBlY29y YXJvICA8cGVjb3Jhcm9AYXBwbGUuY29tPgogCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IENsZWFu dXAgYW5kIHRlc3QgTUlNRVR5cGVVdGlsaXRpZXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtp dC5vcmcvc2hvd19idWcuY2dpP2lkPTE3NjczMQorCisgICAgICAgIFJldmlld2VkIGJ5IE1hdHQg QmFrZXIuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxpdGllcy5qczoK KyAgICAgICAgKFdJLnNhdmVEYXRhVG9GaWxlKToKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL01v ZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qczoKKyAgICAgICAgKFdJLlNvdXJjZU1hcFJlc291cmNl KToKKyAgICAgICAgVXBkYXRlIGNhbGxlcnMgdG8gaGFuZGxlIG5ldyByZXR1cm4gdmFsdWVzLgor CisgICAgICAgICogVXNlckludGVyZmFjZS9CYXNlL01JTUVUeXBlVXRpbGl0aWVzLmpzOgorICAg ICAgICAoV0kuZmlsZUV4dGVuc2lvbkZvclVSTCk6CisgICAgICAgIFJldHVybiBudWxsIGluIGVy cm9yIGNhc2VzLgorICAgICAgICBPbmx5IHByb3ZpZGUgdGhlIGNvbnRlbnQgYWZ0ZXIgdGhlIGxh c3QgcGVyaW9kLgorCisgICAgICAgIChXSS5maWxlRXh0ZW5zaW9uRm9yTUlNRVR5cGUpOgorICAg ICAgICBIYW5kbGUgZ2VuZXJpYyAiK2pzb24iIGFuZCAiK3htbCIgY2FzZXMuCisKKyAgICAgICAg KiBVc2VySW50ZXJmYWNlL1Rlc3QuaHRtbDoKKyAgICAgICAgSW5jbHVkZSBNSU1FVHlwZVV0aWxp dGllcyBmb3IgdGVzdGluZy4KKworMjAxNy0wOS0xMSAgSm9zZXBoIFBlY29yYXJvICA8cGVjb3Jh cm9AYXBwbGUuY29tPgorCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IE1ha2UgRGFzaGJvYXJkIFRp bWVsaW5lIGljb24gYW5kIFRpbWVsaW5lIHRhYiBpY29uIG1vcmUgc2ltaWxhcgogICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc2NTgyCiAKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxpdGll cy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxp dGllcy5qcwppbmRleCA4ODNmZGVmMDllMi4uM2YwNTU3Y2NkMTEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvRmlsZVV0aWxpdGllcy5qcworKysg Yi9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9CYXNlL0ZpbGVVdGlsaXRpZXMu anMKQEAgLTQzLDggKzQzLDExIEBAIFdJLnNhdmVEYXRhVG9GaWxlID0gZnVuY3Rpb24oc2F2ZURh dGEsIGZvcmNlU2F2ZUFzKQogICAgIGlmICghc3VnZ2VzdGVkTmFtZSkgewogICAgICAgICBzdWdn ZXN0ZWROYW1lID0gV0kuVUlTdHJpbmcoIlVudGl0bGVkIik7CiAgICAgICAgIGxldCBkYXRhVVJM VHlwZU1hdGNoID0gL15kYXRhOihbXjtdKykvLmV4ZWModXJsKTsKLSAgICAgICAgaWYgKGRhdGFV UkxUeXBlTWF0Y2gpCi0gICAgICAgICAgICBzdWdnZXN0ZWROYW1lICs9IFdJLmZpbGVFeHRlbnNp b25Gb3JNSU1FVHlwZShkYXRhVVJMVHlwZU1hdGNoWzFdKSB8fCAiIjsKKyAgICAgICAgaWYgKGRh dGFVUkxUeXBlTWF0Y2gpIHsKKyAgICAgICAgICAgIGxldCBmaWxlRXh0ZW5zaW9uID0gV0kuZmls ZUV4dGVuc2lvbkZvck1JTUVUeXBlKGRhdGFVUkxUeXBlTWF0Y2hbMV0pOworICAgICAgICAgICAg aWYgKGZpbGVFeHRlbnNpb24pCisgICAgICAgICAgICAgICAgc3VnZ2VzdGVkTmFtZSArPSAiLiIg KyBmaWxlRXh0ZW5zaW9uOworICAgICAgICB9CiAgICAgfQogCiAgICAgaWYgKHR5cGVvZiBzYXZl RGF0YS5jb250ZW50ID09PSAic3RyaW5nIikgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQmFzZS9NSU1FVHlwZVV0aWxpdGllcy5qcyBiL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTUlNRVR5cGVVdGlsaXRpZXMuanMKaW5k ZXggOThmM2Y0ZmUyYmEuLjExODRlZmY0OTExIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvVXNlckludGVyZmFjZS9CYXNlL01JTUVUeXBlVXRpbGl0aWVzLmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL0Jhc2UvTUlNRVR5cGVVdGlsaXRpZXMuanMK QEAgLTI1LDEzICsyNSwxNiBAQAogCiBXSS5maWxlRXh0ZW5zaW9uRm9yVVJMID0gZnVuY3Rpb24o dXJsKQogewotICAgIHZhciBsYXN0UGF0aENvbXBvbmVudCA9IHBhcnNlVVJMKHVybCkubGFzdFBh dGhDb21wb25lbnQ7CisgICAgbGV0IGxhc3RQYXRoQ29tcG9uZW50ID0gcGFyc2VVUkwodXJsKS5s YXN0UGF0aENvbXBvbmVudDsKICAgICBpZiAoIWxhc3RQYXRoQ29tcG9uZW50KQotICAgICAgICBy ZXR1cm4gIiI7CisgICAgICAgIHJldHVybiBudWxsOwogCi0gICAgdmFyIGluZGV4ID0gbGFzdFBh dGhDb21wb25lbnQuaW5kZXhPZigiLiIpOworICAgIGxldCBpbmRleCA9IGxhc3RQYXRoQ29tcG9u ZW50Lmxhc3RJbmRleE9mKCIuIik7CiAgICAgaWYgKGluZGV4ID09PSAtMSkKLSAgICAgICAgcmV0 dXJuICIiOworICAgICAgICByZXR1cm4gbnVsbDsKKworICAgIGlmIChpbmRleCA9PT0gbGFzdFBh dGhDb21wb25lbnQubGVuZ3RoIC0gMSkKKyAgICAgICAgcmV0dXJuIG51bGw7CiAKICAgICByZXR1 cm4gbGFzdFBhdGhDb21wb25lbnQuc3Vic3RyKGluZGV4ICsgMSk7CiB9OwpAQCAtMTE4LDUgKzEy MSwxMyBAQCBXSS5maWxlRXh0ZW5zaW9uRm9yTUlNRVR5cGUgPSBmdW5jdGlvbihtaW1lVHlwZSkK ICAgICB9OwogCiAgICAgbGV0IGV4dGVuc2lvbiA9IG1pbWVUeXBlVG9FeHRlbnNpb25bbWltZVR5 cGVdOwotICAgIHJldHVybiBleHRlbnNpb24gPyBgLiR7ZXh0ZW5zaW9ufWAgOiBudWxsOworICAg IGlmIChleHRlbnNpb24pCisgICAgICAgIHJldHVybiBleHRlbnNpb247CisKKyAgICBpZiAobWlt ZVR5cGUuZW5kc1dpdGgoIitqc29uIikpCisgICAgICAgIHJldHVybiAianNvbiI7CisgICAgaWYg KG1pbWVUeXBlLmVuZHNXaXRoKCIreG1sIikpCisgICAgICAgIHJldHVybiAieG1sIjsKKworICAg IHJldHVybiBudWxsOwogfTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2Vy SW50ZXJmYWNlL01vZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qcwppbmRleCBiOWU2 YjU0MDQ1Ny4uZTVhMzQ1MGQ3MGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL01vZGVscy9Tb3VyY2VNYXBSZXNvdXJjZS5qcworKysgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9Nb2RlbHMvU291cmNlTWFwUmVzb3VyY2UuanMKQEAg LTM2LDcgKzM2LDcgQEAgV0kuU291cmNlTWFwUmVzb3VyY2UgPSBjbGFzcyBTb3VyY2VNYXBSZXNv dXJjZSBleHRlbmRzIFdJLlJlc291cmNlCiAKICAgICAgICAgdmFyIGluaGVyaXRlZE1JTUVUeXBl ID0gdGhpcy5fc291cmNlTWFwLm9yaWdpbmFsU291cmNlQ29kZSBpbnN0YW5jZW9mIFdJLlJlc291 cmNlID8gdGhpcy5fc291cmNlTWFwLm9yaWdpbmFsU291cmNlQ29kZS5zeW50aGV0aWNNSU1FVHlw ZSA6IG51bGw7CiAKLSAgICAgICAgdmFyIGZpbGVFeHRlbnNpb24gPSBXSS5maWxlRXh0ZW5zaW9u Rm9yVVJMKHVybCk7CisgICAgICAgIHZhciBmaWxlRXh0ZW5zaW9uID0gV0kuZmlsZUV4dGVuc2lv bkZvclVSTCh1cmwpIHx8ICIiOwogICAgICAgICB2YXIgZmlsZUV4dGVuc2lvbk1JTUVUeXBlID0g V0kubWltZVR5cGVGb3JGaWxlRXh0ZW5zaW9uKGZpbGVFeHRlbnNpb24sIHRydWUpOwogCiAgICAg ICAgIC8vIEZJWE1FOiBUaGlzIGlzIGEgbGF5ZXJpbmcgdmlvbGF0aW9uLiBJdCBzaG91bGQgdXNl IGEgaGVscGVyIGZ1bmN0aW9uIG9uIHRoZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sIGIvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJ bnRlcmZhY2UvVGVzdC5odG1sCmluZGV4IDY0MWEwZTczNThlLi5kNTVhMjkwZDMyZSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvVGVzdC5odG1sCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Rlc3QuaHRtbApAQCAtNTAsNiAr NTAsNyBAQAogICAgIDxzY3JpcHQgc3JjPSJCYXNlL0RPTVV0aWxpdGllcy5qcyI+PC9zY3JpcHQ+ CiAgICAgPHNjcmlwdCBzcmM9IkJhc2UvRXZlbnRMaXN0ZW5lci5qcyI+PC9zY3JpcHQ+CiAgICAg PHNjcmlwdCBzcmM9IkJhc2UvRXZlbnRMaXN0ZW5lclNldC5qcyI+PC9zY3JpcHQ+CisgICAgPHNj cmlwdCBzcmM9IkJhc2UvTUlNRVR5cGVVdGlsaXRpZXMuanMiPjwvc2NyaXB0PgogICAgIDxzY3Jp cHQgc3JjPSJCYXNlL1RleHRVdGlsaXRpZXMuanMiPjwvc2NyaXB0PgogICAgIDxzY3JpcHQgc3Jj PSJCYXNlL1VSTFV0aWxpdGllcy5qcyI+PC9zY3JpcHQ+CiAgICAgPHNjcmlwdCBzcmM9IkJhc2Uv VXRpbGl0aWVzLmpzIj48L3NjcmlwdD4K