Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2012-09-17 11:52:40 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2012-09-17 18:01:27 (GMT) |
| commit | d1aaf7fc9b9da32f04f84eef06bc0ee731e79223 (patch) | |
| tree | 14ecd64cfd4b44e2664170983a5a0fefc47a03fd /Swiften/Base/URL.cpp | |
| parent | 3d6aa3b50090c19b50ae488494f1459bade88da3 (diff) | |
| download | swift-contrib-d1aaf7fc9b9da32f04f84eef06bc0ee731e79223.zip swift-contrib-d1aaf7fc9b9da32f04f84eef06bc0ee731e79223.tar.bz2 | |
Fixed URL parsing/serializing.
Resolves: #1157,#1158
Diffstat (limited to 'Swiften/Base/URL.cpp')
| -rw-r--r-- | Swiften/Base/URL.cpp | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/Swiften/Base/URL.cpp b/Swiften/Base/URL.cpp index c36863f..28fe6d3 100644 --- a/Swiften/Base/URL.cpp +++ b/Swiften/Base/URL.cpp @@ -87,6 +87,28 @@ URL URL::fromString(const std::string& urlString) { } } +// FIXME: Escape non-ascii characters +std::string URL::toString() const { + if (empty) { + return ""; + } + std::string result = scheme + "://"; + if (!user.empty()) { + result += user; + if (!password.empty()) { + result += ":" + password; + } + result += "@"; + } + result += host; + if (port) { + result += ":"; + result += boost::lexical_cast<std::string>(*port); + } + result += path; + return result; +} + // Disabling this code for now, since GCC4.5+boost1.42 (on ubuntu) seems to // result in a bug. Replacing it with naive code. #if 0 |