1 files changed, 7 insertions, 4 deletions
diff --git a/lib/url.c b/lib/url.c
index 7d7865316..db7cf2ab5 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -376,6 +376,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
 {
   va_list param;
   char *argptr;
+  CURLcode result = CURLE_OK;
 
   va_start(param, option);
 
@@ -1145,11 +1146,11 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
       }
       else {
         failf(data, "SSL Engine '%s' not found", argptr);
-        return CURLE_SSL_ENGINE_NOTFOUND;
+        result = CURLE_SSL_ENGINE_NOTFOUND;
       }
 #else
       failf(data, "SSL Engine not supported");
-      return CURLE_SSL_ENGINE_NOTFOUND;
+      result = CURLE_SSL_ENGINE_NOTFOUND;
 #endif
     }
     break;
@@ -1424,9 +1425,11 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, ...)
 
   default:
     /* unknown tag and its companion, just ignore: */
-    return CURLE_FAILED_INIT; /* correct this */
+    result = CURLE_FAILED_INIT; /* correct this */
+    break;
   }
-  return CURLE_OK;
+  
+  return result;
 }
 
 CURLcode Curl_disconnect(struct connectdata *conn)