--- url.c.orig	2014-01-09 10:55:49.000000000 -0800
+++ url.c	2014-01-09 11:38:41.000000000 -0800
@@ -1889,13 +1889,23 @@
     break;
   case CURLOPT_SSL_VERIFYPEER:
     /*
-     * Enable peer SSL verifying.
+     * Enable peer SSL verifying. Default true.
      */
-    data->set.ssl.verifypeer = (0 != va_arg(param, long))?TRUE:FALSE;
+	arg = va_arg(param, long);
+	switch (arg) {
+		case 0:
+			data->set.ssl.verifypeer = FALSE;
+			break;
+		case 1:
+			data->set.ssl.verifypeer = TRUE;
+			break;
+		default:
+			data->set.ssl.verifypeer = TRUE;
+	}
     break;
   case CURLOPT_SSL_VERIFYHOST:
     /*
-     * Enable verification of the host name in the peer certificate
+     * Enable verification of the host name in the peer certificate. Default false.
      */
     arg = va_arg(param, long);
 
@@ -1904,12 +1914,19 @@
        1 as a sensible input and we warn about its use. Then we only have the
        2 action internally stored as TRUE. */
 
-    if(1 == arg) {
-      failf(data, "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!");
-      return CURLE_BAD_FUNCTION_ARGUMENT;
-    }
-
-    data->set.ssl.verifyhost = (0 != arg)?TRUE:FALSE;
+	switch (arg) {
+		case 0:
+			data->set.ssl.verifyhost = FALSE;
+			break;
+		case 1:
+			failf(data, "CURLOPT_SSL_VERIFYHOST no longer supports 1 as value!");
+			return CURLE_BAD_FUNCTION_ARGUMENT;
+		case 2:
+			data->set.ssl.verifyhost = TRUE;
+			break;
+		default:
+			data->set.ssl.verifyhost = FALSE;
+	}
     break;
 #ifdef USE_SSLEAY
     /* since these two options are only possible to use on an OpenSSL-