GeezerVison is showing github.com — src: move the declaration of http parser versions into node_metadata.h · nodejs/node@e5b4af4
File tree
Expand file treeCollapse file tree
Open diff view settings
Expand file treeCollapse file tree
Open diff view settings
Collapse file
Copy file name to clipboardExpand all lines: src/node_http_parser_llhttp.cc +3-1Lines changed: 3 additions & 1 deletion | Original file line number | Diff line number | Diff line change |
|---|
|
1 | 1 | #define NODE_EXPERIMENTAL_HTTP 1 |
2 | 2 |
|
3 | 3 | #include "node_http_parser_impl.h" |
| 4 | +#include "node_metadata.h" |
4 | 5 |
|
5 | 6 | namespace node { |
6 | 7 |
|
| 8 | +namespace per_process { |
7 | 9 | const char* const llhttp_version = |
8 | 10 | NODE_STRINGIFY(LLHTTP_VERSION_MAJOR) |
9 | 11 | "." |
10 | 12 | NODE_STRINGIFY(LLHTTP_VERSION_MINOR) |
11 | 13 | "." |
12 | 14 | NODE_STRINGIFY(LLHTTP_VERSION_PATCH); |
13 | | - |
| 15 | +} // namespace per_process |
14 | 16 | } // namespace node |
15 | 17 |
|
16 | 18 | NODE_MODULE_CONTEXT_AWARE_INTERNAL(http_parser_llhttp, |
|
Collapse file
Copy file name to clipboardExpand all lines: src/node_http_parser_traditional.cc +3-2Lines changed: 3 additions & 2 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
3 | 3 | #endif |
4 | 4 |
|
5 | 5 | #include "node_http_parser_impl.h" |
| 6 | +#include "node_metadata.h" |
6 | 7 |
|
7 | 8 | namespace node { |
8 | | - |
| 9 | +namespace per_process { |
9 | 10 | const char* const http_parser_version = |
10 | 11 | NODE_STRINGIFY(HTTP_PARSER_VERSION_MAJOR) |
11 | 12 | "." |
12 | 13 | NODE_STRINGIFY(HTTP_PARSER_VERSION_MINOR) |
13 | 14 | "." |
14 | 15 | NODE_STRINGIFY(HTTP_PARSER_VERSION_PATCH); |
15 | | - |
| 16 | +} // namespace per_process |
16 | 17 | } // namespace node |
17 | 18 |
|
18 | 19 | NODE_MODULE_CONTEXT_AWARE_INTERNAL(http_parser, node::InitializeHttpParser) |
Collapse file
Copy file name to clipboardExpand all lines: src/node_internals.h -3Lines changed: 0 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -698,9 +698,6 @@ static inline const char* errno_string(int errorno) { |
698 | 698 |
|
699 | 699 | extern double prog_start_time; |
700 | 700 |
|
701 | | -extern const char* const llhttp_version; |
702 | | -extern const char* const http_parser_version; |
703 | | - |
704 | 701 | void Abort(const v8::FunctionCallbackInfo<v8::Value>& args); |
705 | 702 | void Chdir(const v8::FunctionCallbackInfo<v8::Value>& args); |
706 | 703 | void CPUUsage(const v8::FunctionCallbackInfo<v8::Value>& args); |
|
Collapse file
Copy file name to clipboardExpand all lines: src/node_metadata.cc +2-3Lines changed: 2 additions & 3 deletions | Original file line number | Diff line number | Diff line change |
|---|
|
3 | 3 | #include "brotli/encode.h" |
4 | 4 | #include "nghttp2/nghttp2ver.h" |
5 | 5 | #include "node.h" |
6 | | -#include "node_internals.h" |
7 | 6 | #include "util.h" |
8 | 7 | #include "uv.h" |
9 | 8 | #include "v8.h" |
@@ -45,8 +44,8 @@ Metadata::Versions::Versions() { |
45 | 44 | modules = NODE_STRINGIFY(NODE_MODULE_VERSION); |
46 | 45 | nghttp2 = NGHTTP2_VERSION; |
47 | 46 | napi = NODE_STRINGIFY(NAPI_VERSION); |
48 | | - llhttp = llhttp_version; |
49 | | - http_parser = http_parser_version; |
| 47 | + llhttp = per_process::llhttp_version; |
| 48 | + http_parser = per_process::http_parser_version; |
50 | 49 |
|
51 | 50 | brotli = |
52 | 51 | std::to_string(BrotliEncoderVersion() >> 24) + |
|
Collapse file
Copy file name to clipboardExpand all lines: src/node_metadata.h +2Lines changed: 2 additions & 0 deletions | Original file line number | Diff line number | Diff line change |
|---|
@@ -45,6 +45,8 @@ class Metadata { |
45 | 45 | // Per-process global |
46 | 46 | namespace per_process { |
47 | 47 | extern Metadata metadata; |
| 48 | +extern const char* const llhttp_version; |
| 49 | +extern const char* const http_parser_version; |
48 | 50 | } |
49 | 51 |
|
50 | 52 | } // namespace node |
|