From f793a86af2b60869576db39e05c569f631f007d1 Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 27 Nov 2018 04:50:03 +0100 Subject: [PATCH] Bugfix: Remove file extensions from digest with no parameters in URL --- CMakeLists.txt | 2 +- src/http.cpp | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 166c08e..37c49ee 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,6 +1,6 @@ cmake_minimum_required (VERSION 3.2) project(libravatarserv - VERSION 0.4.0 + VERSION 0.4.1 LANGUAGES CXX ) diff --git a/src/http.cpp b/src/http.cpp index 9e3a1bb..773694b 100644 --- a/src/http.cpp +++ b/src/http.cpp @@ -41,13 +41,6 @@ const Request http::parse_request(const string &request) if (pos_digest != std::string::npos) { - digest = digest.substr(0, pos_digest); - pos_digest = digest.find('.'); - if (pos_digest != std::string::npos) - { - digest = digest.substr(0, pos_digest); - } - string answer; { answer = get_parameter(request, "s"); @@ -95,6 +88,14 @@ const Request http::parse_request(const string &request) } } + digest = digest.substr(0, pos_digest); + pos_digest = digest.find('.'); + if (pos_digest != std::string::npos) + { + digest = digest.substr(0, pos_digest); + } + cerr << digest << std::endl; + return { digest, size, fallback }; }