Commit 7da064fd authored by Jay Satiro's avatar Jay Satiro
Browse files

http: Add some include guards for the new HTTP/2 stuff

parent 897a7b3a

lib/http.c

+4 −0
Original line number Diff line number Diff line
@@ -172,10 +172,12 @@ static CURLcode http_disconnect(struct connectdata *conn, bool dead_connection) 
{

  struct HTTP *http = conn->data->req.protop;

  (void)dead_connection;

#ifdef USE_NGHTTP2

  if(http) {

    Curl_add_buffer_free(http->header_recvbuf);

    http->header_recvbuf = NULL; /* clear the pointer */

  }

#endif

  return CURLE_OK;

}
@@ -1484,11 +1486,13 @@ CURLcode Curl_http_done(struct connectdata *conn, 
    http->send_buffer = NULL; /* clear the pointer */

  }



#ifdef USE_NGHTTP2

  if(http->header_recvbuf) {

    DEBUGF(infof(data, "free header_recvbuf!!\n"));

    Curl_add_buffer_free(http->header_recvbuf);

    http->header_recvbuf = NULL; /* clear the pointer */

  }

#endif



  if(HTTPREQ_POST_FORM == data->set.httpreq) {

    data->req.bytecount = http->readbytecount + http->writebytecount;

lib/http.h

+4 −0
Original line number Diff line number Diff line
@@ -154,6 +154,7 @@ struct HTTP { 
  void *send_buffer; /* used if the request couldn't be sent in one chunk,

                        points to an allocated send_buffer struct */



#ifdef USE_NGHTTP2

  /*********** for HTTP/2 we store stream-local data here *************/

  int32_t stream_id; /* stream we are interested in */
@@ -175,16 +176,19 @@ struct HTTP { 
  const uint8_t *upload_mem; /* points to a buffer to read from */

  size_t upload_len; /* size of the buffer 'upload_mem' points to */

  curl_off_t upload_left; /* number of bytes left to upload */

#endif

};



typedef int (*sending)(void); /* Curl_send */

typedef int (*recving)(void); /* Curl_recv */



#ifdef USE_NGHTTP2

/* h2 settings for this connection */

struct h2settings {

  uint32_t max_concurrent_streams;

  bool enable_push;

};

#endif





struct http_conn {