From e1dfe8cee619be2db2dcccfae5381376d336c6a3 Mon Sep 17 00:00:00 2001 From: Regina Pfeifer Date: Tue, 20 Nov 2018 15:44:17 +0100 Subject: CTest: Don't require 'submit.php?' in submit location Fixes: #18611 --- Source/CTest/cmCTestSubmitHandler.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Source/CTest/cmCTestSubmitHandler.cxx b/Source/CTest/cmCTestSubmitHandler.cxx index 98872a5..d57b55e 100644 --- a/Source/CTest/cmCTestSubmitHandler.cxx +++ b/Source/CTest/cmCTestSubmitHandler.cxx @@ -1084,8 +1084,10 @@ int cmCTestSubmitHandler::HandleCDashUploadFile(std::string const& file, std::string dropMethod; std::string url; this->ConstructCDashURL(dropMethod, url); - std::string::size_type pos = url.find("submit.php?"); - url = url.substr(0, pos + 10); + std::string::size_type pos = url.find('?'); + if (pos != std::string::npos) { + url = url.substr(0, pos); + } if (!(dropMethod == "http" || dropMethod == "https")) { cmCTestLog(this->CTest, ERROR_MESSAGE, "Only http and https are supported for CDASH_UPLOAD\n"); -- cgit v0.12