Fixed merge, don't know why this didn't happen automatically - maybe a leftover from the svn->git conversion

1 files changed, 31 insertions, 0 deletions

diff --git a/src/libstrongswan/plugins/curl/curl_fetcher.c b/src/libstrongswan/plugins/curl/curl_fetcher.c
index 4835f6461..e58188098 100644
--- a/src/libstrongswan/plugins/curl/curl_fetcher.c
+++ b/src/libstrongswan/plugins/curl/curl_fetcher.c
@@ -104,6 +104,10 @@ METHOD(fetcher_t, fetch, status_t,
 METHOD(fetcher_t, set_option, bool,
 	private_curl_fetcher_t *this, fetcher_option_t option, ...)
 {
+<<<<<<< HEAD
+=======
+	bool supported = TRUE;
+>>>>>>> upstream/4.5.1
 	va_list args;
 
 	va_start(args, option);
@@ -115,7 +119,11 @@ METHOD(fetcher_t, set_option, bool,
 
 			curl_easy_setopt(this->curl, CURLOPT_POSTFIELDS, (char*)data.ptr);
 			curl_easy_setopt(this->curl, CURLOPT_POSTFIELDSIZE, data.len);
+<<<<<<< HEAD
 			return TRUE;
+=======
+			break;
+>>>>>>> upstream/4.5.1
 		}
 		case FETCH_REQUEST_TYPE:
 		{
@@ -124,30 +132,53 @@ METHOD(fetcher_t, set_option, bool,
 
 			snprintf(header, BUF_LEN, "Content-Type: %s", request_type);
 			this->headers = curl_slist_append(this->headers, header);
+<<<<<<< HEAD
 			return TRUE;
+=======
+			break;
+>>>>>>> upstream/4.5.1
 		}
 		case FETCH_REQUEST_HEADER:
 		{
 			char *header = va_arg(args, char*);
 
 			this->headers = curl_slist_append(this->headers, header);
+<<<<<<< HEAD
 			return TRUE;
+=======
+			break;
+>>>>>>> upstream/4.5.1
 		}
 		case FETCH_HTTP_VERSION_1_0:
 		{
 			curl_easy_setopt(this->curl, CURLOPT_HTTP_VERSION,
 							 CURL_HTTP_VERSION_1_0);
+<<<<<<< HEAD
 			return TRUE;
+=======
+			break;
+>>>>>>> upstream/4.5.1
 		}
 		case FETCH_TIMEOUT:
 		{
 			curl_easy_setopt(this->curl, CURLOPT_CONNECTTIMEOUT,
 							 va_arg(args, u_int));
+<<<<<<< HEAD
 			return TRUE;
 		}
 		default:
 			return FALSE;
 	}
+=======
+			break;
+		}
+		default:
+			supported = FALSE;
+			break;
+	}
+	va_end(args);
+	return supported;
+>>>>>>> upstream/4.5.1
 }
 
 METHOD(fetcher_t, destroy, void,