Comment 6 for bug 597143

I fixed the problem slightly differently, to deal with the case where username and password are already encoded; utf-8 encoding is only applied when the parameter in question is a unicode string.

Fix committed in r117102 for trunk, r117103 for the 3.7 branch.