Commit adb4e41a authored by Alessandro Ghedini's avatar Alessandro Ghedini Committed by Daniel Stenberg
Browse files

polarssl: make it possible to enable ALPN/NPN without HTTP2

parent 42bc45be

lib/vtls/polarssl.c

+24 −22
Original line number Diff line number Diff line
@@ -118,12 +118,9 @@ static void polarssl_debug(void *context, int level, const char *line) 
#endif



/* ALPN for http2? */

#ifdef USE_NGHTTP2

#  undef HAS_ALPN

#ifdef POLARSSL_SSL_ALPN

#  define HAS_ALPN

#endif

#endif



static Curl_recv polarssl_recv;

static Curl_send polarssl_send;
@@ -357,16 +354,23 @@ polarssl_connect_step1(struct connectdata *conn, 
  }



#ifdef HAS_ALPN

  if(data->set.httpversion == CURL_HTTP_VERSION_2_0) {

  if(data->set.ssl_enable_alpn) {

      static const char* protocols[] = {

        NGHTTP2_PROTO_VERSION_ID, ALPN_HTTP_1_1, NULL

      };

      ssl_set_alpn_protocols(&connssl->ssl, protocols);

      infof(data, "ALPN, offering %s, %s\n", protocols[0],

            protocols[1]);

      connssl->asked_for_h2 = TRUE;

    static const char* protocols[3];

    int cur = 0;



#ifdef USE_NGHTTP2

    if(data->set.httpversion == CURL_HTTP_VERSION_2_0) {

      protocols[cur++] = NGHTTP2_PROTO_VERSION_ID;

      infof(data, "ALPN, offering %s\n", NGHTTP2_PROTO_VERSION_ID);

    }

#endif



    protocols[cur++] = ALPN_HTTP_1_1;

    infof(data, "ALPN, offering %s\n", ALPN_HTTP_1_1);



    protocols[cur] = NULL;



    ssl_set_alpn_protocols(&connssl->ssl, protocols);

  }

#endif
@@ -388,10 +392,6 @@ polarssl_connect_step2(struct connectdata *conn, 
  struct ssl_connect_data* connssl = &conn->ssl[sockindex];

  char buffer[1024];



#ifdef HAS_ALPN

  const char* next_protocol;

#endif



  char errorbuf[128];

  errorbuf[0] = 0;
@@ -461,23 +461,25 @@ polarssl_connect_step2(struct connectdata *conn, 


#ifdef HAS_ALPN

  if(data->set.ssl_enable_alpn) {

    next_protocol = ssl_get_alpn_protocol(&connssl->ssl);

    const char *next_protocol = ssl_get_alpn_protocol(&connssl->ssl);



    if(next_protocol != NULL) {

      infof(data, "ALPN, server accepted to use %s\n", next_protocol);



#ifdef USE_NGHTTP2

      if(!strncmp(next_protocol, NGHTTP2_PROTO_VERSION_ID,

                  NGHTTP2_PROTO_VERSION_ID_LEN)) {

        conn->negnpn = NPN_HTTP2;

      }

      else if(!strncmp(next_protocol, ALPN_HTTP_1_1, ALPN_HTTP_1_1_LENGTH)) {

      else

#endif

      if(!strncmp(next_protocol, ALPN_HTTP_1_1, ALPN_HTTP_1_1_LENGTH)) {

        conn->negnpn = NPN_HTTP1_1;

      }

    }

    else if(connssl->asked_for_h2) {

    else

      infof(data, "ALPN, server did not agree to a protocol\n");

  }

  }

#endif



  connssl->connecting_state = ssl_connect_3;