... by removing the extra mutex locks around th call to
Curl_flush_cookies() which takes care of the locking itself already.

---
  lib/url.c | 11 +++++++----
  1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/lib/url.c b/lib/url.c
index 87ebe00..1d05975 100644
--- a/lib/url.c
+++ b/lib/url.c
@@ -1167,22 +1167,24 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
      argptr = va_arg(param, char *);
      if(argptr == NULL)
        break;
-    Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
-
      if(Curl_raw_equal(argptr, "ALL")) {
        /* clear all cookies */
+      Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
        Curl_cookie_clearall(data->cookies);
+      Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
      }
      else if(Curl_raw_equal(argptr, "SESS")) {
        /* clear session cookies */
+      Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
        Curl_cookie_clearsess(data->cookies);
+      Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
      }
      else if(Curl_raw_equal(argptr, "FLUSH")) {
-      /* flush cookies to file */
+      /* flush cookies to file, takes care of the locking */
        Curl_flush_cookies(data, 0);
      }
      else {
        if(!data->cookies)
          /* if cookie engine was not running, activate it */
@@ -1191,23 +1193,24 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option,
        argptr = strdup(argptr);
        if(!argptr) {
          result = CURLE_OUT_OF_MEMORY;
        }
        else {
+        Curl_share_lock(data, CURL_LOCK_DATA_COOKIE, CURL_LOCK_ACCESS_SINGLE);
          if(checkprefix("Set-Cookie:", argptr))
            /* HTTP Header format line */
            Curl_cookie_add(data, data->cookies, TRUE, argptr + 11, NULL, NULL);
          else
            /* Netscape format line */
            Curl_cookie_add(data, data->cookies, FALSE, argptr, NULL, NULL);
+        Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
          free(argptr);
        }
      }
-    Curl_share_unlock(data, CURL_LOCK_DATA_COOKIE);
      break;
  #endif /* CURL_DISABLE_COOKIES */
    case CURLOPT_HTTPGET:
-- 
2.0.1
-- 
  / daniel.haxx.se
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html