Mercurial > hg > orthanc
comparison OrthancFramework/Sources/Toolbox.cpp @ 5143:95d8e0540219
avoid double '/' in HttpClient uri
| author | Alain Mazy <am@osimis.io> |
|---|---|
| date | Wed, 25 Jan 2023 17:56:09 +0100 |
| parents | 859f3668c181 |
| children | de7a639c5ad2 |
comparison
equal
deleted
inserted
replaced
| 5142:45ce9dfa42e0 | 5143:95d8e0540219 |
|---|---|
| 410 r += "/" + components[i]; | 410 r += "/" + components[i]; |
| 411 } | 411 } |
| 412 | 412 |
| 413 return r; | 413 return r; |
| 414 } | 414 } |
| 415 } | |
| 416 | |
| 417 std::string Toolbox::JoinUri(const std::string& base, const std::string& uri) | |
| 418 { | |
| 419 if (uri.size() > 0 && base.size() > 0) | |
| 420 { | |
| 421 if (base[base.size() - 1] == '/' && uri[0] == '/') | |
| 422 { | |
| 423 return base + uri.substr(1, uri.size() - 1); | |
| 424 } | |
| 425 else if (base[base.size() - 1] != '/' && uri[0] != '/') | |
| 426 { | |
| 427 return base + "/" + uri; | |
| 428 } | |
| 429 } | |
| 430 | |
| 431 return base + uri; | |
| 415 } | 432 } |
| 416 | 433 |
| 417 | 434 |
| 418 #if ORTHANC_ENABLE_MD5 == 1 | 435 #if ORTHANC_ENABLE_MD5 == 1 |
| 419 static char GetHexadecimalCharacter(uint8_t value) | 436 static char GetHexadecimalCharacter(uint8_t value) |