Use index.html as filename for conditional-get when file is missing in URI

Previously we disabled conditional-get if file part is missing in URI.
But we use constant string "index.html" in this case, so we can do the
same to determine the modification time.  In this patch, if we have
file part in URI, we are not going to set absolute file path in
FileEntry, since it prevents content-disposition from working.

1 files changed, 24 insertions, 18 deletions

diff --git a/src/HttpRequestCommand.cc b/src/HttpRequestCommand.cc
index c92d2a4f..1b3f4072 100644
--- a/src/HttpRequestCommand.cc
+++ b/src/HttpRequestCommand.cc
@@ -145,25 +145,31 @@ bool HttpRequestCommand::executeInternal() {
       if(getOption()->getAsBool(PREF_CONDITIONAL_GET) &&
          (getRequest()->getProtocol() == "http" ||
           getRequest()->getProtocol() == "https")) {
-        if(getFileEntry()->getPath().empty() &&
-           getRequest()->getFile().empty()) {
-          A2_LOG_DEBUG("Conditional-Get is disabled because file name"
-                       " is not available.");
+
+        std::string path;
+
+        if(getFileEntry()->getPath().empty()) {
+          auto& file = getRequest()->getFile();
+
+          // If filename part of URI is empty, we just use
+          // Request::DEFAULT_FILE, since it is the name we use to
+          // store file in disk.
+
+          path = util::createSafePath
+            (getOption()->get(PREF_DIR),
+             (getRequest()->getFile().empty() ?
+              Request::DEFAULT_FILE :
+              util::percentDecode(std::begin(file), std::end(file))));
         } else {
-          if(getFileEntry()->getPath().empty()) {
-            getFileEntry()->setPath
-              (util::createSafePath
-               (getOption()->get(PREF_DIR),
-                util::percentDecode(getRequest()->getFile().begin(),
-                                    getRequest()->getFile().end())));
-          }
-          File ctrlfile(getFileEntry()->getPath()+
-                        DefaultBtProgressInfoFile::getSuffix());
-          File file(getFileEntry()->getPath());
-          if(!ctrlfile.exists() && file.exists()) {
-            httpRequest->setIfModifiedSinceHeader
-              (file.getModifiedTime().toHTTPDate());
-          }
+          path = getFileEntry()->getPath();
+        }
+
+        File ctrlfile(path + DefaultBtProgressInfoFile::getSuffix());
+        File file(path);
+
+        if(!ctrlfile.exists() && file.exists()) {
+          httpRequest->setIfModifiedSinceHeader
+            (file.getModifiedTime().toHTTPDate());
         }
       }
       httpConnection_->sendRequest(std::move(httpRequest));