[Catalyst] More unicode problems (uri_for)

[Oleg Pronin]

SXQgc2VlbXMgeW91ciBwcm9ibGVtIGlzIHRoYXQgeW91ciBzdHJpbmcgIkNoZWNrIG15IMOlIiBp
cyBub3QgaW4gcGVybCdzCmludGVybmFsIGZvcm1hdCAodXJpX2ZvciBleHBlY3RzIGl0KS4gSnVz
dCBVVEYtOCBvY3RldHMuCkFsd2F5cyB1c2UgdXRmLTggZmxhZ2dlZCBzdHJpbmdzIGluc2lkZSB5
b3VyIGFwcGxpY2F0aW9uLgoKZm9yIGV4YW1wbGUsIHRoaXMgc2hvdWxkIHdvcms6CgpUaGUgZm9s
bG93aW5nIGNvZGU6CiAkYy0+cmVkaXJlY3QoCiAgJGMtPnVyaV9mb3IoCiAgICAnL2xvZ2luJywK
ICAgIHtlcnJvcl9tc2cgPT4gRW5jb2RlOjpkZWNvZGVfdXRmOCgiQ2hlY2sgbXkgw6UiKX0KICAp
OwogKTsKClVzZSAndXNlIHV0ZjgnIHByYWdtYSBpbiB0aGUgbW9kdWxlIGZvciBwZXJsIHRvIGF1
dG9tYXRpY2FsbHkgY29udmVydApsaXRlcmFscyB0byB1dGY4IHN0cmluZ3MuCgpCdXQgdXNpbmcg
c3VjaCBhIGxpdGVyYWxzIGluIHRoZSBzb3VyY2UgY29kZSBpcyB2ZXJ5IHZlcnkgYmFkLiBCZXR0
ZXIgcGxhY2UKaXQgc29tZXdoZXJlIGluIFRUIG9yIGNvbmZpZ3MuCgoyMDA3LzEyLzIxLCBLbnV0
LU9sYXYgSG92ZW4gPGhvdmVua29AbGlucHJvLm5vPjoKPgo+IFRoZSBzb2x1dGlvbiB0byBteSBs
YXN0IHByb2JsZW0gKGF0dGFjaGVkKSBicm91Z2h0IHVwIGEgbmV3IHByb2JsZW0KPiByZWdhcmRp
bmcKPiBVVEYtOC4KPgo+ID0gUHJvYmxlbSA9Cj4KPiBUaGUgZm9sbG93aW5nIGNvZGU6Cj4gJGMt
PnJlZGlyZWN0KAo+ICAgICRjOjp1cmlfZm9yKAo+ICAgICAgJy9sb2dpbicsCj4gICAgICB7ZXJy
b3JfbXNnID0+ICJDaGVjayBteSDDpSJ9Cj4gICAgKTsKPiApOwo+Cj4gR2l2ZXMgbWUgdGhpcyBV
UkwgaW4gbXkgYnJvd3NlcjoKPiBodHRwOi8vbG9jYWxob3N0OjMwMDAvbG9naW4/ZXJyb3JfbXNn
PUNoZWNrK215KyVDMyU4MyVDMiVBNQo+Cj4gV2hpY2ggcHJpbnRzIHRoaXMgb24gbXkgd2VicGFn
ZToKPiBDaGVjayBteSDDg8KlCj4KPiBUaGUgY29udGVudCB0eXBlIG9mIHRoZSB3ZWJwYWdlIGlz
IFVURi04Lgo+Cj4KPiA9IFBvc3NpYmxlIHNvbHV0aW9uID0KPgo+IFJlbW92ZSBsaW5lIDk2NyBm
cm9tIENhdGFseXN0LnBtICh2NS43MDExKToKPiAgICAgICAgICAgKG1hcCB7Cj4gICAgICAgICAg
ICAgICAkXyA9ICIkXyI7Cj4gIyBUSElTIE9ORSAgICAgICAgICAgICAgdXRmODo6ZW5jb2RlKCAk
XyApOwo+ICAgICAgICAgICAgICAgIyB1c2luZyB0aGUgVVJJOjpFc2NhcGUgcGF0dGVybiBoZXJl
IHNvIHV0ZjggY2hhcnMgc3Vydml2ZQo+ICAgICAgICAgICAgICAgcy8oW15BLVphLXowLTlcLV8u
IX4qJygpIF0pLyRVUkk6OkVzY2FwZTo6ZXNjYXBlc3skMX0vZ287Cj4gICAgICAgICAgICAgICBz
LyAvKy9nOwo+ICAgICAgICAgICAgICAgIiR7a2V5fT0kXyI7IH0gKCByZWYgJHZhbCBlcSAnQVJS
QVknID8gQCR2YWwgOiAkdmFsICkpOwo+Cj4KPiA9IFF1ZXN0aW9ucyA9Cj4KPiAtIEl0IHdvcmtz
IGFzIGEgc29sdXRpb24gdG8gbWUsIGRvZXMgaXQgYnJlYWsgYW55dGhpbmcgZm9yIG90aGVycz8K
PiAtIFdoeSBpcyB0aGF0IGxpbmUgdGhlcmUgYXQgYWxsPwo+IC0gU2hvdWxkbid0IFVSSTo6RXNj
YXBlIGJlIGVub3VnaD8KPgo+Cj4KPiAtLQo+IEtudXQtT2xhdiBIb3Zlbgo+IFN5c3RlbXV0dmlr
bGVyICAgICAgICAgICAgICAgbW9iOiArNDcgOTg2IDcxIDcwMAo+IExpbnBybyBBUyAgICAgICAg
ICAgICAgICAgICAgaHR0cDovL3d3dy5saW5wcm8ubm8vCj4KPgo+IC0tLS0tLS0tLS0g0J/QtdGA
0LXRgdC70LDQvdC90L7QtSDQv9C40YHRjNC80L4gLS0tLS0tLS0tLQo+IEZyb206IEtudXQtT2xh
diBIb3ZlbiA8aG92ZW5rb0BsaW5wcm8ubm8+Cj4gVG86IFRoZSBlbGVnYW50IE1WQyB3ZWIgZnJh
bWV3b3JrIDxjYXRhbHlzdEBsaXN0cy5zY3N5cy5jby51az4KPiBEYXRlOiBGcmksIDIxIERlYyAy
MDA3IDE3OjQzOjI4ICswMTAwCj4gU3ViamVjdDogW0NhdGFseXN0XSBQcm9ibGVtIHdpdGggQ2F0
YWx5c3Q6OlBsdWdpbjo6STE4TiB1c2luZyBVVEYtOAo+IFRoZXJlIGFyZSBzb21lIHByb2JsZW1z
IHdoZW4gdHJhbnNsYXRpbmcgd2l0aCBDYXRhbHlzdDo6UGx1Z2luOjpJMThOIHVzaW5nCj4gc3Bl
Y2lhbCB1bmljb2RlIGNoYXJhY3RlcnMgbGlrZSAiw6bDuMOlIi4KPgo+IEl0IGdvdCBwcmludGVk
IChib3RoIGluIGNvbnNvbGUvZGVidWdnaW5nKSBhbmQgaW4gd2ViIGJyb3dzZXIpIGFzCj4gdW5w
cmludGFibGUKPiBjaGFyYWN0ZXJzIChkaXNwbGF5ZWQgYXMgIj8iKS4gTWFudWFsbHkgY2hhbmdp
bmcgZW5jb2RpbmcgaW4gRmlyZWZveCB0bwo+IElTTy04ODU5LTEgbWFkZSBpdCBsb29rIHJpZ2h0
LCBidXQgdGhlIHJlc3Qgb2YgdGhlIHBhZ2UgaXMgdXNpbmcgVVRGLTgsIHNvCj4gdGhpcyB3YXMg
YSBuby1nbyBzb2x1dGlvbiBmb3IgbWUuCj4KPiBUaGUgc29sdXRpb24gSSBmb3VuZCB0byB0aGlz
IHdhcyB0byBjaGFuZ2UgbGluZSA2NSBvZgo+IENhdGFseXN0L1BsdWdpbi9JMThOLnBtCj4gKHZl
cnNpb24gMC4wNiksIGNoYW5nZWQgdGhlIERlY29kZSBhdHRyaWJ1dGUgZ2l2ZW4KPiB0byAiTG9j
YWxlOjpNYWtldGV4dDo6U2ltcGxlIiBmcm9tIDEgdG8gMC4KPgo+IEFueSBwYXJ0aWN1bGFyIHJl
YXNvbiB3aHkgRGVjb2RlIHdhcyAxPwo+Cj4gSWYgRGVjb2RlPT4xIGlzIG5lZWRlZCBmb3Igc29t
ZWJvZHksIHRoaXMgc2hvdWxkIGRlZmluaXRlbHkgYmUgYQo+IGNvbmZpZ3VyYWJsZQo+IG9wdGlv
bi4KPgo+Cj4gUGF0Y2ggYXR0YWNoZWQKPgo+IC0tCj4gS251dC1PbGF2IEhvdmVuCj4gU3lzdGVt
dXR2aWtsZXIgICAgICAgICAgICAgICBtb2I6ICs0NyA5ODYgNzEgNzAwCj4gTGlucHJvIEFTICAg
ICAgICAgICAgICAgICAgICBodHRwOi8vd3d3LmxpbnByby5uby8KPgo+IF9fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fCj4gTGlzdDogQ2F0YWx5c3RAbGlzdHMu
c2NzeXMuY28udWsKPiBMaXN0aW5mbzogaHR0cDovL2xpc3RzLnNjc3lzLmNvLnVrL2NnaS1iaW4v
bWFpbG1hbi9saXN0aW5mby9jYXRhbHlzdAo+IFNlYXJjaGFibGUgYXJjaGl2ZToKPiBodHRwOi8v
d3d3Lm1haWwtYXJjaGl2ZS5jb20vY2F0YWx5c3RAbGlzdHMucmF3bW9kZS5vcmcvCj4gRGV2IHNp
dGU6IGh0dHA6Ly9kZXYuY2F0YWx5c3QucGVybC5vcmcvCj4KPiBfX19fX19fX19fX19fX19fX19f
X19fX19fX19fX19fX19fX19fX19fX19fX19fXwo+IExpc3Q6IENhdGFseXN0QGxpc3RzLnNjc3lz
LmNvLnVrCj4gTGlzdGluZm86IGh0dHA6Ly9saXN0cy5zY3N5cy5jby51ay9jZ2ktYmluL21haWxt
YW4vbGlzdGluZm8vY2F0YWx5c3QKPiBTZWFyY2hhYmxlIGFyY2hpdmU6Cj4gaHR0cDovL3d3dy5t
YWlsLWFyY2hpdmUuY29tL2NhdGFseXN0QGxpc3RzLnJhd21vZGUub3JnLwo+IERldiBzaXRlOiBo
dHRwOi8vZGV2LmNhdGFseXN0LnBlcmwub3JnLwo+Cj4KPgotLS0tLS0tLS0tLS0tLSBuZXh0IHBh
cnQgLS0tLS0tLS0tLS0tLS0KQW4gSFRNTCBhdHRhY2htZW50IHdhcyBzY3J1YmJlZC4uLgpVUkw6
IGh0dHA6Ly9saXN0cy5zY3N5cy5jby51ay9waXBlcm1haWwvY2F0YWx5c3QvYXR0YWNobWVudHMv
MjAwNzEyMjQvMzkwYjA2MTAvYXR0YWNobWVudC5odG0K