157976 2016-05-21 18:56:38 -0700 Some applications truncates the last closing parenthesis in perf dashboard URL 2016-05-23 17:23:54 -0700 1 1 1 Unclassified WebKit Perf Dashboard WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa cdumez dbates rniwa sam simon.fraser slewis thorton oldest_to_newest 1195393 0 rniwa 2016-05-21 18:56:38 -0700 Some applications such as Mail and Radar truncates the second closing parenthesis then two closing parentheses appear in a URL. e.g. http://localhost/v3/#/charts?since=1461206272848&paneList=((102-5010)-(102-4987)-(102-4988)-(102-4989)-(102-4990)-(102-4991)-(102-4992)-(102-4993)-(102-4994)-(102-4995)-(102-4996)-(102-4997)-(102-4998)-(102-4999)-(102-5000)-(102-5001)-(102-5002)-(102-5003)-(102-5004)-(102-5005)-(102-5006)-(102-5007)-(102-5008)-(102-5009)) This makes perf dashboard URL less useful. 1195396 1 279547 rniwa 2016-05-21 19:05:00 -0700 Created attachment 279547 Fixes the bug 1195462 2 279547 dbates 2016-05-22 21:59:04 -0700 Comment on attachment 279547 Fixes the bug View in context: https://bugs.webkit.org/attachment.cgi?id=279547&action=review > Websites/perf.webkit.org/ChangeLog:10 > + parentheses, for example, is just fine in Radar as well as Apple Mail if the URL is short enough. Using other > + characters such as ] and } wouldn't work either because they would be %-escaped. At that point, we might as well How are these URLs getting into Radar and Apple Mail? By a human copying and pasting? The characters in {"]", "}", ")"} are all reserved characters per <https://tools.ietf.org/html/rfc3986> and can appear in a URL. Appendix C of the URI RFC, <https://tools.ietf.org/html/rfc3986>, suggests delimiting a URI by putting it "within double-quotes..., angle brackets..., or just by using whitespace" and states that "these wrappers do not form part of the URI." Can we make use of one of these wrappers? For example, <http://localhost/v3/#/charts?since=1461206272848&paneList=((102-5010)-(102-4987)-(102-4988)-(102-4989)-(102-4990)-(102-4991)-(102-4992)-(102-4993)-(102-4994)-(102-4995)-(102-4996)-(102-4997)-(102-4998)-(102-4999)-(102-5000)-(102-5001)-(102-5002)-(102-5003)-(102-5004)-(102-5005)-(102-5006)-(102-5007)-(102-5008)-(102-5009))>. 1195463 3 dbates 2016-05-22 22:01:25 -0700 (In reply to comment #2) For example, > <http://localhost/v3/#/charts?since=1461206272848&paneList=((102-5010)-(102- > 4987)-(102-4988)-(102-4989)-(102-4990)-(102-4991)-(102-4992)-(102-4993)-(102- > 4994)-(102-4995)-(102-4996)-(102-4997)-(102-4998)-(102-4999)-(102-5000)-(102- > 5001)-(102-5002)-(102-5003)-(102-5004)-(102-5005)-(102-5006)-(102-5007)-(102- > 5008)-(102-5009))>. Bugzilla does not seem to parse a URI within angle brackets correctly. Let's try using double quotes: "http://localhost/v3/#/charts?since=1461206272848&paneList=((102-5010)-(102-4987)-(102-4988)-(102-4989)-(102-4990)-(102-4991)-(102-4992)-(102-4993)-(102-4994)-(102-4995)-(102-4996)-(102-4997)-(102-4998)-(102-4999)-(102-5000)-(102-5001)-(102-5002)-(102-5003)-(102-5004)-(102-5005)-(102-5006)-(102-5007)-(102-5008)-(102-5009))" 1195464 4 dbates 2016-05-22 22:03:50 -0700 (In reply to comment #3) [...]Let's try using double quotes: > > "http://localhost/v3/#/charts?since=1461206272848&paneList=((102-5010)-(102- > 4987)-(102-4988)-(102-4989)-(102-4990)-(102-4991)-(102-4992)-(102-4993)-(102- > 4994)-(102-4995)-(102-4996)-(102-4997)-(102-4998)-(102-4999)-(102-5000)-(102- > 5001)-(102-5002)-(102-5003)-(102-5004)-(102-5005)-(102-5006)-(102-5007)-(102- > 5008)-(102-5009))" Bugzilla did not autolinkify this correctly :( 1195465 5 rniwa 2016-05-22 22:04:52 -0700 Huh, bugzilla strips both parentheses :( 1195656 6 279608 rniwa 2016-05-23 16:53:28 -0700 Created attachment 279608 Improved the fixup 1195661 7 279608 rniwa 2016-05-23 17:23:49 -0700 Comment on attachment 279608 Improved the fixup Clearing flags on attachment: 279608 Committed r201307: <http://trac.webkit.org/changeset/201307> 1195662 8 rniwa 2016-05-23 17:23:54 -0700 All reviewed patches have been landed. Closing bug. 279547 2016-05-21 19:05:00 -0700 2016-05-23 16:53:24 -0700 Fixes the bug bug-157976-20160521190602.patch text/plain 4139 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMjQ2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0MGQ0NWM0ZGUxMzUwNTAyOGZkMTc5MTI5MTUzMTQ3YzNhMDA1NTJiLi44YzFiMzI5ODIx Yjg3YmIzN2Y1MzE2NTVlMjU3MGM1N2UwZDU4ZDY2IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNi0wNS0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBTb21lIGFwcGxpY2F0aW9ucyB0cnVuY2F0ZXMgdGhlIGxh c3QgY2xvc2luZyBwYXJlbnRoZXNpcyBpbiBwZXJmIGRhc2hib2FyZCBVUkwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Nzk3NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHksIGRpZmZl cmVudCBhcHBsaWNhdGlvbnMgdXNlIGRpZmZlcmVudCBoZXVyaXN0aWNzIHRvIGRldGVybWluZSB0 aGUgZW5kIG9mIGVhY2ggVVJMLiBUd28gdHJhaWxpbmcKKyAgICAgICAgcGFyZW50aGVzZXMsIGZv ciBleGFtcGxlLCBpcyBqdXN0IGZpbmUgaW4gUmFkYXIgYXMgd2VsbCBhcyBBcHBsZSBNYWlsIGlm IHRoZSBVUkwgaXMgc2hvcnQgZW5vdWdoLiBVc2luZyBvdGhlcgorICAgICAgICBjaGFyYWN0ZXJz IHN1Y2ggYXMgXSBhbmQgfSB3b3VsZG4ndCB3b3JrIGVpdGhlciBiZWNhdXNlIHRoZXkgd291bGQg YmUgJS1lc2NhcGVkLiBBdCB0aGF0IHBvaW50LCB3ZSBtaWdodCBhcyB3ZWxsCisgICAgICAgIGFz ICUtZXNjYXBlIGV2ZXJ5dGhpbmcuCisKKyAgICAgICAgV29yayBhcm91bmQgdGhlIGJ1ZyBieSBw YXJzaW5nIHRoZSBVUkwgYXMgaWYgaXQgaGFkIG9uZSBleHRyYSAnKScgaWYgdGhlIHBhcnNpbmcg aGFkIGZhaWxlZC4gQWxzbyBzaG9ydGVuIHRoZSBjaGFydHMKKyAgICAgICAgcGFnZSdzIFVSTCBi eSBhdm9pZCBlbWl0dGluZyAiLW51bGwiIGZvciBlYWNoIHBhbmUgd2hlbiB0aGUgcGFuZSBkb2Vz bid0IGhhdmUgYSBjdXJyZW50bHkgc2VsZWN0ZWQgcG9pbnQgb3Igc2VsZWN0aW9uLgorICAgICAg ICBUaGlzIGltcHJvdmVzIHRoZSBvZGRzIG9mIHRoZSBlbnRpcmUgVVJMIGJlaW5nIHJlY29nbml6 ZWQgYnkgdmFyaW91cyBhcHBsaWNhdGlvbnMuCisKKyAgICAgICAgV2UgY291bGQsIGluIHRoZW9y eSwgaW1wbGVtZW50IHNvbWUgc29ydCBvZiBhIFVSTCBzaG9ydGVyIGJ1dCB0aGF0IGNhbiB3YWl0 IHVudGlsIHdoZW4gd2Ugc3VwcG9ydCByZWFsIHVzZXIgYWNjb3VudHMuCisKKyAgICAgICAgKiBw dWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qczoKKyAgICAgICAgKENoYXJ0UGFuZS5wcm90b3R5 cGUuc2VyaWFsaXplU3RhdGUpOiBEb24ndCBzZXJpYWxpemUgdGhlIHNlbGVjdGlvbiBvciB0aGUg Y3VycmVudCBwb2ludCBpZiBub3RoaW5nIGlzIHNlbGVjdGVkLgorICAgICAgICAqIHB1YmxpYy92 My9wYWdlcy9wYWdlLXJvdXRlci5qczoKKyAgICAgICAgKFBhZ2VSb3V0ZXIucHJvdG90eXBlLl9k ZXNlcmlhbGl6ZUhhc2hRdWVyeVZhbHVlKTogVHJ5IHBhcnNpbmcgdGhlIHZhbHVlIGFnYWluIHdp dGggb25lIGV4dHJhIF0gYXQgdGhlIGVuZCBpZgorICAgICAgICB0aGUgSlNPTiBwYXJzaW5nIGhh ZCBmYWlsZWQuCisKIDIwMTYtMDUtMTggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUGVyZiBkYXNoYm9hcmQgIkFkZCBwYW5lIiBzaG91bGQgbGlzdCBmaXJzdCBi eSB0ZXN0LCB0aGVuIGJ5IG1hY2hpbmUKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qcwppbmRleCBiYTA0M2YwM2NmYjUyNTQ2 NjY0ZWM3M2JiNTIxNDc0NTI3ZjBhYTMyLi44ZjM5YTAxZmZhZGQ0MjQxMzFlYjBiOGViZmQ0ODFh NGU3MTliYzY4IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yz L3BhZ2VzL2NoYXJ0LXBhbmUuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92My9wYWdlcy9jaGFydC1wYW5lLmpzCkBAIC0xNSwxMyArMTUsMTUgQEAgY2xhc3MgQ2hhcnRQ YW5lIGV4dGVuZHMgQ2hhcnRQYW5lQmFzZSB7CiAKICAgICBzZXJpYWxpemVTdGF0ZSgpCiAgICAg ewotICAgICAgICB2YXIgc2VsZWN0aW9uID0gdGhpcy5fbWFpbkNoYXJ0ID8gdGhpcy5fbWFpbkNo YXJ0LmN1cnJlbnRTZWxlY3Rpb24oKSA6IG51bGw7Ci0gICAgICAgIHZhciBwb2ludCA9IHRoaXMu X21haW5DaGFydCA/IHRoaXMuX21haW5DaGFydC5jdXJyZW50UG9pbnQoKSA6IG51bGw7Ci0gICAg ICAgIHJldHVybiBbCi0gICAgICAgICAgICB0aGlzLl9wbGF0Zm9ybUlkLAotICAgICAgICAgICAg dGhpcy5fbWV0cmljSWQsCi0gICAgICAgICAgICBzZWxlY3Rpb24gfHwgKHBvaW50ICYmIHRoaXMu X21haW5DaGFydEluZGljYXRvcldhc0xvY2tlZCA/IHBvaW50LmlkIDogbnVsbCksCi0gICAgICAg IF07CisgICAgICAgIHZhciBzdGF0ZSA9IFt0aGlzLl9wbGF0Zm9ybUlkLCB0aGlzLl9tZXRyaWNJ ZF07CisgICAgICAgIGlmICh0aGlzLl9tYWluQ2hhcnQpIHsKKyAgICAgICAgICAgIHZhciBzZWxl Y3Rpb24gPSB0aGlzLl9tYWluQ2hhcnQuY3VycmVudFNlbGVjdGlvbigpOworICAgICAgICAgICAg aWYgKHNlbGVjdGlvbikKKyAgICAgICAgICAgICAgICBzdGF0ZVsyXSA9IHNlbGVjdGlvbjsKKyAg ICAgICAgICAgIGVsc2UgaWYgKHRoaXMuX21haW5DaGFydEluZGljYXRvcldhc0xvY2tlZCkKKyAg ICAgICAgICAgICAgICBzdGF0ZVsyXSA9IHRoaXMuX21haW5DaGFydC5jdXJyZW50UG9pbnQoKS5p ZDsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gc3RhdGU7CiAgICAgfQogCiAgICAgdXBkYXRl RnJvbVNlcmlhbGl6ZWRTdGF0ZShzdGF0ZSwgaXNPcGVuKQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9wYWdlLXJvdXRlci5qcyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvcGFnZS1yb3V0ZXIuanMKaW5kZXggNmQw NGVmMTcwYzIxNWI2ZGFlYTE2M2UxZmMzMjlhYTg0MmE3YTYzNS4uZjkwNmU4YjNjNmQwNTliMThj OTdiMjliNzA4MWQyZDFjM2MyOTkxZiAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92My9wYWdlcy9wYWdlLXJvdXRlci5qcworKysgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3BhZ2Utcm91dGVyLmpzCkBAIC0xNDAsOSArMTQwLDE1 IEBAIGNsYXNzIFBhZ2VSb3V0ZXIgewogCiAgICAgX2Rlc2VyaWFsaXplSGFzaFF1ZXJ5VmFsdWUo dmFsdWUpCiAgICAgeworICAgICAgICB2YXIganNvbiA9IHZhbHVlLnJlcGxhY2UoL1soe10vZywg J1snKS5yZXBsYWNlKC9bKX1dL2csICddJykucmVwbGFjZSgvLS9nLCAnLCcpOwogICAgICAgICB0 cnkgewotICAgICAgICAgICAgcmV0dXJuIEpTT04ucGFyc2UodmFsdWUucmVwbGFjZSgvXCgvZywg J1snKS5yZXBsYWNlKC9cKS9nLCAnXScpLnJlcGxhY2UoLy0vZywgJywnKSk7CisgICAgICAgICAg ICByZXR1cm4gSlNPTi5wYXJzZShqc29uKTsKICAgICAgICAgfSBjYXRjaCAoZXJyb3IpIHsKKyAg ICAgICAgICAgIHRyeSB7CisgICAgICAgICAgICAgICAgLy8gU29tZSBhcHBsaWNhdGlvbnMgZG9u J3QgbGlua2lmeSB0d28gY29uc2VjdXRpdmUgY2xvc2luZyBwYXJlbnRoZXNlczogKSkuCisgICAg ICAgICAgICAgICAgLy8gVHJ5IGZpeGluZyBhZGRpbmcgb25lIGV4dHJhIHBhcmVudGhlc2lzIHRv IHNlZSBpZiB0aGF0IHdvcmtzLgorICAgICAgICAgICAgICAgIHJldHVybiBKU09OLnBhcnNlKGpz b24gKyAnXScpOworICAgICAgICAgICAgfSBjYXRjaCAobmV3RXJyb3IpIHsgfQogICAgICAgICAg ICAgcmV0dXJuIHZhbHVlOwogICAgICAgICB9CiAgICAgfQo= 279608 2016-05-23 16:53:28 -0700 2016-05-23 17:23:49 -0700 Improved the fixup bug-157976-20160523165434.patch text/plain 4442 rniwa U3VidmVyc2lvbiBSZXZpc2lvbjogMjAxMjQ2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA0MGQ0NWM0ZGUxMzUwNTAyOGZkMTc5MTI5MTUzMTQ3YzNhMDA1NTJiLi44YzFiMzI5ODIx Yjg3YmIzN2Y1MzE2NTVlMjU3MGM1N2UwZDU4ZDY2IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyNyBAQAorMjAxNi0wNS0yMSAgUnlvc3VrZSBOaXdhICA8cm5pd2FA d2Via2l0Lm9yZz4KKworICAgICAgICBTb21lIGFwcGxpY2F0aW9ucyB0cnVuY2F0ZXMgdGhlIGxh c3QgY2xvc2luZyBwYXJlbnRoZXNpcyBpbiBwZXJmIGRhc2hib2FyZCBVUkwKKyAgICAgICAgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1Nzk3NgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVuZm9ydHVuYXRlbHksIGRpZmZl cmVudCBhcHBsaWNhdGlvbnMgdXNlIGRpZmZlcmVudCBoZXVyaXN0aWNzIHRvIGRldGVybWluZSB0 aGUgZW5kIG9mIGVhY2ggVVJMLiBUd28gdHJhaWxpbmcKKyAgICAgICAgcGFyZW50aGVzZXMsIGZv ciBleGFtcGxlLCBpcyBqdXN0IGZpbmUgaW4gUmFkYXIgYXMgd2VsbCBhcyBBcHBsZSBNYWlsIGlm IHRoZSBVUkwgaXMgc2hvcnQgZW5vdWdoLiBVc2luZyBvdGhlcgorICAgICAgICBjaGFyYWN0ZXJz IHN1Y2ggYXMgXSBhbmQgfSB3b3VsZG4ndCB3b3JrIGVpdGhlciBiZWNhdXNlIHRoZXkgd291bGQg YmUgJS1lc2NhcGVkLiBBdCB0aGF0IHBvaW50LCB3ZSBtaWdodCBhcyB3ZWxsCisgICAgICAgIGFz ICUtZXNjYXBlIGV2ZXJ5dGhpbmcuCisKKyAgICAgICAgV29yayBhcm91bmQgdGhlIGJ1ZyBieSBw YXJzaW5nIHRoZSBVUkwgYXMgaWYgaXQgaGFkIG9uZSBleHRyYSAnKScgaWYgdGhlIHBhcnNpbmcg aGFkIGZhaWxlZC4gQWxzbyBzaG9ydGVuIHRoZSBjaGFydHMKKyAgICAgICAgcGFnZSdzIFVSTCBi eSBhdm9pZCBlbWl0dGluZyAiLW51bGwiIGZvciBlYWNoIHBhbmUgd2hlbiB0aGUgcGFuZSBkb2Vz bid0IGhhdmUgYSBjdXJyZW50bHkgc2VsZWN0ZWQgcG9pbnQgb3Igc2VsZWN0aW9uLgorICAgICAg ICBUaGlzIGltcHJvdmVzIHRoZSBvZGRzIG9mIHRoZSBlbnRpcmUgVVJMIGJlaW5nIHJlY29nbml6 ZWQgYnkgdmFyaW91cyBhcHBsaWNhdGlvbnMuCisKKyAgICAgICAgV2UgY291bGQsIGluIHRoZW9y eSwgaW1wbGVtZW50IHNvbWUgc29ydCBvZiBhIFVSTCBzaG9ydGVyIGJ1dCB0aGF0IGNhbiB3YWl0 IHVudGlsIHdoZW4gd2Ugc3VwcG9ydCByZWFsIHVzZXIgYWNjb3VudHMuCisKKyAgICAgICAgKiBw dWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qczoKKyAgICAgICAgKENoYXJ0UGFuZS5wcm90b3R5 cGUuc2VyaWFsaXplU3RhdGUpOiBEb24ndCBzZXJpYWxpemUgdGhlIHNlbGVjdGlvbiBvciB0aGUg Y3VycmVudCBwb2ludCBpZiBub3RoaW5nIGlzIHNlbGVjdGVkLgorICAgICAgICAqIHB1YmxpYy92 My9wYWdlcy9wYWdlLXJvdXRlci5qczoKKyAgICAgICAgKFBhZ2VSb3V0ZXIucHJvdG90eXBlLl9k ZXNlcmlhbGl6ZUhhc2hRdWVyeVZhbHVlKTogVHJ5IHBhcnNpbmcgdGhlIHZhbHVlIGFnYWluIHdp dGggb25lIGV4dHJhIF0gYXQgdGhlIGVuZCBpZgorICAgICAgICB0aGUgSlNPTiBwYXJzaW5nIGhh ZCBmYWlsZWQuCisKIDIwMTYtMDUtMTggIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgUGVyZiBkYXNoYm9hcmQgIkFkZCBwYW5lIiBzaG91bGQgbGlzdCBmaXJzdCBi eSB0ZXN0LCB0aGVuIGJ5IG1hY2hpbmUKZGlmZiAtLWdpdCBhL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qcyBiL1dlYnNpdGVzL3BlcmYud2Via2l0 Lm9yZy9wdWJsaWMvdjMvcGFnZXMvY2hhcnQtcGFuZS5qcwppbmRleCBiYTA0M2YwM2NmYjUyNTQ2 NjY0ZWM3M2JiNTIxNDc0NTI3ZjBhYTMyLi44ZjM5YTAxZmZhZGQ0MjQxMzFlYjBiOGViZmQ0ODFh NGU3MTliYzY4IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL3Yz L3BhZ2VzL2NoYXJ0LXBhbmUuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1Ymxp Yy92My9wYWdlcy9jaGFydC1wYW5lLmpzCkBAIC0xNSwxMyArMTUsMTUgQEAgY2xhc3MgQ2hhcnRQ YW5lIGV4dGVuZHMgQ2hhcnRQYW5lQmFzZSB7CiAKICAgICBzZXJpYWxpemVTdGF0ZSgpCiAgICAg ewotICAgICAgICB2YXIgc2VsZWN0aW9uID0gdGhpcy5fbWFpbkNoYXJ0ID8gdGhpcy5fbWFpbkNo YXJ0LmN1cnJlbnRTZWxlY3Rpb24oKSA6IG51bGw7Ci0gICAgICAgIHZhciBwb2ludCA9IHRoaXMu X21haW5DaGFydCA/IHRoaXMuX21haW5DaGFydC5jdXJyZW50UG9pbnQoKSA6IG51bGw7Ci0gICAg ICAgIHJldHVybiBbCi0gICAgICAgICAgICB0aGlzLl9wbGF0Zm9ybUlkLAotICAgICAgICAgICAg dGhpcy5fbWV0cmljSWQsCi0gICAgICAgICAgICBzZWxlY3Rpb24gfHwgKHBvaW50ICYmIHRoaXMu X21haW5DaGFydEluZGljYXRvcldhc0xvY2tlZCA/IHBvaW50LmlkIDogbnVsbCksCi0gICAgICAg IF07CisgICAgICAgIHZhciBzdGF0ZSA9IFt0aGlzLl9wbGF0Zm9ybUlkLCB0aGlzLl9tZXRyaWNJ ZF07CisgICAgICAgIGlmICh0aGlzLl9tYWluQ2hhcnQpIHsKKyAgICAgICAgICAgIHZhciBzZWxl Y3Rpb24gPSB0aGlzLl9tYWluQ2hhcnQuY3VycmVudFNlbGVjdGlvbigpOworICAgICAgICAgICAg aWYgKHNlbGVjdGlvbikKKyAgICAgICAgICAgICAgICBzdGF0ZVsyXSA9IHNlbGVjdGlvbjsKKyAg ICAgICAgICAgIGVsc2UgaWYgKHRoaXMuX21haW5DaGFydEluZGljYXRvcldhc0xvY2tlZCkKKyAg ICAgICAgICAgICAgICBzdGF0ZVsyXSA9IHRoaXMuX21haW5DaGFydC5jdXJyZW50UG9pbnQoKS5p ZDsKKyAgICAgICAgfQorICAgICAgICByZXR1cm4gc3RhdGU7CiAgICAgfQogCiAgICAgdXBkYXRl RnJvbVNlcmlhbGl6ZWRTdGF0ZShzdGF0ZSwgaXNPcGVuKQpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMv cGVyZi53ZWJraXQub3JnL3B1YmxpYy92My9wYWdlcy9wYWdlLXJvdXRlci5qcyBiL1dlYnNpdGVz L3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvdjMvcGFnZXMvcGFnZS1yb3V0ZXIuanMKaW5kZXggNmQw NGVmMTcwYzIxNWI2ZGFlYTE2M2UxZmMzMjlhYTg0MmE3YTYzNS4uY2M3ODJkNTY2MTVmYTc2NmZh YWQzZTQ2ZTUwZmQxZTM1YWI0YzJiMSAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQu b3JnL3B1YmxpYy92My9wYWdlcy9wYWdlLXJvdXRlci5qcworKysgYi9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvcHVibGljL3YzL3BhZ2VzL3BhZ2Utcm91dGVyLmpzCkBAIC0xNDAsOSArMTQwLDI0 IEBAIGNsYXNzIFBhZ2VSb3V0ZXIgewogCiAgICAgX2Rlc2VyaWFsaXplSGFzaFF1ZXJ5VmFsdWUo dmFsdWUpCiAgICAgeworICAgICAgICB2YXIganNvbiA9IHZhbHVlLnJlcGxhY2UoL1woL2csICdb JykucmVwbGFjZSgvXCkvZywgJ10nKS5yZXBsYWNlKC8tL2csICcsJyk7CiAgICAgICAgIHRyeSB7 Ci0gICAgICAgICAgICByZXR1cm4gSlNPTi5wYXJzZSh2YWx1ZS5yZXBsYWNlKC9cKC9nLCAnWycp LnJlcGxhY2UoL1wpL2csICddJykucmVwbGFjZSgvLS9nLCAnLCcpKTsKKyAgICAgICAgICAgIHJl dHVybiBKU09OLnBhcnNlKGpzb24pOwogICAgICAgICB9IGNhdGNoIChlcnJvcikgeworCisgICAg ICAgICAgICAvLyBTb21lIGFwcGxpY2F0aW9ucyBkb24ndCBsaW5raWZ5IHR3byBjb25zZWN1dGl2 ZSBjbG9zaW5nIHBhcmVudGhlc2VzOiApKS4KKyAgICAgICAgICAgIC8vIFRyeSBmaXhpbmcgYWRk aW5nIG9uZSBleHRyYSBwYXJlbnRoZXNpcyB0byBzZWUgaWYgdGhhdCB3b3Jrcy4KKyAgICAgICAg ICAgIGZ1bmN0aW9uIGNvdW50KHJlZ2V4KQorICAgICAgICAgICAgeworICAgICAgICAgICAgICAg IHZhciBtYXRjaCA9IGpzb24ubWF0Y2gocmVnZXgpOworICAgICAgICAgICAgICAgIHJldHVybiBt YXRjaCA/IG1hdGNoLmxlbmd0aCA6IDA7CisgICAgICAgICAgICB9CisgICAgICAgICAgICB2YXIg bWlzc2luZ0Nsb3NpbmdCcmFja2V0cyA9IGNvdW50KC9cWy9nKSAtIGNvdW50KC9cXS9nKTsKKyAg ICAgICAgICAgIHZhciBmaXggPSBuZXcgQXJyYXkobWlzc2luZ0Nsb3NpbmdCcmFja2V0cykuZmls bCgnXScpLmpvaW4oJycpOworICAgICAgICAgICAgdHJ5IHsKKyAgICAgICAgICAgICAgICByZXR1 cm4gSlNPTi5wYXJzZShqc29uICsgZml4KTsKKyAgICAgICAgICAgIH0gY2F0Y2ggKG5ld0Vycm9y KSB7IH0KKwogICAgICAgICAgICAgcmV0dXJuIHZhbHVlOwogICAgICAgICB9CiAgICAgfQo=