Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@
* @macro
* Version number of the nghttp2 library release
*/
#define NGHTTP2_VERSION "1.67.1"
#define NGHTTP2_VERSION "1.68.0"

/**
* @macro
* Numerical representation of the version number of the nghttp2 library
* release. This is a 24 bit number with 8 bits for major number, 8 bits
* for minor and 8 bits for patch. Version 1.2.3 becomes 0x010203.
*/
#define NGHTTP2_VERSION_NUM 0x014301
#define NGHTTP2_VERSION_NUM 0x014400

#endif /* NGHTTP2VER_H */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_alpn.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

#endif /* NGHTTP2_ALPN_H */
#endif /* !defined(NGHTTP2_ALPN_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_buf.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -409,4 +409,4 @@ int nghttp2_bufs_next_present(nghttp2_bufs *bufs);
*/
size_t nghttp2_bufs_len(nghttp2_bufs *bufs);

#endif /* NGHTTP2_BUF_H */
#endif /* !defined(NGHTTP2_BUF_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_callbacks.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -154,4 +154,4 @@ struct nghttp2_session_callbacks {
nghttp2_rand_callback rand_callback;
};

#endif /* NGHTTP2_CALLBACKS_H */
#endif /* !defined(NGHTTP2_CALLBACKS_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_debug.c
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,11 @@ void nghttp2_set_debug_vprintf_callback(
static_debug_vprintf_callback = debug_vprintf_callback;
}

#else /* !DEBUGBUILD */
#else /* !defined(DEBUGBUILD) */

void nghttp2_set_debug_vprintf_callback(
nghttp2_debug_vprintf_callback debug_vprintf_callback) {
(void)debug_vprintf_callback;
}

#endif /* !DEBUGBUILD */
#endif /* !defined(DEBUGBUILD) */
8 changes: 4 additions & 4 deletions deps/nghttp2/lib/nghttp2_debug.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,17 +27,17 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

#ifdef DEBUGBUILD
# define DEBUGF(...) nghttp2_debug_vprintf(__VA_ARGS__)
void nghttp2_debug_vprintf(const char *format, ...);
#else
#else /* !defined(DEBUGBUILD) */
# define DEBUGF(...) \
do { \
} while (0)
#endif
#endif /* !defined(DEBUGBUILD) */

#endif /* NGHTTP2_DEBUG_H */
#endif /* !defined(NGHTTP2_DEBUG_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_extpri.h
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -62,4 +62,4 @@ void nghttp2_extpri_from_uint8(nghttp2_extpri *extpri, uint8_t u8extpri);
*/
#define nghttp2_extpri_uint8_inc(PRI) (((PRI) & NGHTTP2_EXTPRI_INC_MASK) != 0)

#endif /* NGHTTP2_EXTPRI_H */
#endif /* !defined(NGHTTP2_EXTPRI_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_frame.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>
#include "nghttp2_hd.h"
Expand Down Expand Up @@ -634,4 +634,4 @@ int nghttp2_iv_check(const nghttp2_settings_entry *iv, size_t niv);
void nghttp2_frame_add_pad(nghttp2_bufs *bufs, nghttp2_frame_hd *hd,
size_t padlen, int framehd_only);

#endif /* NGHTTP2_FRAME_H */
#endif /* !defined(NGHTTP2_FRAME_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_hd.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -439,4 +439,4 @@ nghttp2_ssize nghttp2_hd_huff_decode(nghttp2_hd_huff_decode_context *ctx,
*/
int nghttp2_hd_huff_decode_failure_state(nghttp2_hd_huff_decode_context *ctx);

#endif /* NGHTTP2_HD_H */
#endif /* !defined(NGHTTP2_HD_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_hd_huffman.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -69,4 +69,4 @@ typedef struct {
extern const nghttp2_huff_sym huff_sym_table[];
extern const nghttp2_huff_decode huff_decode_table[][16];

#endif /* NGHTTP2_HD_HUFFMAN_H */
#endif /* !defined(NGHTTP2_HD_HUFFMAN_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_helper.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <string.h>
#include <stddef.h>
Expand Down Expand Up @@ -142,4 +142,4 @@ int nghttp2_should_send_window_update(int32_t local_window_size,
*/
uint8_t *nghttp2_cpymem(uint8_t *dest, const void *src, size_t len);

#endif /* NGHTTP2_HELPER_H */
#endif /* !defined(NGHTTP2_HELPER_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_http.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>
#include "nghttp2_session.h"
Expand Down Expand Up @@ -97,4 +97,4 @@ void nghttp2_http_record_request_method(nghttp2_stream *stream,
int nghttp2_http_parse_priority(nghttp2_extpri *dest, const uint8_t *value,
size_t valuelen);

#endif /* NGHTTP2_HTTP_H */
#endif /* !defined(NGHTTP2_HTTP_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_int.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -55,4 +55,4 @@ typedef enum {
NGHTTP2_ERR_REMOVE_HTTP_HEADER = -106
} nghttp2_internal_error;

#endif /* NGHTTP2_INT_H */
#endif /* !defined(NGHTTP2_INT_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_mem.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand All @@ -42,4 +42,4 @@ void nghttp2_mem_free2(nghttp2_free free_func, void *ptr, void *mem_user_data);
void *nghttp2_mem_calloc(nghttp2_mem *mem, size_t nmemb, size_t size);
void *nghttp2_mem_realloc(nghttp2_mem *mem, void *ptr, size_t size);

#endif /* NGHTTP2_MEM_H */
#endif /* !defined(NGHTTP2_MEM_H) */
16 changes: 8 additions & 8 deletions deps/nghttp2/lib/nghttp2_net.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,28 +27,28 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#ifdef HAVE_ARPA_INET_H
# include <arpa/inet.h>
#endif /* HAVE_ARPA_INET_H */
#endif /* defined(HAVE_ARPA_INET_H) */

#ifdef HAVE_NETINET_IN_H
# include <netinet/in.h>
#endif /* HAVE_NETINET_IN_H */
#endif /* defined(HAVE_NETINET_IN_H) */

#include <nghttp2/nghttp2.h>

#if defined(WIN32)
#ifdef WIN32
/* Windows requires ws2_32 library for ntonl family functions. We
define inline functions for those function so that we don't have
dependency on that lib. */

# ifdef _MSC_VER
# define STIN static __inline
# else
# else /* !defined(_MSC_VER) */
# define STIN static inline
# endif
# endif /* !defined(_MSC_VER) */

STIN uint32_t htonl(uint32_t hostlong) {
uint32_t res;
Expand Down Expand Up @@ -86,6 +86,6 @@ STIN uint16_t ntohs(uint16_t netshort) {
return res;
}

#endif /* WIN32 */
#endif /* defined(WIN32) */

#endif /* NGHTTP2_NET_H */
#endif /* !defined(NGHTTP2_NET_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_option.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -160,4 +160,4 @@ struct nghttp2_option {
uint8_t user_recv_ext_types[32];
};

#endif /* NGHTTP2_OPTION_H */
#endif /* !defined(NGHTTP2_OPTION_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_outbound_item.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>
#include "nghttp2_frame.h"
Expand Down Expand Up @@ -186,4 +186,4 @@ void nghttp2_outbound_queue_pop(nghttp2_outbound_queue *q);
/* Returns the size of the queue */
#define nghttp2_outbound_queue_size(Q) ((Q)->n)

#endif /* NGHTTP2_OUTBOUND_ITEM_H */
#endif /* !defined(NGHTTP2_OUTBOUND_ITEM_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_pq.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>
#include "nghttp2_int.h"
Expand Down Expand Up @@ -121,4 +121,4 @@ int nghttp2_pq_each(nghttp2_pq *pq, nghttp2_pq_item_cb fun, void *arg);
*/
void nghttp2_pq_remove(nghttp2_pq *pq, nghttp2_pq_entry *item);

#endif /* NGHTTP2_PQ_H */
#endif /* !defined(NGHTTP2_PQ_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_priority_spec.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand All @@ -39,4 +39,4 @@
*/
void nghttp2_priority_spec_normalize_weight(nghttp2_priority_spec *pri_spec);

#endif /* NGHTTP2_PRIORITY_SPEC_H */
#endif /* !defined(NGHTTP2_PRIORITY_SPEC_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_queue.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include "config.h"
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand All @@ -48,4 +48,4 @@ void *nghttp2_queue_front(nghttp2_queue *queue);
void *nghttp2_queue_back(nghttp2_queue *queue);
int nghttp2_queue_empty(nghttp2_queue *queue);

#endif /* NGHTTP2_QUEUE_H */
#endif /* !defined(NGHTTP2_QUEUE_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_ratelim.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand All @@ -54,4 +54,4 @@ void nghttp2_ratelim_update(nghttp2_ratelim *rl, uint64_t tstamp);
succeeds, or -1. */
int nghttp2_ratelim_drain(nghttp2_ratelim *rl, uint64_t n);

#endif /* NGHTTP2_RATELIM_H */
#endif /* !defined(NGHTTP2_RATELIM_H) */
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/nghttp2_rcbuf.h
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@

#ifdef HAVE_CONFIG_H
# include <config.h>
#endif /* HAVE_CONFIG_H */
#endif /* defined(HAVE_CONFIG_H) */

#include <nghttp2/nghttp2.h>

Expand Down Expand Up @@ -77,4 +77,4 @@ int nghttp2_rcbuf_new2(nghttp2_rcbuf **rcbuf_ptr, const uint8_t *src,
*/
void nghttp2_rcbuf_del(nghttp2_rcbuf *rcbuf);

#endif /* NGHTTP2_RCBUF_H */
#endif /* !defined(NGHTTP2_RCBUF_H) */
Loading
Loading