Unverified Commit 25fd1057 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

url: default to CURL_HTTP_VERSION_2TLS if built h2-enabled 

Closes #2709
parent d7c4213b

docs/libcurl/opts/CURLOPT_HTTP_VERSION.3

+4 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
.\" *                            | (__| |_| |  _ <| |___

.\" *                             \___|\___/|_| \_\_____|

.\" *

.\" * Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" * Copyright (C) 1998 - 2018, Daniel Stenberg, <daniel@haxx.se>, et al.

.\" *

.\" * This software is licensed as described in the file COPYING, which

.\" * you should have received as part of this distribution. The terms
@@ -60,7 +60,9 @@ prior knowledge that the server supports HTTP/2 straight away. HTTPS requests 
will still do HTTP/2 the standard way with negotiated protocol version in the

TLS handshake. (Added in 7.49.0)

.SH DEFAULT

CURL_HTTP_VERSION_NONE

Since curl 7.62.0: CURL_HTTP_VERSION_2TLS



Before that: CURL_HTTP_VERSION_1_1

.SH PROTOCOLS

HTTP

.SH EXAMPLE

lib/setopt.c

+2 −0
Original line number Diff line number Diff line
@@ -841,6 +841,8 @@ CURLcode Curl_vsetopt(struct Curl_easy *data, CURLoption option, 
#else

    if(arg > CURL_HTTP_VERSION_2_PRIOR_KNOWLEDGE)

      return CURLE_UNSUPPORTED_PROTOCOL;

    if(arg == CURL_HTTP_VERSION_NONE)

      arg = CURL_HTTP_VERSION_2TLS;

#endif

    data->set.httpversion = arg;

    break;

lib/url.c

+9 −9
Original line number Diff line number Diff line
@@ -516,25 +516,27 @@ CURLcode Curl_init_userdefined(struct Curl_easy *data) 
  set->wildcard_enabled = FALSE;

  set->chunk_bgn      = ZERO_NULL;

  set->chunk_end      = ZERO_NULL;



  /* tcp keepalives are disabled by default, but provide reasonable values for

   * the interval and idle times.

   */

  set->tcp_keepalive = FALSE;

  set->tcp_keepintvl = 60;

  set->tcp_keepidle = 60;

  set->tcp_fastopen = FALSE;

  set->tcp_nodelay = TRUE;



  set->ssl_enable_npn = TRUE;

  set->ssl_enable_alpn = TRUE;



  set->expect_100_timeout = 1000L; /* Wait for a second by default. */

  set->sep_headers = TRUE; /* separated header lists by default */

  set->buffer_size = READBUFFER_SIZE;

  set->upload_buffer_size = UPLOAD_BUFSIZE;

  set->happy_eyeballs_timeout = CURL_HET_DEFAULT;



  set->fnmatch = ZERO_NULL;

  set->maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */

  set->httpversion =

#ifdef USE_NGHTTP2

    CURL_HTTP_VERSION_2TLS

#else

    CURL_HTTP_VERSION_1_1

#endif

    ;

  Curl_http2_init_userset(set);

  return result;

}
@@ -594,8 +596,6 @@ CURLcode Curl_open(struct Curl_easy **curl) 


      data->progress.flags |= PGRS_HIDE;

      data->state.current_speed = -1; /* init to negative == impossible */

      data->set.fnmatch = ZERO_NULL;

      data->set.maxconnects = DEFAULT_CONNCACHE_SIZE; /* for easy handles */



      Curl_http2_init_state(&data->state);

    }