Commit 47d76071 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

curl: bail on cookie use when built with disabled cookies

parent 5fe87955

src/tool_operate.c

+14 −12
Original line number Diff line number Diff line
@@ -1071,9 +1071,6 @@ static CURLcode operate_do(struct GlobalConfig *global, 
        my_setopt_slist(curl, CURLOPT_PREQUOTE, config->prequote);



#if !defined(CURL_DISABLE_HTTP) && !defined(CURL_DISABLE_COOKIES)

        {

          /* TODO: Make this a run-time check instead of compile-time one. */



        if(config->cookie)

          my_setopt_str(curl, CURLOPT_COOKIE, config->cookie);
@@ -1086,6 +1083,11 @@ static CURLcode operate_do(struct GlobalConfig *global, 


        /* new in libcurl 7.9.7 */

        my_setopt(curl, CURLOPT_COOKIESESSION, config->cookiesession?1L:0L);

#else

        if(config->cookie || config->cookiefile || config->cookiejar) {

          warnf(config, "cookie option(s) used even though cookie support "

                "is disabled!\n");

          return CURLE_NOT_BUILT_IN;

        }

#endif