Commit 181b08ba authored by Jan Van Boghout's avatar Jan Van Boghout Committed by Daniel Stenberg
Browse files

CUSTOMREQUEST: shouldn't be disabled when HTTP is disabled 

... since FTP is using it as well, and potentially other protocols!

Also, an #endif CURL_DISABLE_HTTP was incorrectly marked, as it seems to
end the proxy block instead.
parent 7abf3b97

lib/url.c

+16 −15
Original line number Diff line number Diff line
@@ -1404,19 +1404,6 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
    data->set.httpversion = va_arg(param, long);

    break;



  case CURLOPT_CUSTOMREQUEST:

    /*

     * Set a custom string to use as request

     */

    result = setstropt(&data->set.str[STRING_CUSTOMREQUEST],

                       va_arg(param, char *));



    /* we don't set

       data->set.httpreq = HTTPREQ_CUSTOM;

       here, we continue as if we were using the already set type

       and this just changes the actual request keyword */

    break;



  case CURLOPT_HTTPAUTH:

    /*

     * Set HTTP Authentication type BITMASK.
@@ -1448,6 +1435,21 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
  }

  break;



#endif   /* CURL_DISABLE_HTTP */



  case CURLOPT_CUSTOMREQUEST:

    /*

     * Set a custom string to use as request

     */

    result = setstropt(&data->set.str[STRING_CUSTOMREQUEST],

                       va_arg(param, char *));



    /* we don't set

       data->set.httpreq = HTTPREQ_CUSTOM;

       here, we continue as if we were using the already set type

       and this just changes the actual request keyword */

    break;



#ifndef CURL_DISABLE_PROXY

  case CURLOPT_HTTPPROXYTUNNEL:

    /*
@@ -1492,7 +1494,6 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
    data->set.proxyauth = auth;

  }

  break;

#endif   /* CURL_DISABLE_HTTP */



  case CURLOPT_PROXY:

    /*
@@ -1532,7 +1533,7 @@ CURLcode Curl_setopt(struct SessionHandle *data, CURLoption option, 
      break;

    }

    break;

#endif

#endif   /* CURL_DISABLE_PROXY */



#if defined(HAVE_GSSAPI) || defined(USE_WINDOWS_SSPI)

  case CURLOPT_SOCKS5_GSSAPI_SERVICE: