184766 2018-04-18 18:30:27 -0700 Tool scripts should not use PrivilegedAPI from 'public/v3/privileged-api.js'. 2018-04-24 20:56:18 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 184419 1 dewei_zhu webkit-unassigned dewei_zhu rniwa webkit-bug-importer oldest_to_newest 1415819 0 dewei_zhu 2018-04-18 18:30:27 -0700 Tool scripts should not use PrivilegedAPI from 'public/v3/privileged-api.js'. 1415822 1 338293 dewei_zhu 2018-04-18 18:39:34 -0700 Created attachment 338293 Patch 1415844 2 338293 rniwa 2018-04-18 20:44:35 -0700 Comment on attachment 338293 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338293&action=review > Websites/perf.webkit.org/server-tests/api-upload-root-tests.js:12 > +global.PrivilegedAPI = require('../public/v3/privileged-api.js').PrivilegedAPI; This should probably be done in TestServer.inject so that when all these tests are ran at the same time, we use the correct version of PrivilegedAPI instead of whichever loaded last. 1416179 3 338395 dewei_zhu 2018-04-19 22:30:26 -0700 Created attachment 338395 Patch 1416341 4 338444 dewei_zhu 2018-04-20 11:41:14 -0700 Created attachment 338444 Patch 1416531 5 338444 rniwa 2018-04-20 16:57:06 -0700 Comment on attachment 338444 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=338444&action=review > Websites/perf.webkit.org/tools/js/privileged-api.js:8 > + for (let key in data) Use const. > Websites/perf.webkit.org/unit-tests/resources/mock-remote-api.js:63 > + inject: function (urlPrefix, useNodePrivilegedAPI) We should make inject either make a dictionary or the second argument should be a string specifying the type of PrivilegedAPI we use; e.g. 'browser' (default) / 'node'. > Websites/perf.webkit.org/unit-tests/resources/mock-remote-api.js:67 > + const hookPrivilegedAPI = useNodePrivilegedAPI ? NodePrivilegedAPI: BrowserPrivilegedAPI; Use call this PrivilegedAPI. 1417417 6 rniwa 2018-04-24 20:55:16 -0700 https://trac.webkit.org/changeset/230960 1417418 7 webkit-bug-importer 2018-04-24 20:56:18 -0700 <rdar://problem/39709519> 338293 2018-04-18 18:39:34 -0700 2018-04-19 22:30:25 -0700 Patch bug-184766-20180418183933.patch text/plain 9222 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwNzkwCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBkZTJiYjliMDRmMWY5NzFjN2RjNTVmZmRjYjRiNTg2NTIyMjE1Yzg2Li5mMGQwNzg0NTIx ZjhjMTM5OGNmZmQ3NmQ3YTVhOWIyODE1MGY5ODM1IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNiBAQAorMjAxOC0wNC0xOCAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KKworICAgICAgICBUb29sIHNjcmlwdHMgc2hvdWxkIG5vdCB1c2UgUHJpdmls ZWdlZEFQSSBmcm9tICdwdWJsaWMvdjMvcHJpdmlsZWdlZC1hcGkuanMnLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NzY2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlZCBQcml2aWxlZGdlQVBJ IGltcG9ydCBmcm9tICd0b29scy9qcy92My1tb2RlbHMuanMnLgorICAgICAgICBNYW51YWxseSBp bXBvcnQgUHJpdmlsZWRnZWRBUEkgZm9yIGV4aXN0aW5nIHRlc3RzIHRoYXQgc3BlY2lmaWNhbGx5 IG5lZWQgaXQuCisgICAgICAgIEZvciB0b29scywgd2Ugc2hvdWxkIG5vdCB1c2UgUHJpdmlsZWRn ZWRBUEkgZm9yIHRvb2xzIGFzIGN1cnJlbnQgUHJpdmlsZWRnZWRBUEkKKyAgICAgICAgaXMgdXNl ZCBieSBVSSBhbmQgaXQgaXMgdW5uZWNlc3NhcnkgdG8gZ2VuZXJhdGUgQ1NSRiB0b2tlbiBmb3Ig dG9vbHMuCisgICAgICAgIFdpbGwgcG9zdCBhIGZvbGxvd3VwIHBhdGNoIHRoYXQgY3JlYXRlcyBh IFByaXZpbGVkZ2VkQVBJIHVzZWQgYnkgdG9vbHMuCisKKyAgICAgICAgKiBzZXJ2ZXItdGVzdHMv YXBpLXVwbG9hZC1yb290LXRlc3RzLmpzOiBGaXggdGVzdHMuCisgICAgICAgICogc2VydmVyLXRl c3RzL2FwaS11cGxvYWRlZC1maWxlLXRlc3RzLmpzOiBGaXggdGVzdHMuCisgICAgICAgICogc2Vy dmVyLXRlc3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS1hbmFseXNpcy10YXNrLXRlc3RzLmpzOiBG aXggdGVzdHMuCisgICAgICAgICogc2VydmVyLXRlc3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS10 ZXN0LWdyb3VwLXRlc3RzLmpzOiBGaXggdGVzdHMuCisgICAgICAgICogc2VydmVyLXRlc3RzL3By aXZpbGVnZWQtYXBpLXVwYXRlLXJ1bi1zdGF0dXMuanM6IEZpeCB0ZXN0cy4KKyAgICAgICAgKiBz ZXJ2ZXItdGVzdHMvcHJpdmlsZWdlZC1hcGktdXBsb2FkLWZpbGUtdGVzdHMuanM6IEZpeCB0ZXN0 cy4KKyAgICAgICAgKiBzZXJ2ZXItdGVzdHMvdG9vbHMtc3luYy1idWlsZGJvdC1pbnRlZ3JhdGlv bi10ZXN0cy5qczogRml4IHRlc3RzLgorICAgICAgICAqIHRvb2xzL2pzL3YzLW1vZGVscy5qczog UmVtb3ZlIHRoZSBpbXBvcnQgb2YgUHJpdmlsZWRnZWRBUEkuCisgICAgICAgICogdW5pdC10ZXN0 cy9wcml2aWxlZ2VkLWFwaS10ZXN0cy5qczogRml4IHRlc3RzLgorCiAyMDE4LTA0LTE2ICBEZXdl aSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgogCiAgICAgICAgIENvbW1pdCBvcmRlciBzaG91 bGQgYWx3YXlzIGJlIHJldHVybmVkIGJ5IGFwaS4KZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLXVwbG9hZC1yb290LXRlc3RzLmpzIGIvV2Vic2l0 ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktdXBsb2FkLXJvb3QtdGVzdHMuanMK aW5kZXggYWI4MzQwZWJjYzFhOWVmM2RjMTQ2ZmVlNTIyMjcxMmQ2YTBkZTg2YS4uZTlmYTQ2MmQy NWUwMTI3NWJmOTEwMzRlNmRjY2ExZDY1ZmNmMGM0NCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVy Zi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktdXBsb2FkLXJvb3QtdGVzdHMuanMKKysrIGIv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktdXBsb2FkLXJvb3QtdGVz dHMuanMKQEAgLTksNiArOSw3IEBAIGNvbnN0IFRlc3RTZXJ2ZXIgPSByZXF1aXJlKCcuL3Jlc291 cmNlcy90ZXN0LXNlcnZlci5qcycpOwogY29uc3QgVGVtcG9yYXJ5RmlsZSA9IHJlcXVpcmUoJy4v cmVzb3VyY2VzL3RlbXBvcmFyeS1maWxlLmpzJykuVGVtcG9yYXJ5RmlsZTsKIGNvbnN0IGFkZFNs YXZlRm9yUmVwb3J0ID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMn KS5hZGRTbGF2ZUZvclJlcG9ydDsKIGNvbnN0IHByZXBhcmVTZXJ2ZXJUZXN0ID0gcmVxdWlyZSgn Li9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMnKS5wcmVwYXJlU2VydmVyVGVzdDsKK2ds b2JhbC5Qcml2aWxlZ2VkQVBJID0gcmVxdWlyZSgnLi4vcHVibGljL3YzL3ByaXZpbGVnZWQtYXBp LmpzJykuUHJpdmlsZWdlZEFQSTsKIAogZnVuY3Rpb24gbWFrZVJlcG9ydChyb290RmlsZSwgYnVp bGRSZXF1ZXN0SWQgPSAxLCByZXBvc2l0b3J5TGlzdCA9IFsnV2ViS2l0J10sIGJ1aWxkVGltZSA9 ICcyMDE3LTA1LTEwVDAyOjU0OjA4LjY2NicpCiB7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2FwaS11cGxvYWRlZC1maWxlLXRlc3RzLmpzIGIvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktdXBsb2FkZWQtZmlsZS10ZXN0 cy5qcwppbmRleCBiZWRjNTQ3N2Q1NWE0Yzc0N2IyMWQ3MDk0ODU1MmUzNTdmNDYyYTk0Li44MjUy NTQ2MTNkMTc1Y2RlYTA3N2Y3NGI3ZDc3Njc3YzcwMjMzMWEzIDEwMDY0NAotLS0gYS9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL2FwaS11cGxvYWRlZC1maWxlLXRlc3RzLmpz CisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLXVwbG9hZGVk LWZpbGUtdGVzdHMuanMKQEAgLTQsNiArNCw3IEBAIHJlcXVpcmUoJy4uL3Rvb2xzL2pzL3YzLW1v ZGVscy5qcycpOwogCiBjb25zdCBhc3NlcnQgPSByZXF1aXJlKCdhc3NlcnQnKTsKIGdsb2JhbC5G b3JtRGF0YSA9IHJlcXVpcmUoJ2Zvcm0tZGF0YScpOworZ2xvYmFsLlByaXZpbGVnZWRBUEkgPSBy ZXF1aXJlKCcuLi9wdWJsaWMvdjMvcHJpdmlsZWdlZC1hcGkuanMnKS5Qcml2aWxlZ2VkQVBJOwog CiBjb25zdCBUZXN0U2VydmVyID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvdGVzdC1zZXJ2ZXIuanMn KTsKIGNvbnN0IFRlbXBvcmFyeUZpbGUgPSByZXF1aXJlKCcuL3Jlc291cmNlcy90ZW1wb3Jhcnkt ZmlsZS5qcycpLlRlbXBvcmFyeUZpbGU7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvc2VydmVyLXRlc3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS1hbmFseXNpcy10YXNrLXRl c3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9wcml2aWxlZ2Vk LWFwaS1jcmVhdGUtYW5hbHlzaXMtdGFzay10ZXN0cy5qcwppbmRleCBlYjYwZDdiM2E5NzgxZmI5 YTI3MTNmODMwZGIxODVhMjdkMjljZDUyLi40OWViNWJhYzQzZWRlZjE3ZTY5YmY2MDA2ODUzMGJj ZDZkYTk4MjZlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRl c3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS1hbmFseXNpcy10YXNrLXRlc3RzLmpzCisrKyBiL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcHJpdmlsZWdlZC1hcGktY3JlYXRl LWFuYWx5c2lzLXRhc2stdGVzdHMuanMKQEAgLTYsNiArNiw3IEBAIGxldCBNb2NrRGF0YSA9IHJl cXVpcmUoJy4vcmVzb3VyY2VzL21vY2stZGF0YS5qcycpOwogbGV0IFRlc3RTZXJ2ZXIgPSByZXF1 aXJlKCcuL3Jlc291cmNlcy90ZXN0LXNlcnZlci5qcycpOwogY29uc3QgYWRkQnVpbGRlckZvclJl cG9ydCA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL2NvbW1vbi1vcGVyYXRpb25zLmpzJykuYWRkQnVp bGRlckZvclJlcG9ydDsKIGNvbnN0IHByZXBhcmVTZXJ2ZXJUZXN0ID0gcmVxdWlyZSgnLi9yZXNv dXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMnKS5wcmVwYXJlU2VydmVyVGVzdDsKK2NvbnN0IFBy aXZpbGVnZWRBUEkgPSByZXF1aXJlKCcuLi9wdWJsaWMvdjMvcHJpdmlsZWdlZC1hcGkuanMnKS5Q cml2aWxlZ2VkQVBJOwogCiBjb25zdCByZXBvcnRXaXRoUmV2aXNpb24gPSBbewogICAgICJidWls ZE51bWJlciI6ICIxMjQiLApkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Nl cnZlci10ZXN0cy9wcml2aWxlZ2VkLWFwaS1jcmVhdGUtdGVzdC1ncm91cC10ZXN0cy5qcyBiL1dl YnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcHJpdmlsZWdlZC1hcGktY3JlYXRl LXRlc3QtZ3JvdXAtdGVzdHMuanMKaW5kZXggMmYzYjI5NzY4YTYyNmQ0ZTE2YWZlOTMzZWQ4MjE5 NWZmY2M3ODA5YS4uMmYyMTc0MWY1ODM0MmZjOTk4NTc5MjAzN2FjZTU2ZjI0ZDFhMmI3MiAxMDA2 NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9wcml2aWxlZ2Vk LWFwaS1jcmVhdGUtdGVzdC1ncm91cC10ZXN0cy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndlYmtp dC5vcmcvc2VydmVyLXRlc3RzL3ByaXZpbGVnZWQtYXBpLWNyZWF0ZS10ZXN0LWdyb3VwLXRlc3Rz LmpzCkBAIC03LDYgKzcsNyBAQCBjb25zdCBUZXN0U2VydmVyID0gcmVxdWlyZSgnLi9yZXNvdXJj ZXMvdGVzdC1zZXJ2ZXIuanMnKTsKIGNvbnN0IFRlbXBvcmFyeUZpbGUgPSByZXF1aXJlKCcuL3Jl c291cmNlcy90ZW1wb3JhcnktZmlsZS5qcycpLlRlbXBvcmFyeUZpbGU7CiBjb25zdCBhZGRTbGF2 ZUZvclJlcG9ydCA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL2NvbW1vbi1vcGVyYXRpb25zLmpzJyku YWRkU2xhdmVGb3JSZXBvcnQ7CiBjb25zdCBwcmVwYXJlU2VydmVyVGVzdCA9IHJlcXVpcmUoJy4v cmVzb3VyY2VzL2NvbW1vbi1vcGVyYXRpb25zLmpzJykucHJlcGFyZVNlcnZlclRlc3Q7Citjb25z dCBQcml2aWxlZ2VkQVBJID0gcmVxdWlyZSgnLi4vcHVibGljL3YzL3ByaXZpbGVnZWQtYXBpLmpz JykuUHJpdmlsZWdlZEFQSTsKIAogZnVuY3Rpb24gY3JlYXRlQW5hbHlzaXNUYXNrKG5hbWUsIHdl YmtpdFJldmlzaW9ucyA9IFsiMTkxNjIyIiwgIjE5MTYyMyJdKQogewpkaWZmIC0tZ2l0IGEvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9wcml2aWxlZ2VkLWFwaS11cGF0ZS1y dW4tc3RhdHVzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9wcml2 aWxlZ2VkLWFwaS11cGF0ZS1ydW4tc3RhdHVzLmpzCmluZGV4IDY5OGE2MGIzNjM0MGE0MGFlZDZj ZWMwYTVjMzFhMGI0OWQ2Njk4ZTkuLmY2MmNhYzcxNDdkNDJiOGZkNzljYmIyYjA5ZGE0OTgwNmEz NzY4YzQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMv cHJpdmlsZWdlZC1hcGktdXBhdGUtcnVuLXN0YXR1cy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvc2VydmVyLXRlc3RzL3ByaXZpbGVnZWQtYXBpLXVwYXRlLXJ1bi1zdGF0dXMuanMK QEAgLTcsNiArNyw3IEBAIGNvbnN0IGFzc2VydCA9IHJlcXVpcmUoJ2Fzc2VydCcpOwogY29uc3Qg VGVzdFNlcnZlciA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL3Rlc3Qtc2VydmVyLmpzJyk7CiBjb25z dCBhZGRCdWlsZGVyRm9yUmVwb3J0ID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvY29tbW9uLW9wZXJh dGlvbnMuanMnKS5hZGRCdWlsZGVyRm9yUmVwb3J0OwogY29uc3QgcHJlcGFyZVNlcnZlclRlc3Qg PSByZXF1aXJlKCcuL3Jlc291cmNlcy9jb21tb24tb3BlcmF0aW9ucy5qcycpLnByZXBhcmVTZXJ2 ZXJUZXN0OworY29uc3QgUHJpdmlsZWdlZEFQSSA9IHJlcXVpcmUoJy4uL3B1YmxpYy92My9wcml2 aWxlZ2VkLWFwaS5qcycpLlByaXZpbGVnZWRBUEk7CiAKIGRlc2NyaWJlKCIvcHJpdmlsZWdlZC1h cGkvdXBkYXRlLXJ1bi1zdGF0dXMiLCBmdW5jdGlvbiAoKSB7CiAgICAgcHJlcGFyZVNlcnZlclRl c3QodGhpcyk7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRl c3RzL3ByaXZpbGVnZWQtYXBpLXVwbG9hZC1maWxlLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3NlcnZlci10ZXN0cy9wcml2aWxlZ2VkLWFwaS11cGxvYWQtZmlsZS10ZXN0cy5q cwppbmRleCAxYjkwMmZhZDYxZmYxMGNmYWJmNGMyMTdhYmQ4MDZkZDUzMjc5MTIxLi4wZmNlNjYw MjRhNGRjYmM4ZTYzOGM3YTk4OGE3MTdjZmFmZWJjYzY5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3ByaXZpbGVnZWQtYXBpLXVwbG9hZC1maWxlLXRl c3RzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcHJpdmls ZWdlZC1hcGktdXBsb2FkLWZpbGUtdGVzdHMuanMKQEAgLTksNiArOSw3IEBAIGNvbnN0IE1vY2tE YXRhID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvbW9jay1kYXRhLmpzJyk7CiBjb25zdCBUZXN0U2Vy dmVyID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvdGVzdC1zZXJ2ZXIuanMnKTsKIGNvbnN0IFRlbXBv cmFyeUZpbGUgPSByZXF1aXJlKCcuL3Jlc291cmNlcy90ZW1wb3JhcnktZmlsZS5qcycpLlRlbXBv cmFyeUZpbGU7CiBjb25zdCBwcmVwYXJlU2VydmVyVGVzdCA9IHJlcXVpcmUoJy4vcmVzb3VyY2Vz L2NvbW1vbi1vcGVyYXRpb25zLmpzJykucHJlcGFyZVNlcnZlclRlc3Q7Citjb25zdCBQcml2aWxl Z2VkQVBJID0gcmVxdWlyZSgnLi4vcHVibGljL3YzL3ByaXZpbGVnZWQtYXBpLmpzJykuUHJpdmls ZWdlZEFQSTsKIAogZGVzY3JpYmUoJy9wcml2aWxlZ2VkLWFwaS91cGxvYWQtZmlsZScsIGZ1bmN0 aW9uICgpIHsKICAgICBwcmVwYXJlU2VydmVyVGVzdCh0aGlzKTsKZGlmZiAtLWdpdCBhL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvdG9vbHMtc3luYy1idWlsZGJvdC1pbnRl Z3JhdGlvbi10ZXN0cy5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMv dG9vbHMtc3luYy1idWlsZGJvdC1pbnRlZ3JhdGlvbi10ZXN0cy5qcwppbmRleCA2YmUyYzgwYmVk MWJjZGQyMjU3OTA2M2YyNjllYzY5MzZjYzZlMmFkLi4zNDE3NDMyMDU5YTA1MDFlOTIxMjVlNDVj NTEyMjU5NTZiNzQ5MTMzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2Vy dmVyLXRlc3RzL3Rvb2xzLXN5bmMtYnVpbGRib3QtaW50ZWdyYXRpb24tdGVzdHMuanMKKysrIGIv V2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy90b29scy1zeW5jLWJ1aWxkYm90 LWludGVncmF0aW9uLXRlc3RzLmpzCkBAIC0xMiw2ICsxMiw3IEBAIGNvbnN0IFRlc3RTZXJ2ZXIg PSByZXF1aXJlKCcuL3Jlc291cmNlcy90ZXN0LXNlcnZlci5qcycpOwogY29uc3QgVGVtcG9yYXJ5 RmlsZSA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL3RlbXBvcmFyeS1maWxlLmpzJykuVGVtcG9yYXJ5 RmlsZTsKIGNvbnN0IGFkZFNsYXZlRm9yUmVwb3J0ID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvY29t bW9uLW9wZXJhdGlvbnMuanMnKS5hZGRTbGF2ZUZvclJlcG9ydDsKIGNvbnN0IHByZXBhcmVTZXJ2 ZXJUZXN0ID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMnKS5wcmVw YXJlU2VydmVyVGVzdDsKK2dsb2JhbC5Qcml2aWxlZ2VkQVBJID0gcmVxdWlyZSgnLi4vcHVibGlj L3YzL3ByaXZpbGVnZWQtYXBpLmpzJykuUHJpdmlsZWdlZEFQSTsKIAogY29uc3QgY29uZmlnV2l0 aE9uZVRlc3RlclR3b0J1aWxkZXJzID0gewogICAgIHRyaWdnZXJhYmxlTmFtZTogJ2J1aWxkLXdl YmtpdCcsCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvdjMt bW9kZWxzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL3YzLW1vZGVscy5q cwppbmRleCBkMGVmZTdjMGQ1MjA0NTg5ZDdiN2RmNjBkMWJjZjcxM2RiNTRhYTZjLi5iMmVkZWI2 MDVkZmRkN2M4YzZlM2E3MGNhNzMwM2ZjOWM5MTk2YTMyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvdjMtbW9kZWxzLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy90b29scy9qcy92My1tb2RlbHMuanMKQEAgLTM0LDcgKzM0LDYgQEAgaW1wb3J0 RnJvbVYzKCdtb2RlbHMvdHJpZ2dlcmFibGUuanMnLCAnVHJpZ2dlcmFibGUnKTsKIGltcG9ydEZy b21WMygnbW9kZWxzL3RyaWdnZXJhYmxlLmpzJywgJ1RyaWdnZXJhYmxlUmVwb3NpdG9yeUdyb3Vw Jyk7CiBpbXBvcnRGcm9tVjMoJ21vZGVscy91cGxvYWRlZC1maWxlLmpzJywgJ1VwbG9hZGVkRmls ZScpOwogCi1pbXBvcnRGcm9tVjMoJ3ByaXZpbGVnZWQtYXBpLmpzJywgJ1ByaXZpbGVnZWRBUEkn KTsKIGltcG9ydEZyb21WMygnaW5zdHJ1bWVudGF0aW9uLmpzJywgJ0luc3RydW1lbnRhdGlvbicp OwogaW1wb3J0RnJvbVYzKCdsYXppbHktZXZhbHVhdGVkLWZ1bmN0aW9uLmpzJywgJ0xhemlseUV2 YWx1YXRlZEZ1bmN0aW9uJyk7CiAKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9y Zy91bml0LXRlc3RzL3ByaXZpbGVnZWQtYXBpLXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3VuaXQtdGVzdHMvcHJpdmlsZWdlZC1hcGktdGVzdHMuanMKaW5kZXggNTA5NWU1OTU5 NDFkYzY1N2VhYjU5MTIxOTM0YjAxYjEyMGE1YjMxNC4uYTA0MzIwMTJhYjZhNTJkZjc4MTM1NjI3 OTI1YWVmNjgzYmI4ZTQ4ZiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Vu aXQtdGVzdHMvcHJpdmlsZWdlZC1hcGktdGVzdHMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJr aXQub3JnL3VuaXQtdGVzdHMvcHJpdmlsZWdlZC1hcGktdGVzdHMuanMKQEAgLTMsNiArMyw3IEBA CiBjb25zdCBhc3NlcnQgPSByZXF1aXJlKCdhc3NlcnQnKTsKIAogY29uc3QgTW9ja1JlbW90ZUFQ SSA9IHJlcXVpcmUoJy4vcmVzb3VyY2VzL21vY2stcmVtb3RlLWFwaS5qcycpLk1vY2tSZW1vdGVB UEk7Citjb25zdCBQcml2aWxlZ2VkQVBJID0gcmVxdWlyZSgnLi4vcHVibGljL3YzL3ByaXZpbGVn ZWQtYXBpLmpzJykuUHJpdmlsZWdlZEFQSTsKIHJlcXVpcmUoJy4uL3Rvb2xzL2pzL3YzLW1vZGVs cy5qcycpOwogCiBkZXNjcmliZSgnUHJpdmlsZWdlZEFQSScsICgpID0+IHsK 338395 2018-04-19 22:30:26 -0700 2018-04-20 11:41:12 -0700 Patch bug-184766-20180419223025.patch text/plain 9330 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwODI5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBmM2VkY2ZiYjllMzliMjU0ZTgyNDBiZDNhZGFiMGYxNGNkODFlOWUwLi42NWU0M2E4YzUz M2I2ZjRlYzIyYmRiMTU2MTBkOTc0ZGYwNjg2ZTEwIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzMSBAQAogMjAxOC0wNC0xOSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KIAorICAgICAgICBUb29sIHNjcmlwdHMgc2hvdWxkIG5vdCB1c2UgUHJpdmls ZWdlZEFQSSBmcm9tICdwdWJsaWMvdjMvcHJpdmlsZWdlZC1hcGkuanMnLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NzY2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIHRvb2xzLCB3ZSBzaG91bGQg bm90IHVzZSBQcml2aWxlZGdlZEFQSSBmb3IgdG9vbHMgYXMgY3VycmVudCBQcml2aWxlZGdlZEFQ SQorICAgICAgICBpcyB1c2VkIGJ5IFVJIGFuZCBpdCBpcyB1bm5lY2Vzc2FyeSB0byBnZW5lcmF0 ZSBDU1JGIHRva2VuIGZvciB0b29scy4KKyAgICAgICAgV2lsbCBwb3N0IGEgZm9sbG93dXAgcGF0 Y2ggdGhhdCBjcmVhdGVzIGEgUHJpdmlsZWRnZWRBUEkgdXNlZCBieSB0b29scy4KKyAgICAgICAg TWFrZSBhIGNoYW5nZSBvbiBUZXN0U2VydmVyLmluamVjdCBhbmQgTW9ja1JlbW90ZUFQSS5pbmpl Y3QgdG8gYWxsb3cgc3BlY2lmeWluZworICAgICAgICBCcm93c2VyUHJpdmlsZWRnZWRBUEkgb3Ig Tm9kZVByaXZpbGVkZ2VBUEkgaW4gdGhlIHRlc3QuIEN1cnJlbnRseSBkZWZhdWx0cyB0bworICAg ICAgICBCcm93c2VyUHJpdmlsZWRnZWRBUEkgYXMgdGhpcyBpcyB0aGUgdGVzdCBiZWhhdmlvciBi ZWZvcmUgdGhpcyBjaGFuZ2UuCisKKyAgICAgICAgKiBzZXJ2ZXItdGVzdHMvcmVzb3VyY2VzL2Nv bW1vbi1vcGVyYXRpb25zLmpzOiBBbGxvdyBwYXNzaW5nICd1c2VOb2RlUHJpdmlsZWdlZEFQSScK KyAgICAgICAgaW5mb3JtYXRpb24gdG8gVGVzdFNlcnZlci5pbmplY3QuCisgICAgICAgICogc2Vy dmVyLXRlc3RzL3Jlc291cmNlcy90ZXN0LXNlcnZlci5qczogQ29uZGl0aW9uYWxseSBpbmplY3Qg UHJpdmlsZWdlZEFQSSBiYXNlZCBvbgorICAgICAgICAndXNlTm9kZVByaXZpbGVnZWRBUEknLgor ICAgICAgICAoVGVzdFNlcnZlci5wcm90b3R5cGUuaW5qZWN0KToKKyAgICAgICAgKFRlc3RTZXJ2 ZXIpOgorICAgICAgICAqIHRvb2xzL2pzL3YzLW1vZGVscy5qczogUmVtb3ZlIHRoZSBpbXBvcnQg b2YgUHJpdmlsZWRnZWRBUEkuCisgICAgICAgICogdW5pdC10ZXN0cy9wcml2aWxlZ2VkLWFwaS10 ZXN0cy5qczogQWRkZWQgdW5pdCB0ZXN0cyBmb3IgTm9kZVByaXZpbGVnZWRBUEkuCisgICAgICAg ICogdW5pdC10ZXN0cy9yZXNvdXJjZXMvbW9jay1yZW1vdGUtYXBpLmpzOiBDb25kaXRpb25hbGx5 IGluamVjdCBQcml2aWxlZ2VkQVBJIGJhc2VkIG9uCisgICAgICAgICd1c2VOb2RlUHJpdmlsZWdl ZEFQSScuCisgICAgICAgIChNb2NrUmVtb3RlQVBJLmluamVjdCk6CisKKzIwMTgtMDQtMTkgIERl d2VpIFpodSAgPGRld2VpX3podUBhcHBsZS5jb20+CisKICAgICAgICAgQWRkIGEgYmlzZWN0IGJ1 dHRvbiB0byBhdXRvbWF0aWNhbGx5IHNjaGVkdWxlIGJpc2VjdGluZyBBL0IgdGFza3MuCiAgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODM4ODgKIApkaWZm IC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9yZXNvdXJjZXMv Y29tbW9uLW9wZXJhdGlvbnMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRl c3RzL3Jlc291cmNlcy9jb21tb24tb3BlcmF0aW9ucy5qcwppbmRleCA3YzFmMzRkNmIwZTc2NGNh OGE4ZGQ5MDhiNDRmODMyYzA0N2EwOGJkLi42ZjU2MGFiOWRmMThjNjA3MmQ5Y2Y1ZWIxMjRjYmFi MmE3YTlhMjkyIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRl c3RzL3Jlc291cmNlcy9jb21tb24tb3BlcmF0aW9ucy5qcworKysgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvc2VydmVyLXRlc3RzL3Jlc291cmNlcy9jb21tb24tb3BlcmF0aW9ucy5qcwpAQCAt MTcsMTAgKzE3LDEwIEBAIGZ1bmN0aW9uIGFkZFNsYXZlRm9yUmVwb3J0KHJlcG9ydCkKICAgICB9 KTsKIH0KIAotZnVuY3Rpb24gcHJlcGFyZVNlcnZlclRlc3QodGVzdCkKK2Z1bmN0aW9uIHByZXBh cmVTZXJ2ZXJUZXN0KHRlc3QsIHVzZU5vZGVQcml2aWxlZ2VkQVBJKQogewogICAgIHRlc3QudGlt ZW91dCg1MDAwKTsKLSAgICBUZXN0U2VydmVyLmluamVjdCgpOworICAgIFRlc3RTZXJ2ZXIuaW5q ZWN0KHVzZU5vZGVQcml2aWxlZ2VkQVBJKTsKIAogICAgIGJlZm9yZUVhY2goZnVuY3Rpb24gKCkg ewogICAgICAgICBpZiAodHlwZW9mKE1vY2tEYXRhKSAhPSAndW5kZWZpbmVkJykKZGlmZiAtLWdp dCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3VyY2VzL3Rlc3Qt c2VydmVyLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9yZXNvdXJj ZXMvdGVzdC1zZXJ2ZXIuanMKaW5kZXggYTc2ZDE5NGI1NDkwNTlkYWFkM2VmZjA4NmI4MDI1YThl YmI0M2FhNC4uODJkNzFiMGExMjRkMjlmOTc0OTgzMTUzMzk0MjUyMmEyYWEyNTk4YyAxMDA2NDQK LS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9yZXNvdXJjZXMvdGVz dC1zZXJ2ZXIuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9y ZXNvdXJjZXMvdGVzdC1zZXJ2ZXIuanMKQEAgLTEsMTMgKzEsMTYgQEAKICd1c2Ugc3RyaWN0JzsK IAotbGV0IGFzc2VydCA9IHJlcXVpcmUoJ2Fzc2VydCcpOwotbGV0IGNoaWxkUHJvY2VzcyA9IHJl cXVpcmUoJ2NoaWxkX3Byb2Nlc3MnKTsKLWxldCBmcyA9IHJlcXVpcmUoJ2ZzJyk7Ci1sZXQgcGF0 aCA9IHJlcXVpcmUoJ3BhdGgnKTsKLQotbGV0IENvbmZpZyA9IHJlcXVpcmUoJy4uLy4uL3Rvb2xz L2pzL2NvbmZpZy5qcycpOwotbGV0IERhdGFiYXNlID0gcmVxdWlyZSgnLi4vLi4vdG9vbHMvanMv ZGF0YWJhc2UuanMnKTsKLWxldCBSZW1vdGVBUEkgPSByZXF1aXJlKCcuLi8uLi90b29scy9qcy9y ZW1vdGUuanMnKS5SZW1vdGVBUEk7Citjb25zdCBhc3NlcnQgPSByZXF1aXJlKCdhc3NlcnQnKTsK K2NvbnN0IGNoaWxkUHJvY2VzcyA9IHJlcXVpcmUoJ2NoaWxkX3Byb2Nlc3MnKTsKK2NvbnN0IGZz ID0gcmVxdWlyZSgnZnMnKTsKK2NvbnN0IHBhdGggPSByZXF1aXJlKCdwYXRoJyk7Citjb25zdCBj cnlwdG8gPSByZXF1aXJlKCdjcnlwdG8nKTsKKworY29uc3QgQ29uZmlnID0gcmVxdWlyZSgnLi4v Li4vdG9vbHMvanMvY29uZmlnLmpzJyk7Citjb25zdCBEYXRhYmFzZSA9IHJlcXVpcmUoJy4uLy4u L3Rvb2xzL2pzL2RhdGFiYXNlLmpzJyk7Citjb25zdCBSZW1vdGVBUEkgPSByZXF1aXJlKCcuLi8u Li90b29scy9qcy9yZW1vdGUuanMnKS5SZW1vdGVBUEk7Citjb25zdCBCcm93c2VyUHJpdmlsZWdl ZEFQSSA9IHJlcXVpcmUoJy4uLy4uL3B1YmxpYy92My9wcml2aWxlZ2VkLWFwaS5qcycpLlByaXZp bGVnZWRBUEk7Citjb25zdCBOb2RlUHJpdmlsZWdlZEFQSSA9IHJlcXVpcmUoJy4uLy4uL3Rvb2xz L2pzL3ByaXZpbGVnZWQtYXBpJykuUHJpdmlsZWdlZEFQSTsKIAogY2xhc3MgVGVzdFNlcnZlciB7 CiAgICAgY29uc3RydWN0b3IoKQpAQCAtMjMxLDE1ICsyMzQsMTYgQEAgY2xhc3MgVGVzdFNlcnZl ciB7CiAgICAgICAgIHJlc29sdmUoKTsKICAgICB9CiAKLSAgICBpbmplY3QoKQorICAgIGluamVj dCh1c2VOb2RlUHJpdmlsZWdlZEFQSSkKICAgICB7Ci0gICAgICAgIGxldCBzZWxmID0gdGhpczsK KyAgICAgICAgY29uc3Qgc2VsZiA9IHRoaXM7CiAgICAgICAgIGJlZm9yZShmdW5jdGlvbiAoKSB7 CiAgICAgICAgICAgICB0aGlzLnRpbWVvdXQoMTAwMDApOwogICAgICAgICAgICAgcmV0dXJuIHNl bGYuc3RhcnQoKTsKICAgICAgICAgfSk7CiAKICAgICAgICAgbGV0IG9yaWdpbmFsUmVtb3RlOwor ICAgICAgICBsZXQgb3JpZ2luYWxQcml2aWxlZ2VkQVBJOwogCiAgICAgICAgIGJlZm9yZUVhY2go ZnVuY3Rpb24gKCkgewogICAgICAgICAgICAgdGhpcy50aW1lb3V0KDEwMDAwKTsKQEAgLTI0OSw3 ICsyNTMsMTAgQEAgY2xhc3MgVGVzdFNlcnZlciB7CiAgICAgICAgICAgICBnbG9iYWwuUmVtb3Rl QVBJID0gc2VsZi5fcmVtb3RlOwogICAgICAgICAgICAgc2VsZi5fcmVtb3RlLmNsZWFyQ29va2ll cygpOwogCi0gICAgICAgICAgICBpZiAoZ2xvYmFsLlByaXZpbGVnZWRBUEkpIHsKKyAgICAgICAg ICAgIG9yaWdpbmFsUHJpdmlsZWdlZEFQSSA9IGdsb2JhbC5Qcml2aWxlZ2VkQVBJOworICAgICAg ICAgICAgZ2xvYmFsLlByaXZpbGVnZWRBUEkgPSB1c2VOb2RlUHJpdmlsZWdlZEFQSSA/IE5vZGVQ cml2aWxlZ2VkQVBJIDogQnJvd3NlclByaXZpbGVnZWRBUEk7CisKKyAgICAgICAgICAgIGlmICgh dXNlTm9kZVByaXZpbGVnZWRBUEkpIHsKICAgICAgICAgICAgICAgICBnbG9iYWwuUHJpdmlsZWdl ZEFQSS5fdG9rZW4gPSBudWxsOwogICAgICAgICAgICAgICAgIGdsb2JhbC5Qcml2aWxlZ2VkQVBJ Ll9leHBpcmF0aW9uID0gbnVsbDsKICAgICAgICAgICAgIH0KQEAgLTI1OCw2ICsyNjUsNyBAQCBj bGFzcyBUZXN0U2VydmVyIHsKICAgICAgICAgYWZ0ZXIoZnVuY3Rpb24gKCkgewogICAgICAgICAg ICAgdGhpcy50aW1lb3V0KDEwMDAwKTsKICAgICAgICAgICAgIGdsb2JhbC5SZW1vdGVBUEkgPSBv cmlnaW5hbFJlbW90ZTsKKyAgICAgICAgICAgIGdsb2JhbC5Qcml2aWxlZ2VkQVBJID0gb3JpZ2lu YWxQcml2aWxlZ2VkQVBJOwogICAgICAgICAgICAgcmV0dXJuIHNlbGYuc3RvcCgpOwogICAgICAg ICB9KTsKICAgICB9CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMv anMvdjMtbW9kZWxzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pzL3YzLW1v ZGVscy5qcwppbmRleCAwMWQyM2UyZGE4MzI5YWE4NmVjYjQzZDcxNzkxODAxM2MxNTgzMTVkLi42 Y2ZkODNiNjZkYzcxNDgyYzM5OGYxYmU3MzdjZjYwOTdjNGE5NzBhIDEwMDY0NAotLS0gYS9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvdjMtbW9kZWxzLmpzCisrKyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy90b29scy9qcy92My1tb2RlbHMuanMKQEAgLTM0LDcgKzM0LDYgQEAg aW1wb3J0RnJvbVYzKCdtb2RlbHMvdHJpZ2dlcmFibGUuanMnLCAnVHJpZ2dlcmFibGUnKTsKIGlt cG9ydEZyb21WMygnbW9kZWxzL3RyaWdnZXJhYmxlLmpzJywgJ1RyaWdnZXJhYmxlUmVwb3NpdG9y eUdyb3VwJyk7CiBpbXBvcnRGcm9tVjMoJ21vZGVscy91cGxvYWRlZC1maWxlLmpzJywgJ1VwbG9h ZGVkRmlsZScpOwogCi1pbXBvcnRGcm9tVjMoJ3ByaXZpbGVnZWQtYXBpLmpzJywgJ1ByaXZpbGVn ZWRBUEknKTsKIGltcG9ydEZyb21WMygnaW5zdHJ1bWVudGF0aW9uLmpzJywgJ0luc3RydW1lbnRh dGlvbicpOwogaW1wb3J0RnJvbVYzKCdsYXppbHktZXZhbHVhdGVkLWZ1bmN0aW9uLmpzJywgJ0xh emlseUV2YWx1YXRlZEZ1bmN0aW9uJyk7CiBpbXBvcnRGcm9tVjMoJ2NvbW1pdC1zZXQtcmFuZ2Ut YmlzZWN0b3IuanMnLCAnQ29tbWl0U2V0UmFuZ2VCaXNlY3RvcicpOwpkaWZmIC0tZ2l0IGEvV2Vi c2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvcHJpdmlsZWdlZC1hcGktdGVzdHMuanMg Yi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9wcml2aWxlZ2VkLWFwaS10ZXN0 cy5qcwppbmRleCA1MDk1ZTU5NTk0MWRjNjU3ZWFiNTkxMjE5MzRiMDFiMTIwYTViMzE0Li5iZDJk NjY5NTVlZjczOGY2MjgyYTQzNTI4MmViZDBjNDIxYmUzZjVkIDEwMDY0NAotLS0gYS9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9wcml2aWxlZ2VkLWFwaS10ZXN0cy5qcworKysg Yi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9wcml2aWxlZ2VkLWFwaS10ZXN0 cy5qcwpAQCAtNSw3ICs1LDcgQEAgY29uc3QgYXNzZXJ0ID0gcmVxdWlyZSgnYXNzZXJ0Jyk7CiBj b25zdCBNb2NrUmVtb3RlQVBJID0gcmVxdWlyZSgnLi9yZXNvdXJjZXMvbW9jay1yZW1vdGUtYXBp LmpzJykuTW9ja1JlbW90ZUFQSTsKIHJlcXVpcmUoJy4uL3Rvb2xzL2pzL3YzLW1vZGVscy5qcycp OwogCi1kZXNjcmliZSgnUHJpdmlsZWdlZEFQSScsICgpID0+IHsKK2Rlc2NyaWJlKCdCcm93c2Vy UHJpdmlsZWdlZEFQSScsICgpID0+IHsKICAgICBsZXQgcmVxdWVzdHMgPSBNb2NrUmVtb3RlQVBJ LmluamVjdCgpOwogCiAgICAgYmVmb3JlRWFjaCgoKSA9PiB7CkBAIC01MCw3ICs1MCw3IEBAIGRl c2NyaWJlKCdQcml2aWxlZ2VkQVBJJywgKCkgPT4gewogICAgICAgICAgICAgfSk7CiAgICAgICAg IH0pOwogICAgIH0pOwotICAgIAorCiAgICAgZGVzY3JpYmUoJ3NlbmRSZXF1ZXN0JywgKCkgPT4g ewogCiAgICAgICAgIGl0KCdzaG91bGQgZ2VuZXJhdGUgYSBuZXcgdG9rZW4gaWYgbm8gdG9rZW4g aGFkIGJlZW4gZmV0Y2hlZCcsICgpID0+IHsKQEAgLTE2NywzICsxNjcsMjYgQEAgZGVzY3JpYmUo J1ByaXZpbGVnZWRBUEknLCAoKSA9PiB7CiAgICAgfSk7CiAKIH0pOworCitkZXNjcmliZSgnTm9k ZVByaXZpbGVnZWRBUEknLCAoKSA9PiB7CisgICAgbGV0IHJlcXVlc3RzID0gTW9ja1JlbW90ZUFQ SS5pbmplY3QobnVsbCwgdHJ1ZSk7CisgICAgYmVmb3JlRWFjaCgoKSA9PiB7CisgICAgICAgIFBy aXZpbGVnZWRBUEkuY29uZmlndXJlKCdzbGF2ZV9uYW1lJywgJ3Bhc3N3b3JkJyk7CisgICAgfSk7 CisKKyAgICBkZXNjcmliZSgnc2VuZFJlcXVlc3QnLCAoKSA9PiB7CisgICAgICAgIGl0KCdzaG91 bGQgcG9zdCBzbGF2ZSBuYW1lIGFuZCBwYXNzd29yZCBpbiBkYXRhJywgYXN5bmMgKCkgPT4gewor ICAgICAgICAgICAgY29uc3QgcmVxdWVzdCA9IFByaXZpbGVnZWRBUEkuc2VuZFJlcXVlc3QoJ3Rl c3QnLCB7Zm9vOiAnYmFyJ30pOworCisgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHMu bGVuZ3RoLCAxKTsKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0c1swXS51cmwsICcv cHJpdmlsZWdlZC1hcGkvdGVzdCcpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3Rz WzBdLm1ldGhvZCwgJ1BPU1QnKTsKKyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwocmVxdWVz dHNbMF0uZGF0YSwgIHtmb286ICdiYXInLCBzbGF2ZU5hbWU6ICdzbGF2ZV9uYW1lJywgc2xhdmVQ YXNzd29yZDogJ3Bhc3N3b3JkJ30pOworCisgICAgICAgICAgICByZXF1ZXN0c1swXS5yZXNvbHZl KHt0ZXN0OiAnc3VjY2Vzcyd9KTsKKyAgICAgICAgICAgIGNvbnN0IHJlc3VsdCA9IGF3YWl0IHJl cXVlc3Q7CisgICAgICAgICAgICBhc3NlcnQuZGVlcEVxdWFsKHJlc3VsdCwge3Rlc3Q6ICdzdWNj ZXNzJ30pOworICAgICAgICB9KTsKKyAgICB9KTsKKworfSk7CmRpZmYgLS1naXQgYS9XZWJzaXRl cy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9yZXNvdXJjZXMvbW9jay1yZW1vdGUtYXBpLmpz IGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2stcmVt b3RlLWFwaS5qcwppbmRleCBlN2IwNTVjODRhNGQwZmRjNzMxMGVmMzY3NmU4OGZhMTZhMDE5ZTcw Li4zMmJjYzJjMzg3NjQwODg0ZGUxZTdkYjEzZjJjY2UyNzJmYmJjZjUzIDEwMDY0NAotLS0gYS9X ZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9yZXNvdXJjZXMvbW9jay1yZW1vdGUt YXBpLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL3Jlc291cmNl cy9tb2NrLXJlbW90ZS1hcGkuanMKQEAgLTEsMyArMSw2IEBACitjb25zdCBCcm93c2VyUHJpdmls ZWdlZEFQSSA9IHJlcXVpcmUoJy4uLy4uL3B1YmxpYy92My9wcml2aWxlZ2VkLWFwaS5qcycpLlBy aXZpbGVnZWRBUEk7Citjb25zdCBOb2RlUHJpdmlsZWdlZEFQSSA9IHJlcXVpcmUoJy4uLy4uL3Rv b2xzL2pzL3ByaXZpbGVnZWQtYXBpJykuUHJpdmlsZWdlZEFQSTsKKwogdmFyIE1vY2tSZW1vdGVB UEkgPSB7CiAgICAgdXJsOiBmdW5jdGlvbiAocGF0aCkKICAgICB7CkBAIC01NywxOCArNjAsMjMg QEAgdmFyIE1vY2tSZW1vdGVBUEkgPSB7CiAgICAgICAgIH0KICAgICAgICAgcmV0dXJuIHRoaXMu X3dhaXRpbmdQcm9taXNlOwogICAgIH0sCi0gICAgaW5qZWN0OiBmdW5jdGlvbiAodXJsUHJlZml4 KQorICAgIGluamVjdDogZnVuY3Rpb24gKHVybFByZWZpeCwgdXNlTm9kZVByaXZpbGVnZWRBUEkp CiAgICAgewotICAgICAgICB2YXIgb3JpZ2luYWxSZW1vdGVBUEkgPSBnbG9iYWwuUmVtb3RlQVBJ OworICAgICAgICBsZXQgb3JpZ2luYWxSZW1vdGVBUEkgPSBnbG9iYWwuUmVtb3RlQVBJOworICAg ICAgICBsZXQgb3JpZ2luYWxQcml2aWxlZ2VkQVBJID0gZ2xvYmFsLlByaXZpbGVnZWRBUEk7Cisg ICAgICAgIGNvbnN0IGhvb2tQcml2aWxlZ2VkQVBJID0gdXNlTm9kZVByaXZpbGVnZWRBUEkgPyBO b2RlUHJpdmlsZWdlZEFQSTogQnJvd3NlclByaXZpbGVnZWRBUEk7CiAKLSAgICAgICAgYmVmb3Jl RWFjaChmdW5jdGlvbiAoKSB7CisgICAgICAgIGJlZm9yZUVhY2goKCkgPT4gewogICAgICAgICAg ICAgTW9ja1JlbW90ZUFQSS5yZXNldCh1cmxQcmVmaXgpOwogICAgICAgICAgICAgb3JpZ2luYWxS ZW1vdGVBUEkgPSBnbG9iYWwuUmVtb3RlQVBJOwogICAgICAgICAgICAgZ2xvYmFsLlJlbW90ZUFQ SSA9IE1vY2tSZW1vdGVBUEk7CisgICAgICAgICAgICBvcmlnaW5hbFByaXZpbGVnZWRBUEkgPSBn bG9iYWwuUHJpdmlsZWdlZEFQSTsKKyAgICAgICAgICAgIGdsb2JhbC5Qcml2aWxlZ2VkQVBJID0g aG9va1ByaXZpbGVnZWRBUEk7CiAgICAgICAgIH0pOwogCi0gICAgICAgIGFmdGVyRWFjaChmdW5j dGlvbiAoKSB7ICAgICAgICAKKyAgICAgICAgYWZ0ZXJFYWNoKCgpID0+IHsKICAgICAgICAgICAg IGdsb2JhbC5SZW1vdGVBUEkgPSBvcmlnaW5hbFJlbW90ZUFQSTsKKyAgICAgICAgICAgIGdsb2Jh bC5Qcml2aWxlZ2VkQVBJID0gb3JpZ2luYWxQcml2aWxlZ2VkQVBJOwogICAgICAgICB9KTsKIAog ICAgICAgICByZXR1cm4gTW9ja1JlbW90ZUFQSS5yZXF1ZXN0czsK 338444 2018-04-20 11:41:14 -0700 2018-04-20 16:57:06 -0700 Patch bug-184766-20180420114114.patch text/plain 10520 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMjMwODI5CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCBmM2VkY2ZiYjllMzliMjU0ZTgyNDBiZDNhZGFiMGYxNGNkODFlOWUwLi41OWU3NjI4ZjQz MGFhNmI1ZWY4OTg4MDRhMGNmYjE0OTU3MWRjNWNlIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsNSArMSwzMiBAQAogMjAxOC0wNC0xOSAgRGV3ZWkgWmh1ICA8ZGV3ZWlfemh1 QGFwcGxlLmNvbT4KIAorICAgICAgICBUb29sIHNjcmlwdHMgc2hvdWxkIG5vdCB1c2UgUHJpdmls ZWdlZEFQSSBmcm9tICdwdWJsaWMvdjMvcHJpdmlsZWdlZC1hcGkuanMnLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTg0NzY2CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRm9yIHRvb2xzLCB3ZSBzaG91bGQg bm90IHVzZSBQcml2aWxlZ2VkQVBJIGZvciB0b29scyBhcyBjdXJyZW50IFByaXZpbGVnZWRBUEkK KyAgICAgICAgaXMgdXNlZCBieSBVSSBhbmQgaXQgaXMgdW5uZWNlc3NhcnkgdG8gZ2VuZXJhdGUg Q1NSRiB0b2tlbiBmb3IgdG9vbHMuCisgICAgICAgIFdpbGwgcG9zdCBhIGZvbGxvd3VwIHBhdGNo IHRoYXQgY3JlYXRlcyBhIFByaXZpbGVnZWRBUEkgdXNlZCBieSB0b29scy4KKyAgICAgICAgTWFr ZSBhIGNoYW5nZSBvbiBUZXN0U2VydmVyLmluamVjdCBhbmQgTW9ja1JlbW90ZUFQSS5pbmplY3Qg dG8gYWxsb3cgc3BlY2lmeWluZworICAgICAgICBCcm93c2VyUHJpdmlsZWdlZEFQSSBvciBOb2Rl UHJpdmlsZWdlZEFQSSBpbiB0aGUgdGVzdC4gQ3VycmVudGx5IGRlZmF1bHRzIHRvCisgICAgICAg IEJyb3dzZXJQcml2aWxlZ2VkQVBJIGFzIHRoaXMgaXMgdGhlIHRlc3QgYmVoYXZpb3IgYmVmb3Jl IHRoaXMgY2hhbmdlLgorCisgICAgICAgICogc2VydmVyLXRlc3RzL3Jlc291cmNlcy9jb21tb24t b3BlcmF0aW9ucy5qczogQWxsb3cgcGFzc2luZyAndXNlTm9kZVByaXZpbGVnZWRBUEknCisgICAg ICAgIGluZm9ybWF0aW9uIHRvIFRlc3RTZXJ2ZXIuaW5qZWN0LgorICAgICAgICAqIHNlcnZlci10 ZXN0cy9yZXNvdXJjZXMvdGVzdC1zZXJ2ZXIuanM6IENvbmRpdGlvbmFsbHkgaW5qZWN0IFByaXZp bGVnZWRBUEkgYmFzZWQgb24KKyAgICAgICAgJ3VzZU5vZGVQcml2aWxlZ2VkQVBJJy4KKyAgICAg ICAgKFRlc3RTZXJ2ZXIucHJvdG90eXBlLmluamVjdCk6CisgICAgICAgIChUZXN0U2VydmVyKToK KyAgICAgICAgKiB0b29scy9qcy9wcml2aWxlZ2VkLWFwaS5qczogQWRkZWQgTm9kZVByaXZpbGVn ZWRBUEkuCisgICAgICAgICogdG9vbHMvanMvdjMtbW9kZWxzLmpzOiBSZW1vdmUgdGhlIGltcG9y dCBvZiBQcml2aWxlZ2VkQVBJLgorICAgICAgICAqIHVuaXQtdGVzdHMvcHJpdmlsZWdlZC1hcGkt dGVzdHMuanM6IEFkZGVkIHVuaXQgdGVzdHMgZm9yIE5vZGVQcml2aWxlZ2VkQVBJLgorICAgICAg ICAqIHVuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2stcmVtb3RlLWFwaS5qczogQ29uZGl0aW9uYWxs eSBpbmplY3QgUHJpdmlsZWdlZEFQSSBiYXNlZCBvbgorICAgICAgICAndXNlTm9kZVByaXZpbGVn ZWRBUEknLgorICAgICAgICAoTW9ja1JlbW90ZUFQSS5pbmplY3QpOgorCisyMDE4LTA0LTE5ICBE ZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCiAgICAgICAgIEFkZCBhIGJpc2VjdCBi dXR0b24gdG8gYXV0b21hdGljYWxseSBzY2hlZHVsZSBiaXNlY3RpbmcgQS9CIHRhc2tzLgogICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTgzODg4CiAKZGlm ZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3VyY2Vz L2NvbW1vbi1vcGVyYXRpb25zLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10 ZXN0cy9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMKaW5kZXggN2MxZjM0ZDZiMGU3NjRj YThhOGRkOTA4YjQ0ZjgzMmMwNDdhMDhiZC4uNmY1NjBhYjlkZjE4YzYwNzJkOWNmNWViMTI0Y2Jh YjJhN2E5YTI5MiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10 ZXN0cy9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3NlcnZlci10ZXN0cy9yZXNvdXJjZXMvY29tbW9uLW9wZXJhdGlvbnMuanMKQEAg LTE3LDEwICsxNywxMCBAQCBmdW5jdGlvbiBhZGRTbGF2ZUZvclJlcG9ydChyZXBvcnQpCiAgICAg fSk7CiB9CiAKLWZ1bmN0aW9uIHByZXBhcmVTZXJ2ZXJUZXN0KHRlc3QpCitmdW5jdGlvbiBwcmVw YXJlU2VydmVyVGVzdCh0ZXN0LCB1c2VOb2RlUHJpdmlsZWdlZEFQSSkKIHsKICAgICB0ZXN0LnRp bWVvdXQoNTAwMCk7Ci0gICAgVGVzdFNlcnZlci5pbmplY3QoKTsKKyAgICBUZXN0U2VydmVyLmlu amVjdCh1c2VOb2RlUHJpdmlsZWdlZEFQSSk7CiAKICAgICBiZWZvcmVFYWNoKGZ1bmN0aW9uICgp IHsKICAgICAgICAgaWYgKHR5cGVvZihNb2NrRGF0YSkgIT0gJ3VuZGVmaW5lZCcpCmRpZmYgLS1n aXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvc2VydmVyLXRlc3RzL3Jlc291cmNlcy90ZXN0 LXNlcnZlci5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3Vy Y2VzL3Rlc3Qtc2VydmVyLmpzCmluZGV4IGE3NmQxOTRiNTQ5MDU5ZGFhZDNlZmYwODZiODAyNWE4 ZWJiNDNhYTQuLjgyZDcxYjBhMTI0ZDI5Zjk3NDk4MzE1MzM5NDI1MjJhMmFhMjU5OGMgMTAwNjQ0 Ci0tLSBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvcmVzb3VyY2VzL3Rl c3Qtc2VydmVyLmpzCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMv cmVzb3VyY2VzL3Rlc3Qtc2VydmVyLmpzCkBAIC0xLDEzICsxLDE2IEBACiAndXNlIHN0cmljdCc7 CiAKLWxldCBhc3NlcnQgPSByZXF1aXJlKCdhc3NlcnQnKTsKLWxldCBjaGlsZFByb2Nlc3MgPSBy ZXF1aXJlKCdjaGlsZF9wcm9jZXNzJyk7Ci1sZXQgZnMgPSByZXF1aXJlKCdmcycpOwotbGV0IHBh dGggPSByZXF1aXJlKCdwYXRoJyk7Ci0KLWxldCBDb25maWcgPSByZXF1aXJlKCcuLi8uLi90b29s cy9qcy9jb25maWcuanMnKTsKLWxldCBEYXRhYmFzZSA9IHJlcXVpcmUoJy4uLy4uL3Rvb2xzL2pz L2RhdGFiYXNlLmpzJyk7Ci1sZXQgUmVtb3RlQVBJID0gcmVxdWlyZSgnLi4vLi4vdG9vbHMvanMv cmVtb3RlLmpzJykuUmVtb3RlQVBJOworY29uc3QgYXNzZXJ0ID0gcmVxdWlyZSgnYXNzZXJ0Jyk7 Citjb25zdCBjaGlsZFByb2Nlc3MgPSByZXF1aXJlKCdjaGlsZF9wcm9jZXNzJyk7Citjb25zdCBm cyA9IHJlcXVpcmUoJ2ZzJyk7Citjb25zdCBwYXRoID0gcmVxdWlyZSgncGF0aCcpOworY29uc3Qg Y3J5cHRvID0gcmVxdWlyZSgnY3J5cHRvJyk7CisKK2NvbnN0IENvbmZpZyA9IHJlcXVpcmUoJy4u Ly4uL3Rvb2xzL2pzL2NvbmZpZy5qcycpOworY29uc3QgRGF0YWJhc2UgPSByZXF1aXJlKCcuLi8u Li90b29scy9qcy9kYXRhYmFzZS5qcycpOworY29uc3QgUmVtb3RlQVBJID0gcmVxdWlyZSgnLi4v Li4vdG9vbHMvanMvcmVtb3RlLmpzJykuUmVtb3RlQVBJOworY29uc3QgQnJvd3NlclByaXZpbGVn ZWRBUEkgPSByZXF1aXJlKCcuLi8uLi9wdWJsaWMvdjMvcHJpdmlsZWdlZC1hcGkuanMnKS5Qcml2 aWxlZ2VkQVBJOworY29uc3QgTm9kZVByaXZpbGVnZWRBUEkgPSByZXF1aXJlKCcuLi8uLi90b29s cy9qcy9wcml2aWxlZ2VkLWFwaScpLlByaXZpbGVnZWRBUEk7CiAKIGNsYXNzIFRlc3RTZXJ2ZXIg ewogICAgIGNvbnN0cnVjdG9yKCkKQEAgLTIzMSwxNSArMjM0LDE2IEBAIGNsYXNzIFRlc3RTZXJ2 ZXIgewogICAgICAgICByZXNvbHZlKCk7CiAgICAgfQogCi0gICAgaW5qZWN0KCkKKyAgICBpbmpl Y3QodXNlTm9kZVByaXZpbGVnZWRBUEkpCiAgICAgewotICAgICAgICBsZXQgc2VsZiA9IHRoaXM7 CisgICAgICAgIGNvbnN0IHNlbGYgPSB0aGlzOwogICAgICAgICBiZWZvcmUoZnVuY3Rpb24gKCkg ewogICAgICAgICAgICAgdGhpcy50aW1lb3V0KDEwMDAwKTsKICAgICAgICAgICAgIHJldHVybiBz ZWxmLnN0YXJ0KCk7CiAgICAgICAgIH0pOwogCiAgICAgICAgIGxldCBvcmlnaW5hbFJlbW90ZTsK KyAgICAgICAgbGV0IG9yaWdpbmFsUHJpdmlsZWdlZEFQSTsKIAogICAgICAgICBiZWZvcmVFYWNo KGZ1bmN0aW9uICgpIHsKICAgICAgICAgICAgIHRoaXMudGltZW91dCgxMDAwMCk7CkBAIC0yNDks NyArMjUzLDEwIEBAIGNsYXNzIFRlc3RTZXJ2ZXIgewogICAgICAgICAgICAgZ2xvYmFsLlJlbW90 ZUFQSSA9IHNlbGYuX3JlbW90ZTsKICAgICAgICAgICAgIHNlbGYuX3JlbW90ZS5jbGVhckNvb2tp ZXMoKTsKIAotICAgICAgICAgICAgaWYgKGdsb2JhbC5Qcml2aWxlZ2VkQVBJKSB7CisgICAgICAg ICAgICBvcmlnaW5hbFByaXZpbGVnZWRBUEkgPSBnbG9iYWwuUHJpdmlsZWdlZEFQSTsKKyAgICAg ICAgICAgIGdsb2JhbC5Qcml2aWxlZ2VkQVBJID0gdXNlTm9kZVByaXZpbGVnZWRBUEkgPyBOb2Rl UHJpdmlsZWdlZEFQSSA6IEJyb3dzZXJQcml2aWxlZ2VkQVBJOworCisgICAgICAgICAgICBpZiAo IXVzZU5vZGVQcml2aWxlZ2VkQVBJKSB7CiAgICAgICAgICAgICAgICAgZ2xvYmFsLlByaXZpbGVn ZWRBUEkuX3Rva2VuID0gbnVsbDsKICAgICAgICAgICAgICAgICBnbG9iYWwuUHJpdmlsZWdlZEFQ SS5fZXhwaXJhdGlvbiA9IG51bGw7CiAgICAgICAgICAgICB9CkBAIC0yNTgsNiArMjY1LDcgQEAg Y2xhc3MgVGVzdFNlcnZlciB7CiAgICAgICAgIGFmdGVyKGZ1bmN0aW9uICgpIHsKICAgICAgICAg ICAgIHRoaXMudGltZW91dCgxMDAwMCk7CiAgICAgICAgICAgICBnbG9iYWwuUmVtb3RlQVBJID0g b3JpZ2luYWxSZW1vdGU7CisgICAgICAgICAgICBnbG9iYWwuUHJpdmlsZWdlZEFQSSA9IG9yaWdp bmFsUHJpdmlsZWdlZEFQSTsKICAgICAgICAgICAgIHJldHVybiBzZWxmLnN0b3AoKTsKICAgICAg ICAgfSk7CiAgICAgfQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xz L2pzL3ByaXZpbGVnZWQtYXBpLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3Rvb2xzL2pz L3ByaXZpbGVnZWQtYXBpLmpzCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQ4ZTViYThjODJjMTBhOTE0YjE3ZmRmZTNl NzNhNzA4MmY2OWQ2ZTUKLS0tIC9kZXYvbnVsbAorKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5v cmcvdG9vbHMvanMvcHJpdmlsZWdlZC1hcGkuanMKQEAgLTAsMCArMSwyNiBAQAorInVzZSBzdHJp Y3QiOworCitjbGFzcyBOb2RlUHJpdmlsZWdlZEFQSSB7CisKKyAgICBzdGF0aWMgc2VuZFJlcXVl c3QocGF0aCwgZGF0YSwgb3B0aW9ucyA9IHt1c2VGb3JtRGF0YTogZmFsc2V9KQorICAgIHsKKyAg ICAgICAgY29uc3QgY2xvbmVkRGF0YSA9IHtzbGF2ZU5hbWU6IHRoaXMuX3NsYXZlTmFtZSwgc2xh dmVQYXNzd29yZDogdGhpcy5fc2xhdmVQYXNzd29yZH07CisgICAgICAgIGZvciAobGV0IGtleSBp biBkYXRhKQorICAgICAgICAgICAgY2xvbmVkRGF0YVtrZXldID0gZGF0YVtrZXldOworCisgICAg ICAgIGNvbnN0IGZ1bGxQYXRoID0gJy9wcml2aWxlZ2VkLWFwaS8nICsgcGF0aDsKKworICAgICAg ICByZXR1cm4gb3B0aW9ucy51c2VGb3JtRGF0YQorICAgICAgICAgICAgPyBSZW1vdGVBUEkucG9z dEZvcm1EYXRhV2l0aFN0YXR1cyhmdWxsUGF0aCwgY2xvbmVkRGF0YSwgb3B0aW9ucykKKyAgICAg ICAgICAgIDogUmVtb3RlQVBJLnBvc3RKU09OV2l0aFN0YXR1cyhmdWxsUGF0aCwgY2xvbmVkRGF0 YSwgb3B0aW9ucyk7CisgICAgfQorCisgICAgc3RhdGljIGNvbmZpZ3VyZShzbGF2ZU5hbWUsIHNs YXZlUGFzc3dvcmQpCisgICAgeworICAgICAgICB0aGlzLl9zbGF2ZU5hbWUgPSBzbGF2ZU5hbWU7 CisgICAgICAgIHRoaXMuX3NsYXZlUGFzc3dvcmQgPSBzbGF2ZVBhc3N3b3JkOworICAgIH0KK30K KworaWYgKHR5cGVvZiBtb2R1bGUgIT0gJ3VuZGVmaW5lZCcpCisgICAgbW9kdWxlLmV4cG9ydHMu UHJpdmlsZWdlZEFQSSA9IE5vZGVQcml2aWxlZ2VkQVBJOwpcIE5vIG5ld2xpbmUgYXQgZW5kIG9m IGZpbGUKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy90b29scy9qcy92My1t b2RlbHMuanMgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvdG9vbHMvanMvdjMtbW9kZWxzLmpz CmluZGV4IDAxZDIzZTJkYTgzMjlhYTg2ZWNiNDNkNzE3OTE4MDEzYzE1ODMxNWQuLjZjZmQ4M2I2 NmRjNzE0ODJjMzk4ZjFiZTczN2NmNjA5N2M0YTk3MGEgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3Bl cmYud2Via2l0Lm9yZy90b29scy9qcy92My1tb2RlbHMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53 ZWJraXQub3JnL3Rvb2xzL2pzL3YzLW1vZGVscy5qcwpAQCAtMzQsNyArMzQsNiBAQCBpbXBvcnRG cm9tVjMoJ21vZGVscy90cmlnZ2VyYWJsZS5qcycsICdUcmlnZ2VyYWJsZScpOwogaW1wb3J0RnJv bVYzKCdtb2RlbHMvdHJpZ2dlcmFibGUuanMnLCAnVHJpZ2dlcmFibGVSZXBvc2l0b3J5R3JvdXAn KTsKIGltcG9ydEZyb21WMygnbW9kZWxzL3VwbG9hZGVkLWZpbGUuanMnLCAnVXBsb2FkZWRGaWxl Jyk7CiAKLWltcG9ydEZyb21WMygncHJpdmlsZWdlZC1hcGkuanMnLCAnUHJpdmlsZWdlZEFQSScp OwogaW1wb3J0RnJvbVYzKCdpbnN0cnVtZW50YXRpb24uanMnLCAnSW5zdHJ1bWVudGF0aW9uJyk7 CiBpbXBvcnRGcm9tVjMoJ2xhemlseS1ldmFsdWF0ZWQtZnVuY3Rpb24uanMnLCAnTGF6aWx5RXZh bHVhdGVkRnVuY3Rpb24nKTsKIGltcG9ydEZyb21WMygnY29tbWl0LXNldC1yYW5nZS1iaXNlY3Rv ci5qcycsICdDb21taXRTZXRSYW5nZUJpc2VjdG9yJyk7CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9w ZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9wcml2aWxlZ2VkLWFwaS10ZXN0cy5qcyBiL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL3ByaXZpbGVnZWQtYXBpLXRlc3RzLmpzCmlu ZGV4IDUwOTVlNTk1OTQxZGM2NTdlYWI1OTEyMTkzNGIwMWIxMjBhNWIzMTQuLmJkMmQ2Njk1NWVm NzM4ZjYyODJhNDM1MjgyZWJkMGM0MjFiZTNmNWQgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy91bml0LXRlc3RzL3ByaXZpbGVnZWQtYXBpLXRlc3RzLmpzCisrKyBiL1dlYnNp dGVzL3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL3ByaXZpbGVnZWQtYXBpLXRlc3RzLmpzCkBA IC01LDcgKzUsNyBAQCBjb25zdCBhc3NlcnQgPSByZXF1aXJlKCdhc3NlcnQnKTsKIGNvbnN0IE1v Y2tSZW1vdGVBUEkgPSByZXF1aXJlKCcuL3Jlc291cmNlcy9tb2NrLXJlbW90ZS1hcGkuanMnKS5N b2NrUmVtb3RlQVBJOwogcmVxdWlyZSgnLi4vdG9vbHMvanMvdjMtbW9kZWxzLmpzJyk7CiAKLWRl c2NyaWJlKCdQcml2aWxlZ2VkQVBJJywgKCkgPT4geworZGVzY3JpYmUoJ0Jyb3dzZXJQcml2aWxl Z2VkQVBJJywgKCkgPT4gewogICAgIGxldCByZXF1ZXN0cyA9IE1vY2tSZW1vdGVBUEkuaW5qZWN0 KCk7CiAKICAgICBiZWZvcmVFYWNoKCgpID0+IHsKQEAgLTUwLDcgKzUwLDcgQEAgZGVzY3JpYmUo J1ByaXZpbGVnZWRBUEknLCAoKSA9PiB7CiAgICAgICAgICAgICB9KTsKICAgICAgICAgfSk7CiAg ICAgfSk7Ci0gICAgCisKICAgICBkZXNjcmliZSgnc2VuZFJlcXVlc3QnLCAoKSA9PiB7CiAKICAg ICAgICAgaXQoJ3Nob3VsZCBnZW5lcmF0ZSBhIG5ldyB0b2tlbiBpZiBubyB0b2tlbiBoYWQgYmVl biBmZXRjaGVkJywgKCkgPT4gewpAQCAtMTY3LDMgKzE2NywyNiBAQCBkZXNjcmliZSgnUHJpdmls ZWdlZEFQSScsICgpID0+IHsKICAgICB9KTsKIAogfSk7CisKK2Rlc2NyaWJlKCdOb2RlUHJpdmls ZWdlZEFQSScsICgpID0+IHsKKyAgICBsZXQgcmVxdWVzdHMgPSBNb2NrUmVtb3RlQVBJLmluamVj dChudWxsLCB0cnVlKTsKKyAgICBiZWZvcmVFYWNoKCgpID0+IHsKKyAgICAgICAgUHJpdmlsZWdl ZEFQSS5jb25maWd1cmUoJ3NsYXZlX25hbWUnLCAncGFzc3dvcmQnKTsKKyAgICB9KTsKKworICAg IGRlc2NyaWJlKCdzZW5kUmVxdWVzdCcsICgpID0+IHsKKyAgICAgICAgaXQoJ3Nob3VsZCBwb3N0 IHNsYXZlIG5hbWUgYW5kIHBhc3N3b3JkIGluIGRhdGEnLCBhc3luYyAoKSA9PiB7CisgICAgICAg ICAgICBjb25zdCByZXF1ZXN0ID0gUHJpdmlsZWdlZEFQSS5zZW5kUmVxdWVzdCgndGVzdCcsIHtm b286ICdiYXInfSk7CisKKyAgICAgICAgICAgIGFzc2VydC5lcXVhbChyZXF1ZXN0cy5sZW5ndGgs IDEpOworICAgICAgICAgICAgYXNzZXJ0LmVxdWFsKHJlcXVlc3RzWzBdLnVybCwgJy9wcml2aWxl Z2VkLWFwaS90ZXN0Jyk7CisgICAgICAgICAgICBhc3NlcnQuZXF1YWwocmVxdWVzdHNbMF0ubWV0 aG9kLCAnUE9TVCcpOworICAgICAgICAgICAgYXNzZXJ0LmRlZXBFcXVhbChyZXF1ZXN0c1swXS5k YXRhLCAge2ZvbzogJ2JhcicsIHNsYXZlTmFtZTogJ3NsYXZlX25hbWUnLCBzbGF2ZVBhc3N3b3Jk OiAncGFzc3dvcmQnfSk7CisKKyAgICAgICAgICAgIHJlcXVlc3RzWzBdLnJlc29sdmUoe3Rlc3Q6 ICdzdWNjZXNzJ30pOworICAgICAgICAgICAgY29uc3QgcmVzdWx0ID0gYXdhaXQgcmVxdWVzdDsK KyAgICAgICAgICAgIGFzc2VydC5kZWVwRXF1YWwocmVzdWx0LCB7dGVzdDogJ3N1Y2Nlc3MnfSk7 CisgICAgICAgIH0pOworICAgIH0pOworCit9KTsKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYu d2Via2l0Lm9yZy91bml0LXRlc3RzL3Jlc291cmNlcy9tb2NrLXJlbW90ZS1hcGkuanMgYi9XZWJz aXRlcy9wZXJmLndlYmtpdC5vcmcvdW5pdC10ZXN0cy9yZXNvdXJjZXMvbW9jay1yZW1vdGUtYXBp LmpzCmluZGV4IGU3YjA1NWM4NGE0ZDBmZGM3MzEwZWYzNjc2ZTg4ZmExNmEwMTllNzAuLjMyYmNj MmMzODc2NDA4ODRkZTFlN2RiMTNmMmNjZTI3MmZiYmNmNTMgMTAwNjQ0Ci0tLSBhL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy91bml0LXRlc3RzL3Jlc291cmNlcy9tb2NrLXJlbW90ZS1hcGkuanMK KysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3VuaXQtdGVzdHMvcmVzb3VyY2VzL21vY2st cmVtb3RlLWFwaS5qcwpAQCAtMSwzICsxLDYgQEAKK2NvbnN0IEJyb3dzZXJQcml2aWxlZ2VkQVBJ ID0gcmVxdWlyZSgnLi4vLi4vcHVibGljL3YzL3ByaXZpbGVnZWQtYXBpLmpzJykuUHJpdmlsZWdl ZEFQSTsKK2NvbnN0IE5vZGVQcml2aWxlZ2VkQVBJID0gcmVxdWlyZSgnLi4vLi4vdG9vbHMvanMv cHJpdmlsZWdlZC1hcGknKS5Qcml2aWxlZ2VkQVBJOworCiB2YXIgTW9ja1JlbW90ZUFQSSA9IHsK ICAgICB1cmw6IGZ1bmN0aW9uIChwYXRoKQogICAgIHsKQEAgLTU3LDE4ICs2MCwyMyBAQCB2YXIg TW9ja1JlbW90ZUFQSSA9IHsKICAgICAgICAgfQogICAgICAgICByZXR1cm4gdGhpcy5fd2FpdGlu Z1Byb21pc2U7CiAgICAgfSwKLSAgICBpbmplY3Q6IGZ1bmN0aW9uICh1cmxQcmVmaXgpCisgICAg aW5qZWN0OiBmdW5jdGlvbiAodXJsUHJlZml4LCB1c2VOb2RlUHJpdmlsZWdlZEFQSSkKICAgICB7 Ci0gICAgICAgIHZhciBvcmlnaW5hbFJlbW90ZUFQSSA9IGdsb2JhbC5SZW1vdGVBUEk7CisgICAg ICAgIGxldCBvcmlnaW5hbFJlbW90ZUFQSSA9IGdsb2JhbC5SZW1vdGVBUEk7CisgICAgICAgIGxl dCBvcmlnaW5hbFByaXZpbGVnZWRBUEkgPSBnbG9iYWwuUHJpdmlsZWdlZEFQSTsKKyAgICAgICAg Y29uc3QgaG9va1ByaXZpbGVnZWRBUEkgPSB1c2VOb2RlUHJpdmlsZWdlZEFQSSA/IE5vZGVQcml2 aWxlZ2VkQVBJOiBCcm93c2VyUHJpdmlsZWdlZEFQSTsKIAotICAgICAgICBiZWZvcmVFYWNoKGZ1 bmN0aW9uICgpIHsKKyAgICAgICAgYmVmb3JlRWFjaCgoKSA9PiB7CiAgICAgICAgICAgICBNb2Nr UmVtb3RlQVBJLnJlc2V0KHVybFByZWZpeCk7CiAgICAgICAgICAgICBvcmlnaW5hbFJlbW90ZUFQ SSA9IGdsb2JhbC5SZW1vdGVBUEk7CiAgICAgICAgICAgICBnbG9iYWwuUmVtb3RlQVBJID0gTW9j a1JlbW90ZUFQSTsKKyAgICAgICAgICAgIG9yaWdpbmFsUHJpdmlsZWdlZEFQSSA9IGdsb2JhbC5Q cml2aWxlZ2VkQVBJOworICAgICAgICAgICAgZ2xvYmFsLlByaXZpbGVnZWRBUEkgPSBob29rUHJp dmlsZWdlZEFQSTsKICAgICAgICAgfSk7CiAKLSAgICAgICAgYWZ0ZXJFYWNoKGZ1bmN0aW9uICgp IHsgICAgICAgIAorICAgICAgICBhZnRlckVhY2goKCkgPT4gewogICAgICAgICAgICAgZ2xvYmFs LlJlbW90ZUFQSSA9IG9yaWdpbmFsUmVtb3RlQVBJOworICAgICAgICAgICAgZ2xvYmFsLlByaXZp bGVnZWRBUEkgPSBvcmlnaW5hbFByaXZpbGVnZWRBUEk7CiAgICAgICAgIH0pOwogCiAgICAgICAg IHJldHVybiBNb2NrUmVtb3RlQVBJLnJlcXVlc3RzOwo=