From 39016ce7675179bd94fc4aee2e199957da2f515c Mon Sep 17 00:00:00 2001
From: Tjeerd Ritsma <tjeerd@mollie.com>
Date: Wed, 20 Jun 2018 19:25:59 +0200
Subject: [PATCH 1/2] Make sure content-type override also works on files

---
 src/init.c | 6 ------
 src/load.c | 6 +++++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/init.c b/src/init.c
index 45f788f..92b9824 100644
--- a/src/init.c
+++ b/src/init.c
@@ -160,12 +160,6 @@ init_config( void )
       "Mozilla/5.0 (%s) Siege/%s", PLATFORM, version_string 
     );
 
-  if (strlen(my.conttype) < 1) 
-    snprintf( 
-      my.conttype, sizeof(my.conttype),
-      "application/x-www-form-urlencoded"
-    );
-
   if (strlen(my.encoding) < 1)
     snprintf(
       my.encoding, sizeof(my.encoding), "*"
diff --git a/src/load.c b/src/load.c
index 506633d..79f62ce 100644
--- a/src/load.c
+++ b/src/load.c
@@ -294,7 +294,11 @@ load_file(URL U, char *file)
   fclose(fp); 
 
   if (len > 0) {
-    url_set_conttype(U, get_content_type(filename));
+    if (strlen(my.conttype) > 0) {
+      url_set_conttype(U, my.conttype);
+    } else {
+      url_set_conttype(U, get_content_type(filename));
+    }
     url_set_postdata(U, buf, len);
   } 
 

From 89f74a696646bf792e5f9ce420471b286f886cdf Mon Sep 17 00:00:00 2001
From: Tjeerd Ritsma <tjeerd@mollie.com>
Date: Wed, 20 Jun 2018 19:42:17 +0200
Subject: [PATCH 2/2] Codestyle: Minor change to have the if statement like the
 others

---
 src/load.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/load.c b/src/load.c
index 79f62ce..d268751 100644
--- a/src/load.c
+++ b/src/load.c
@@ -294,7 +294,7 @@ load_file(URL U, char *file)
   fclose(fp); 
 
   if (len > 0) {
-    if (strlen(my.conttype) > 0) {
+    if (strlen(my.conttype) < 1) {
       url_set_conttype(U, my.conttype);
     } else {
       url_set_conttype(U, get_content_type(filename));