Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v8.13.0 proposal #23974

Merged
merged 129 commits into from Nov 20, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
129 commits
Select commit Hold shift + click to select a range
2ae98ce
lib: define printErr() in script string
cjihrig Mar 11, 2018
b0d6067
doc: fix 8.12.0 changelog
MylesBorins Sep 11, 2018
0340dd8
doc: add and unify return statements in crypto.md
vsemozhetbyt Apr 6, 2018
f2158f3
test: improve assertion in test-inspector.js
Trott Sep 2, 2018
e9416d4
test: simplify assertion in http2 tests
Trott Sep 2, 2018
702d67f
test: refactor flag check
Trott Sep 13, 2018
976d55f
test: remove string literal from assertion
Trott Sep 13, 2018
52b21ca
test: remove string literal from assertion
Trott Sep 13, 2018
8209ccb
test: prepare test-assert for strictEqual linting
Trott Sep 13, 2018
f5985c7
tls,http2: handle writes after SSL destroy more gracefully
addaleax Feb 25, 2018
d58867a
test: call gc() explicitly to avoid OOM
refack Aug 13, 2018
9e2077a
deps: backport 9a23bdd from upstream V8
Drieger Aug 15, 2018
eaabbf4
doc: make caveat in stream.md more concise
Trott Mar 9, 2018
534bc82
test: name test files appropriately
ryzokuken Mar 7, 2018
48f31bd
deps: V8: backport 20 CPU profiler commits from upstream
psmarshall Jun 26, 2018
ca8d4e3
build: define NOMINMAX on windows
bnoordhuis Jan 23, 2018
b67bf38
src: fix fs.write() externalized string handling
bnoordhuis Jan 23, 2018
4bcdc1b
test: fix assertion argument order
Trott Mar 9, 2018
459690a
doc: improve style guide text
Trott Mar 9, 2018
fe3836a
test: delete test/parallel/test-regress-GH-4948
ryzokuken Mar 11, 2018
5862d03
http2: fix ping duration calculation
jasnell Apr 11, 2018
c0d1423
doc: close event does not take arguments
indranil Apr 14, 2018
fa5a380
http2: refactor how trailers are done
jasnell Apr 11, 2018
887417e
test: remove message from strictEqual assertions
bryancr89 Apr 19, 2018
af5cebb
doc,http2: add parameters for Http2Session:connect event
ryzokuken Apr 21, 2018
5abe246
test: add strictEqual method to assert
9christine Apr 21, 2018
b32cf8f
doc: add parameters for Http2Session:error event
ryzokuken Apr 21, 2018
98ed30f
doc: improve docs for Http2Session:frameError
ryzokuken Apr 23, 2018
1edd7f6
http: added aborted property to request
ronag Apr 17, 2018
c7ba556
test: removed assert.strictEqual message
kailashyogeshwar85 Apr 23, 2018
1a6a054
doc: improve parameters for Http2Session:goaway event
ryzokuken Apr 26, 2018
41dca9e
http2: fix responses to long payload reqs
apapirovski Apr 16, 2018
28a6e59
http2: fix ping callback
BridgeAR Apr 26, 2018
aa341d1
test: verify arguments length in common.expectsError
BridgeAR Apr 26, 2018
41e8931
doc: add parameters for settings events
ryzokuken Apr 27, 2018
74192dd
http2: reduce require calls in http2/core
danbev Apr 30, 2018
395ce84
http2: rename http2_state class to Http2State
danbev Apr 30, 2018
448922d
doc: add parameters for Http2Session:stream event
ryzokuken May 5, 2018
c30a8f4
test: fix flaky http2-flow-control test
apapirovski May 6, 2018
77acef4
doc: add params for ClientHttp2Session:altsvc
ryzokuken May 8, 2018
4f00354
doc: add parameters for Http2Stream:error event
ryzokuken May 8, 2018
d1b7825
http2: avoid bind and properly clean up in compat
ronag Apr 27, 2018
e5f8b08
test: improve reliability of http2-session-timeout
Trott May 11, 2018
b0c92ca
http2: fix end without read
apapirovski May 9, 2018
b0e3ce9
net,http2: refactor _write and _writev
ryzokuken May 9, 2018
11a63dd
doc: fix typo in http2.md
kakts May 20, 2018
0a6672f
http2: fix several serious bugs
apapirovski May 17, 2018
5d29e2c
test: fix flaky http2-session-unref
apapirovski May 21, 2018
91be1dc
http2: delay closing stream
apapirovski May 28, 2018
b22266c
http2: force through RST_STREAM in destroy
apapirovski May 29, 2018
322f39d
test: minor adjustments to test-http2-respond-file
addaleax Jun 2, 2018
3c8c53f
http2: fix premature destroy
apapirovski May 31, 2018
0a8d086
http2: safer Http2Session destructor
apapirovski Jun 6, 2018
0f3e650
http2: fix memory leak for uncommon headers
addaleax Jun 15, 2018
e9e4f43
http2: fix memory leak when headers are not emitted
addaleax Jun 16, 2018
20b72fc
http2: track memory allocated by nghttp2
addaleax Jun 14, 2018
4228141
doc: Improve doc for Http2 headers object
Flarna Jun 12, 2018
1cdf93e
http2: pass incoming set-cookie header as array
Flarna Jun 15, 2018
2116ace
doc: fix http2stream.pushStream error doc
ChALkeR Jun 23, 2018
071a022
http2: order declarations in core.js
Trott Jul 6, 2018
57618aa
errors: fix undefined HTTP2 and tls errors
thatshailesh Jun 27, 2018
e5175e6
http2: remove `waitTrailers` listener after closing a stream
RidgeA Jul 11, 2018
32bfd7e
doc: add missing `require` to example in http2.md
kevinsimper Jul 17, 2018
745e1e6
http2: remove unused nghttp2 error list
addaleax Jul 15, 2018
d602c7a
http2: release request()'s "connect" event listener after it runs
ide Jul 21, 2018
dcf04dc
test: refactor test-http2-compat-serverresponse-finished.js
antsmartian Jul 28, 2018
7ea08ee
test: improve reliability in http2-session-timeout
Trott Jul 30, 2018
f2f66b4
http2: remove `streamError` from docs
jasnell Aug 10, 2018
3980ca1
doc: clarify http2 docs around class exports
jasnell Aug 10, 2018
5c3edd3
http2: avoid race condition in OnHeaderCallback
jasnell Aug 10, 2018
b66cba0
test: add test-http2-large-file sequential test
jasnell Aug 10, 2018
cc561cc
http2: explicitly disallow nested push streams
jasnell Aug 10, 2018
348cde0
http2: emit timeout on compat request and response
jasnell Aug 10, 2018
3fe9293
doc: make createPushResponse() more detailled
Aug 17, 2018
d0be932
doc: simplify http2 wording and formatting
Trott Aug 26, 2018
6a396ff
http2: throw better error when accessing unbound socket proxy
jasnell Aug 23, 2018
60f7bfa
deps: update to nghttp2 1.33.0
addaleax Sep 2, 2018
805bf40
http2: don't expose the original socket through the socket proxy
szmarczak Sep 2, 2018
bae7c60
doc: document http2 timeouts
sagitsofan Sep 10, 2018
2de17ea
http2: add http2stream.endAfterHeaders property
jasnell Sep 13, 2018
9f79341
http2: check if stream is not destroyed before sending trailers
mcollina Sep 17, 2018
49f44f3
http2: add origin frame support
jasnell Sep 17, 2018
ca933ce
http2: do not falsely emit 'aborted' on push
apapirovski Sep 15, 2018
10576d6
http2: add ping event
jasnell Sep 21, 2018
c0f8e49
test: remove setImmediate from timeout test
Trott Sep 24, 2018
069fd79
test: improve debugging information for http2 test
Trott Sep 24, 2018
18a2b3d
http2: graduate from experimental
jasnell Aug 23, 2018
5b9af6e
doc: update username and email
hiroppy Mar 14, 2018
9446bb6
doc: fix minor issues in async_hooks.md
Trott Mar 13, 2018
afcf059
build: do not cd on vcbuild help
vsemozhetbyt Mar 12, 2018
610297e
doc: improve best practices in onboarding-extras
Trott Mar 13, 2018
3ad10e5
src: add extractPromiseWrap function
danbev Mar 13, 2018
042434f
src: fix indenting of wrap->EmitTraceEventBefore
danbev Mar 14, 2018
9e8f4e5
src: remove unused uv.h include from async_wrap.cc
danbev Mar 14, 2018
b407060
test: fix flaky test-http2-settings-flood
Trott Mar 14, 2018
5b2f650
src: make AsyncWrap constructors delegate
danbev Mar 15, 2018
38ed6c2
test: fix flaky test-http2-ping-flood
Trott Mar 16, 2018
aba1ff2
test: refactor test-fs-readfile-tostring-fail
Trott Mar 17, 2018
9f15bc4
test: skip failing tests for osx mojave
jnord99 Oct 12, 2018
104fbc6
build: update arm64 minimum supported platform
gibfahn Mar 6, 2018
7ab253f
deps: V8: cherry-pick 64-bit hash seed commits
hashseed Oct 5, 2018
ce65d84
deps: backport a8f6869 from upstream V8
benjamn Aug 4, 2018
e3bddee
http: fix undefined error in parser event
apapirovski Apr 14, 2018
c6d94f8
assert: add strict functionality export
BridgeAR Nov 13, 2017
84948cf
assert: fix .throws operator
BridgeAR Dec 9, 2017
a42d072
assert: use object argument in innerFail
BridgeAR Dec 9, 2017
c9d84b6
assert: fix throws and doesNotThrow stack frames
BridgeAR Dec 15, 2017
147aeed
assert: improve assert.throws
BridgeAR Dec 9, 2017
f2af930
assert: .throws accept objects
BridgeAR Dec 10, 2017
562787e
assert: fix strict regression
BridgeAR Dec 28, 2017
18071db
assert: fix throws trace
BridgeAR Feb 6, 2018
7f34c27
http2: simplify timeout tracking
addaleax Feb 22, 2018
3babc5b
assert: add rejects() and doesNotReject()
feugy Jan 11, 2018
3cd4462
test: ensure failed assertions cause build to fail
not-an-aardvark Mar 28, 2018
0d241ba
assert: ensure .rejects() disallows sync throws
not-an-aardvark Mar 28, 2018
26d145a
async_hooks: add missing async_hooks destroys in AsyncReset
basti1302 Oct 1, 2018
a1b94d3
deps: upgrade libuv to 1.20.0
cjihrig Apr 2, 2018
2307653
deps: upgrade to libuv 1.20.2
cjihrig Apr 22, 2018
c54f4bc
deps: upgrade to libuv 1.20.3
cjihrig May 7, 2018
0187e3b
process: avoid using the same fd for ipc and stdio
cjihrig Jun 22, 2018
11cb09b
deps: upgrade to libuv 1.21.0
cjihrig Jun 22, 2018
e3d08af
deps: upgrade to libuv 1.22.0
cjihrig Jul 10, 2018
d9d541c
deps: upgrade to libuv 1.23.0
cjihrig Aug 17, 2018
b38190e
deps: upgrade to libuv 1.23.1
cjihrig Sep 21, 2018
dbc7d9b
test: read() on dir on AIX does not return EISDIR
bnoordhuis Oct 8, 2018
62dd1d7
deps: upgrade to libuv 1.23.2
cjihrig Oct 8, 2018
5245d6a
deps: V8: partially revert d868eb7
ofrobots Nov 19, 2018
0157e3e
src,deps: add ABI safe use of CheckMemoryPressure
ofrobots Nov 20, 2018
90c7bfa
2018-11-20, Version 8.13.0 'Carbon' (LTS)
BethGriggs Oct 30, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion BUILDING.md
Expand Up @@ -39,7 +39,8 @@ in production.

| System | Support type | Version | Architectures | Notes |
|--------------|--------------|----------------------------------|----------------------|------------------|
| GNU/Linux | Tier 1 | kernel >= 2.6.32, glibc >= 2.12 | x86, x64, arm, arm64 | |
| GNU/Linux | Tier 1 | kernel >= 2.6.32, glibc >= 2.12 | x86, x64, arm | |
| GNU/Linux | Tier 1 | kernel >= 3.10, glibc >= 2.17 | arm64 | |
| macOS | Tier 1 | >= 10.10 | x64 | |
| Windows | Tier 1 | >= Windows 7 / 2008 R2 | x86, x64 | vs2015 or vs2017 |
| SmartOS | Tier 2 | >= 15 < 16.4 | x86, x64 | see note1 |
Expand Down
3 changes: 2 additions & 1 deletion CHANGELOG.md
Expand Up @@ -27,7 +27,8 @@ release.
</tr>
<tr>
<td valign="top">
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.12.0">8.12.0</a></b><br/>
<b><a href="doc/changelogs/CHANGELOG_V8.md#8.13.0">8.13.0</a></b><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.12.0">8.12.0</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.11.4">8.11.4</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.11.3">8.11.3</a><br/>
<a href="doc/changelogs/CHANGELOG_V8.md#8.11.2">8.11.2</a><br/>
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -291,8 +291,6 @@ For more information about the governance of the Node.js project, see

### Collaborators

* [abouthiroppy](https://github.com/abouthiroppy) -
**Yuta Hiroto** &lt;hello@about-hiroppy.com&gt; (he/him)
* [addaleax](https://github.com/addaleax) -
**Anna Henningsen** &lt;anna@addaleax.net&gt; (she/her)
* [ak239](https://github.com/ak239) -
Expand Down Expand Up @@ -367,6 +365,8 @@ For more information about the governance of the Node.js project, see
**Guy Bedford** &lt;guybedford@gmail.com&gt; (he/him)
* [hashseed](https://github.com/hashseed) -
**Yang Guo** &lt;yangguo@chromium.org&gt; (he/him)
* [hiroppy](https://github.com/hiroppy) -
**Yuta Hiroto** &lt;hello@hiroppy.me&gt; (he/him)
* [iarna](https://github.com/iarna) -
**Rebecca Turner** &lt;me@re-becca.org&gt;
* [imran-iq](https://github.com/imran-iq) -
Expand Down
2 changes: 1 addition & 1 deletion benchmark/http/bench-parser.js
Expand Up @@ -35,7 +35,7 @@ function processHeader(header, n) {
bench.start();
for (var i = 0; i < n; i++) {
parser.execute(header, 0, header.length);
parser.reinitialize(REQUEST);
parser.reinitialize(REQUEST, i > 0);
}
bench.end(n);
}
Expand Down
2 changes: 1 addition & 1 deletion benchmark/misc/freelist.js
Expand Up @@ -9,7 +9,7 @@ const bench = common.createBenchmark(main, {
});

function main(conf) {
const FreeList = require('internal/freelist');
const { FreeList } = require('internal/freelist');
const n = conf.n;
const poolSize = 1000;
const list = new FreeList('test', poolSize, Object);
Expand Down
142 changes: 112 additions & 30 deletions deps/nghttp2/lib/includes/nghttp2/nghttp2.h
Expand Up @@ -28,7 +28,7 @@
/* Define WIN32 when build target is Win32 API (borrowed from
libcurl) */
#if (defined(_WIN32) || defined(__WIN32__)) && !defined(WIN32)
#define WIN32
# define WIN32
#endif

#ifdef __cplusplus
Expand All @@ -40,30 +40,30 @@ extern "C" {
/* MSVC < 2013 does not have inttypes.h because it is not C99
compliant. See compiler macros and version number in
https://sourceforge.net/p/predef/wiki/Compilers/ */
#include <stdint.h>
# include <stdint.h>
#else /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
#include <inttypes.h>
# include <inttypes.h>
#endif /* !defined(_MSC_VER) || (_MSC_VER >= 1800) */
#include <sys/types.h>
#include <stdarg.h>

#include <nghttp2/nghttp2ver.h>

#ifdef NGHTTP2_STATICLIB
#define NGHTTP2_EXTERN
# define NGHTTP2_EXTERN
#elif defined(WIN32)
#ifdef BUILDING_NGHTTP2
#define NGHTTP2_EXTERN __declspec(dllexport)
#else /* !BUILDING_NGHTTP2 */
#define NGHTTP2_EXTERN __declspec(dllimport)
#endif /* !BUILDING_NGHTTP2 */
#else /* !defined(WIN32) */
#ifdef BUILDING_NGHTTP2
#define NGHTTP2_EXTERN __attribute__((visibility("default")))
#else /* !BUILDING_NGHTTP2 */
#define NGHTTP2_EXTERN
#endif /* !BUILDING_NGHTTP2 */
#endif /* !defined(WIN32) */
# ifdef BUILDING_NGHTTP2
# define NGHTTP2_EXTERN __declspec(dllexport)
# else /* !BUILDING_NGHTTP2 */
# define NGHTTP2_EXTERN __declspec(dllimport)
# endif /* !BUILDING_NGHTTP2 */
#else /* !defined(WIN32) */
# ifdef BUILDING_NGHTTP2
# define NGHTTP2_EXTERN __attribute__((visibility("default")))
# else /* !BUILDING_NGHTTP2 */
# define NGHTTP2_EXTERN
# endif /* !BUILDING_NGHTTP2 */
#endif /* !defined(WIN32) */

/**
* @macro
Expand Down Expand Up @@ -611,7 +611,12 @@ typedef enum {
* The ALTSVC frame, which is defined in `RFC 7383
* <https://tools.ietf.org/html/rfc7838#section-4>`_.
*/
NGHTTP2_ALTSVC = 0x0a
NGHTTP2_ALTSVC = 0x0a,
/**
* The ORIGIN frame, which is defined by `RFC 8336
* <https://tools.ietf.org/html/rfc8336>`_.
*/
NGHTTP2_ORIGIN = 0x0c
} nghttp2_frame_type;

/**
Expand Down Expand Up @@ -2473,15 +2478,15 @@ nghttp2_option_set_no_auto_window_update(nghttp2_option *option, int val);
*
* This option sets the SETTINGS_MAX_CONCURRENT_STREAMS value of
* remote endpoint as if it is received in SETTINGS frame. Without
* specifying this option, before the local endpoint receives
* SETTINGS_MAX_CONCURRENT_STREAMS in SETTINGS frame from remote
* endpoint, SETTINGS_MAX_CONCURRENT_STREAMS is unlimited. This may
* cause problem if local endpoint submits lots of requests initially
* and sending them at once to the remote peer may lead to the
* rejection of some requests. Specifying this option to the sensible
* value, say 100, may avoid this kind of issue. This value will be
* overwritten if the local endpoint receives
* SETTINGS_MAX_CONCURRENT_STREAMS from the remote endpoint.
* specifying this option, the maximum number of outgoing concurrent
* streams is initially limited to 100 to avoid issues when the local
* endpoint submits lots of requests before receiving initial SETTINGS
* frame from the remote endpoint, since sending them at once to the
* remote endpoint could lead to rejection of some of the requests.
* This value will be overwritten when the local endpoint receives
* initial SETTINGS frame from the remote endpoint, either to the
* value advertised in SETTINGS_MAX_CONCURRENT_STREAMS or to the
* default value (unlimited) if none was advertised.
*/
NGHTTP2_EXTERN void
nghttp2_option_set_peer_max_concurrent_streams(nghttp2_option *option,
Expand Down Expand Up @@ -3797,10 +3802,13 @@ nghttp2_priority_spec_check_default(const nghttp2_priority_spec *pri_spec);
* .. warning::
*
* This function returns assigned stream ID if it succeeds. But
* that stream is not opened yet. The application must not submit
* that stream is not created yet. The application must not submit
* frame to that stream ID before
* :type:`nghttp2_before_frame_send_callback` is called for this
* frame.
* frame. This means `nghttp2_session_get_stream_user_data()` does
* not work before the callback. But
* `nghttp2_session_set_stream_user_data()` handles this situation
* specially, and it can set data to a stream during this period.
*
*/
NGHTTP2_EXTERN int32_t nghttp2_submit_request(
Expand Down Expand Up @@ -4516,8 +4524,7 @@ typedef struct {
* Submits ALTSVC frame.
*
* ALTSVC frame is a non-critical extension to HTTP/2, and defined in
* is defined in `RFC 7383
* <https://tools.ietf.org/html/rfc7838#section-4>`_.
* `RFC 7383 <https://tools.ietf.org/html/rfc7838#section-4>`_.
*
* The |flags| is currently ignored and should be
* :enum:`NGHTTP2_FLAG_NONE`.
Expand Down Expand Up @@ -4551,6 +4558,81 @@ NGHTTP2_EXTERN int nghttp2_submit_altsvc(nghttp2_session *session,
const uint8_t *field_value,
size_t field_value_len);

/**
* @struct
*
* The single entry of an origin.
*/
typedef struct {
/**
* The pointer to origin. No validation is made against this field
* by the library. This is not necessarily NULL-terminated.
*/
uint8_t *origin;
/**
* The length of the |origin|.
*/
size_t origin_len;
} nghttp2_origin_entry;

/**
* @struct
*
* The payload of ORIGIN frame. ORIGIN frame is a non-critical
* extension to HTTP/2 and defined by `RFC 8336
* <https://tools.ietf.org/html/rfc8336>`_.
*
* If this frame is received, and
* `nghttp2_option_set_user_recv_extension_type()` is not set, and
* `nghttp2_option_set_builtin_recv_extension_type()` is set for
* :enum:`NGHTTP2_ORIGIN`, ``nghttp2_extension.payload`` will point to
* this struct.
*
* It has the following members:
*/
typedef struct {
/**
* The number of origins contained in |ov|.
*/
size_t nov;
/**
* The pointer to the array of origins contained in ORIGIN frame.
*/
nghttp2_origin_entry *ov;
} nghttp2_ext_origin;

/**
* @function
*
* Submits ORIGIN frame.
*
* ORIGIN frame is a non-critical extension to HTTP/2 and defined by
* `RFC 8336 <https://tools.ietf.org/html/rfc8336>`_.
*
* The |flags| is currently ignored and should be
* :enum:`NGHTTP2_FLAG_NONE`.
*
* The |ov| points to the array of origins. The |nov| specifies the
* number of origins included in |ov|. This function creates copies
* of all elements in |ov|.
*
* The ORIGIN frame is only usable by a server. If this function is
* invoked with client side session, this function returns
* :enum:`NGHTTP2_ERR_INVALID_STATE`.
*
* :enum:`NGHTTP2_ERR_NOMEM`
* Out of memory
* :enum:`NGHTTP2_ERR_INVALID_STATE`
* The function is called from client side session.
* :enum:`NGHTTP2_ERR_INVALID_ARGUMENT`
* There are too many origins, or an origin is too large to fit
* into a default frame payload.
*/
NGHTTP2_EXTERN int nghttp2_submit_origin(nghttp2_session *session,
uint8_t flags,
const nghttp2_origin_entry *ov,
size_t nov);

/**
* @function
*
Expand Down
4 changes: 2 additions & 2 deletions deps/nghttp2/lib/includes/nghttp2/nghttp2ver.h
Expand Up @@ -29,14 +29,14 @@
* @macro
* Version number of the nghttp2 library release
*/
#define NGHTTP2_VERSION "1.32.0"
#define NGHTTP2_VERSION "1.33.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 0x012000
#define NGHTTP2_VERSION_NUM 0x012100

#endif /* NGHTTP2VER_H */
2 changes: 1 addition & 1 deletion deps/nghttp2/lib/nghttp2_buf.h
Expand Up @@ -26,7 +26,7 @@
#define NGHTTP2_BUF_H

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

#include <nghttp2/nghttp2.h>
Expand Down
2 changes: 1 addition & 1 deletion deps/nghttp2/lib/nghttp2_callbacks.h
Expand Up @@ -26,7 +26,7 @@
#define NGHTTP2_CALLBACKS_H

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

#include <nghttp2/nghttp2.h>
Expand Down
10 changes: 5 additions & 5 deletions deps/nghttp2/lib/nghttp2_debug.h
Expand Up @@ -26,18 +26,18 @@
#define NGHTTP2_DEBUG_H

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

#include <nghttp2/nghttp2.h>

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

#endif /* NGHTTP2_DEBUG_H */