Commits · e1c838e7aa6c6dfec8efdecdaa2cc5559d3eda2c · github.com / v8-riscv / node

May 01, 2019

test: check `napi_get_reference_value()` during finalization · e1c838e7

Anna Henningsen authored Apr 29, 2019

PR-URL: https://github.com/nodejs/node/pull/27470


Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

e1c838e7

test: remove flaky designation for test-tls-sni-option · 351a252d

Luigi Pinca authored Apr 26, 2019

Refs: https://github.com/nodejs/node/pull/27300

PR-URL: https://github.com/nodejs/node/pull/27425


Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

351a252d

build: remove unsupported Python 2.6 from configure · 56098a9c

cclauss authored Apr 24, 2019

PR-URL: https://github.com/nodejs/node/pull/27381


Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>

56098a9c

test: add missing line breaks to keep-alive header of slow headers test · e4e6a33e

Shuhei Kagawa authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27442


Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

e4e6a33e

2019-04-30, Version 11.15.0 (Current) · ea46db66

Shelley Vohr authored Apr 19, 2019

Notable changes:

* deps: add s390 asm rules for OpenSSL-1.1.1 (Shigeki Ohtsu) [#19794](https://github.com/nodejs/node/pull/19794)
* src: add .code and SSL specific error properties (Sam Roberts) [#25093](https://github.com/nodejs/node/pull/25093)
* tls:
  * add --tls-min-v1.2 CLI switch (Sam Roberts) [#26951](https://github.com/nodejs/node/pull/26951)
  * supported shared openssl 1.1.0 (Sam Roberts) [#26951](https://github.com/nodejs/node/pull/26951)
  * revert default max toTLSv1.2 (Sam Roberts) [#26951](https://github.com/nodejs/node/pull/26951)
  * revert change to invalid protocol error type (Sam Roberts) [#26951](https://github.com/nodejs/node/pull/26951)
  * support TLSv1.3 (Sam Roberts) [#26209](https://github.com/nodejs/node/pull/26209)
  * add code for ERR\_TLS\_INVALID\_PROTOCOL\_METHOD (Sam Roberts) [#24729](https://github.com/nodejs/node/pull/24729)

PR-URL: https://github.com/nodejs/node/pull/27314

ea46db66

Apr 30, 2019

doc: describe API ERR_INVALID_PROTOCOL context · dce8806c

Sam Roberts authored Apr 24, 2019

ERR_INVALID_PROTOCOL docs should describe the API it relates to.

See: https://github.com/nodejs/node/pull/27390/files#r278246361

PR-URL: https://github.com/nodejs/node/pull/27393


Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>

dce8806c

test: add tests for new language features · 3d2409c4

Ruben Bridgewater authored Apr 25, 2019

PR-URL: https://github.com/nodejs/node/pull/27400


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

3d2409c4

repl: handle stage-3 language features properly · e939b8f1

Ruben Bridgewater authored Apr 24, 2019

This adds stage-3 language features to acorn so that the REPL is
able to parse these features properly. Otherwise these would cause
SyntaxErrors.

PR-URL: https://github.com/nodejs/node/pull/27400
Fixes: https://github.com/nodejs/node/issues/27391
Fixes: https://github.com/nodejs/node/issues/25835


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

e939b8f1

repl: add new language features to top level await statements · f37e40af

Ruben Bridgewater authored Apr 24, 2019

This adds stage-3 language features to acorn so that it's possible
to parse these features when using top level await in the REPL.

PR-URL: https://github.com/nodejs/node/pull/27400
Refs: https://github.com/nodejs/node/issues/27391
Refs: https://github.com/nodejs/node/issues/25835


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

f37e40af

assert: use new language features · 04b7c007

Ruben Bridgewater authored Apr 24, 2019

This adds new language features to acorn. Otherwise BigInt and other
input would not be parsed correct and would not result in nice error
messages when using simple assert.

PR-URL: https://github.com/nodejs/node/pull/27400
Refs: https://github.com/nodejs/node/issues/27391
Refs: https://github.com/nodejs/node/issues/25835


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

04b7c007

deps: add acorn stage-3 plugins · 72c6ea26

Ruben Bridgewater authored Apr 24, 2019

This adds bigint, class-fields, numeric-separators, static-class
features, private class methods and fields as dependency. That way
it's possible to use these in combination with acorn to parse these
language features.

This also removes a couple of files that were not necessary for
Node.js to reduce the code base.

PR-URL: https://github.com/nodejs/node/pull/27400
Refs: https://github.com/nodejs/node/issues/27391
Refs: https://github.com/nodejs/node/issues/25835


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

72c6ea26

http: `servername === false` should disable SNI · 98e9de7d

Fedor Indutny authored Apr 19, 2019

There is no way to disable SNI extension when sending a request to HTTPS
server. Setting `options.servername` to a falsy value would make Node.js
core override it with either hostname or ip address.

This change introduces a way to disable SNI completely if this is
required for user's application. Setting `options.servername` to ``
in `https.request` would disable overrides and thus disable the
extension.

PR-URL: https://github.com/nodejs/node/pull/27316


Reviewed-By: Steven R Loomis <srloomis@us.ibm.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Sam Roberts <vieuxtech@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>

98e9de7d

buffer: remove unreachable code · 524dd469

Rich Trott authored Apr 28, 2019

Remove unreachable code from lib/buffer.js.

PR-URL: https://github.com/nodejs/node/pull/27445


Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Anna Henningsen <anna@addaleax.net>

524dd469

test: add mustCall for parallel/test-net-connect-paused-connection · 1001433e

sujunfei authored Apr 28, 2019

Add common.mustCall test on net.createServer callback and listen
callback in the parallel/test-net-connect-paused-connection

remove the mustCall of net.createServer callback

PR-URL: https://github.com/nodejs/node/pull/27463


Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ouyang Yadong <oyydoibh@gmail.com>

1001433e

test: add mustCallAtLeast to test-fs-read-stream-resume.js · cb414306

heben authored Apr 28, 2019

add mustCallAtLeast to test-fs-read-stream-resume.js

PR-URL: https://github.com/nodejs/node/pull/27456


Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ouyang Yadong <oyydoibh@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

cb414306

test: adding mustCall in test-fs-readfile-empty.js · 9c2774e6

陈健 authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27455


Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ouyang Yadong <oyydoibh@gmail.com>

9c2774e6

test: add common.mustCall in test-http-abort-client.js · 578b31e1

OneNail authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27449


Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

578b31e1

test: add mustCall to http-abort-queued test · 0fbd8525

Yaphet Ye authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27447


Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Ouyang Yadong <oyydoibh@gmail.com>

0fbd8525

lib: remove Reflect.apply where appropriate · f4f937b2

Anatoli Papirovski authored Apr 22, 2019

Using Reflect.apply where the callback context does not need
to change is unnecessary and less performant.

PR-URL: https://github.com/nodejs/node/pull/27349


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

f4f937b2

meta: move Forrest Norvell to Collaborator Emeriti list · d33fddb7

Rich Trott authored Apr 26, 2019

Consulted with Forrest. He thought this was appropriate as long as it
doesn't affect his ability to be on the Moderation Team.

PR-URL: https://github.com/nodejs/node/pull/27437


Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Forrest L Norvell <ogd@aoaioxxysz.net>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>

d33fddb7

test: add mustCall in test-fs-readfilesync-pipe-large.js · 034a5685

sinoon authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27458


Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>

034a5685

test: add mustCall to test-dgram-connect-send-multi-buffer-copy.js · 92ab466b

XGHeaven authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27465


Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Ouyang Yadong <oyydoibh@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Yuta Hiroto <hello@hiroppy.me>

92ab466b

test: add test of policy about parse error · a565853d

Daiki Ihara authored Mar 23, 2019

PR-URL: https://github.com/nodejs/node/pull/26873


Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Rich Trott <rtrott@gmail.com>

a565853d

src: prefer v8::Global over node::Persistent · 723d5c05

Anna Henningsen authored Apr 17, 2019

`v8::Global` is essentially a nicer variant of `node::Persistent` that,
in addition to reset-on-destroy, also implements move semantics.

This commit makes the necessary replacements, removes
`node::Persistent` and (now-)unnecessary inclusions of the
`node_persistent.h` header, and makes some of the functions that
take Persistents as arguments more generic so that they work with all
`v8::PersistentBase` flavours.

PR-URL: https://github.com/nodejs/node/pull/27287


Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Eugene Ostroukhov <eostroukhov@google.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

723d5c05

test: add mustCall to test-net-after-close test · 095bd569

xuqinggang authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27459


Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

095bd569

console: use consolePropAttributes for k-bind properties (reland) · 6bfde6a8

Ruben Bridgewater authored Apr 23, 2019

This is a reland of https://github.com/nodejs/node/pull/26850.
It was speculatively reverted but it turned out that this did not
cause any trouble.

PR-URL: https://github.com/nodejs/node/pull/27352
Refs: https://github.com/nodejs/node/pull/26943
Refs: https://github.com/nodejs/node/pull/26850


Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

6bfde6a8

meta: move @vsemozhetbyt to collaborator emeriti · d088587b

Vse Mozhet Byt authored Apr 25, 2019

PR-URL: https://github.com/nodejs/node/pull/27412


Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Anto Aravinth <anto.aravinth.cse@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

d088587b

tls: allow enabling the TLS debug trace · adedbb12

Sam Roberts authored Feb 13, 2019

Enable the same trace output that the OpenSSL s_client and s_server
support with their `-trace` option. This is invaluable when debugging
reports of TLS bugs as well as when debugging the internal TLS
implementation.

See:
- https://github.com/nodejs/node/issues/25383
- https://github.com/nodejs/node/issues/17936
- https://github.com/postmanlabs/postman-app-support/issues/5918#issuecomment-465311423

PR-URL: https://github.com/nodejs/node/pull/27376


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>

adedbb12

deps: update archs files for OpenSSL-1.1.1b · 439bc6ee

Sam Roberts authored Apr 23, 2019

Ran:

$ cd deps/openssl/config; make

to update deps/openssl/config/archs/ with current configuration.

PR-URL: https://github.com/nodejs/node/pull/27376


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>

439bc6ee

deps: configure OpenSSL's SSL_trace to be built · 8a4e4a42

Sam Roberts authored Apr 25, 2019

OpenSSL doesn't compile `SSL_trace()` by default for historical reasons.
Add the enable-ssl-trace option to the OpenSSL Configure arguments.

PR-URL: https://github.com/nodejs/node/pull/27376


Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>

8a4e4a42

Apr 29, 2019

2019-04-29, Version 12.1.0 (Current) · 1d4a8807

Michaël Zasso authored Apr 27, 2019

Notable changes:

* intl:
  * Update ICU to 64.2. This adds support for Japanese Era (Reiwa).
    https://github.com/nodejs/node/pull/27361
  * Fixes a bug in ICU that affected Node.js 12.0.0 in the case where
    `new Date().toLocaleString()` was called with a non-default locale.
    https://github.com/nodejs/node/pull/27415
* C++ API:
  * Added an overload of `EmitAsyncDestroy` that can be used during
    garbage collection.
    https://github.com/nodejs/node/pull/27255

PR-URL: https://github.com/nodejs/node/pull/27440

1d4a8807

child_process: only stop readable side of stream passed to proc · cc7b3fba

Anna Henningsen authored Apr 23, 2019

Closing the underlying resource completely has the unwanted side effect
that the stream can no longer be used at all, including passing it
to other child processes.

What we want to avoid is accidentally reading from the stream;
accordingly, it should be sufficient to stop its readable side
manually, and otherwise leave the underlying resource intact.

Fixes: https://github.com/nodejs/node/issues/27097
Refs: https://github.com/nodejs/node/pull/21209

PR-URL: https://github.com/nodejs/node/pull/27373


Reviewed-By: Matteo Collina <matteo.collina@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>

cc7b3fba

test: add "mustCall" to test-fs-readfile-unlink · 413256d5

wuchenkai authored Apr 28, 2019

Add common.mustCall to test-fs-readfile-unlink

PR-URL: https://github.com/nodejs/node/pull/27453


Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

413256d5

test: add missing ToC entries · 5f6438f6

cjihrig authored Apr 26, 2019

These modules were already documented, but not included in the
table of contents.

PR-URL: https://github.com/nodejs/node/pull/27434


Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

5f6438f6

test: document report helper module · affcbd68

cjihrig authored Apr 26, 2019

PR-URL: https://github.com/nodejs/node/pull/27434


Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

affcbd68

test: document NODE_SKIP_FLAG_CHECK · 0abc05bd

cjihrig authored Apr 26, 2019

PR-URL: https://github.com/nodejs/node/pull/27434


Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

0abc05bd

test: document NODE_TEST_KNOWN_GLOBALS · e30b1191

cjihrig authored Apr 26, 2019

PR-URL: https://github.com/nodejs/node/pull/27434


Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>

e30b1191

lib: remove outdated optimizations · 8b04d5c3

Weijia Wang authored Apr 24, 2019

PR-URL: https://github.com/nodejs/node/pull/27380


Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Benedikt Meurer <benedikt.meurer@gmail.com>

8b04d5c3

test: add mustCallAtLeast to test-fs-read-stream-inherit · f5e2ad78

nilianzhu authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27457


Reviewed-By: Weijia Wang <starkwang@126.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>

f5e2ad78

test: add mustCall to test-dgram-implicit-bind.js · c3d49332

Chenxi Yuan authored Apr 28, 2019

PR-URL: https://github.com/nodejs/node/pull/27452


Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Reviewed-By: Yorkie Liu <yorkiefixer@gmail.com>
Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com>

c3d49332