Merge remote-tracking branch 'origin/feat/ignore-times' into dev

# Conflicts:
#	src/shared/config.c
#	tests/integration/test_features.py
#	tests/test_client_cli.c
#	tests/test_config.c

src/shared/file_receive.c

@@ -378,7 +378,8 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
     close(old_fd);
   }
 
-  bool match = has_old_file && (unsigned long long)st.st_size == check_size;
+  bool match =
+      !config->ignore_times && has_old_file && (unsigned long long)st.st_size == check_size;
   if (match && config->checksum) {
     uint64_t old_checksum = old_size == 0 ? delta_xxhash64("", 0) : 0;
     if (old_data)
@@ -427,6 +428,8 @@ File* receive_incremental_check(int fd, const Config* config, bool* skipped) {
   }
 
   if (!try_delta) {
+    free(old_data);
+    old_data = NULL;
     if (!send_status(fd, STATUS_NEXT)) {
       free(full_path);
       free(check_path);