Swiftdiff options
| author | Kevin Smith <git@kismith.co.uk> | 2012-11-13 10:15:29 (GMT) |
|---|---|---|
| committer | Kevin Smith <git@kismith.co.uk> | 2012-11-13 10:50:15 (GMT) |
| commit | 59c1b26ba8f85bfb52f7c8e95bf1eca208d3de7b (patch) | |
| tree | 8b911fee527973ec3406640b0dfa8c7dcd6cf8b6 /Swiften/Base/URL.cpp | |
| parent | d26ad781dd4d1fa2019d31d5effabb9d662a8417 (diff) | |
| download | swift-59c1b26ba8f85bfb52f7c8e95bf1eca208d3de7b.zip swift-59c1b26ba8f85bfb52f7c8e95bf1eca208d3de7b.tar.bz2 | |
Allow BOSH URL setting again.
Also fixes use of getPort() so that HTTP headers aren't all for port :1.
Change-Id: I8ead8a7f4826d1105bf1feafea21e6139e803de7
Resolves: #1178
Diffstat (limited to 'Swiften/Base/URL.cpp')
| -rw-r--r-- | Swiften/Base/URL.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Swiften/Base/URL.cpp b/Swiften/Base/URL.cpp index 320e2ad..866cd45 100644 --- a/Swiften/Base/URL.cpp +++ b/Swiften/Base/URL.cpp @@ -36,25 +36,25 @@ URL URL::fromString(const std::string& urlString) { // Authority if (urlString.size() > colonIndex + 2 && urlString[colonIndex+1] == '/' && urlString[colonIndex+2] == '/') { size_t authorityIndex = colonIndex + 3; size_t slashIndex = urlString.find('/', authorityIndex); std::string authority; std::string path; if (slashIndex == std::string::npos) { authority = urlString.substr(authorityIndex); path = ""; } else { authority = urlString.substr(authorityIndex, slashIndex - authorityIndex); - path = unescape(urlString.substr(slashIndex + 1)); + path = unescape(urlString.substr(slashIndex)); } size_t atIndex = authority.find('@'); std::string userInfo; std::string hostAndPort; if (atIndex != std::string::npos) { userInfo = authority.substr(0, atIndex); hostAndPort = authority.substr(atIndex + 1); } else { userInfo = ""; hostAndPort = authority; |