More compatibility with non RFC-compliant servers

Signed-off-by: Steven Barth <steven@midlink.org>