From 5349ac1c367447c0c001e78b8d62b20886e5a992 Mon Sep 17 00:00:00 2001
From: Carlo Piovesan <piovesan.carlo@gmail.com>
Date: Mon, 28 Oct 2024 10:21:28 +0100
Subject: [PATCH] HTTPException no longer inherits from IOException

Mirrored from @Mytherin's https://github.com/duckdb/duckdb/pull/14585
---
 extension/httpfs/httpfs.cpp | 2 ++
 extension/httpfs/s3fs.cpp   | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/extension/httpfs/httpfs.cpp b/extension/httpfs/httpfs.cpp
index 3cd0711..01c69ad 100644
--- a/extension/httpfs/httpfs.cpp
+++ b/extension/httpfs/httpfs.cpp
@@ -146,6 +146,8 @@ HTTPFileSystem::RunRequestWithRetry(const std::function<duckdb_httplib_openssl::
 			}
 		} catch (IOException &e) {
 			caught_e = std::current_exception();
+		} catch (HTTPException &e) {
+			caught_e = std::current_exception();
 		}
 
 		// Note: all duckdb_httplib_openssl::Error types will be retried.
diff --git a/extension/httpfs/s3fs.cpp b/extension/httpfs/s3fs.cpp
index 01260b9..2a4de97 100644
--- a/extension/httpfs/s3fs.cpp
+++ b/extension/httpfs/s3fs.cpp
@@ -324,7 +324,11 @@ void S3FileSystem::UploadBuffer(S3FileHandle &file_handle, shared_ptr<S3WriteBuf
 			throw IOException("Unexpected response when uploading part to S3");
 		}
 
-	} catch (IOException &ex) {
+	} catch (std::exception &ex) {
+		ErrorData error(ex);
+		if (error.Type() != ExceptionType::IO && error.Type() != ExceptionType::HTTP) {
+			throw;
+		}
 		// Ensure only one thread sets the exception
 		bool f = false;
 		auto exchanged = file_handle.uploader_has_error.compare_exchange_strong(f, true);
@@ -333,7 +337,6 @@ void S3FileSystem::UploadBuffer(S3FileHandle &file_handle, shared_ptr<S3WriteBuf
 		}
 
 		NotifyUploadsInProgress(file_handle);
-
 		return;
 	}