Skip to content

Commit

Permalink
doc: update LICENSE file
Browse files Browse the repository at this point in the history
Running `license-builder.sh` seems to indicate that there have been some
license changes that have not been propagated to our LICENSE file yet.
Here they are.

PR-URL: #21472
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Richard Lau <riclau@uk.ibm.com>
Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com>
  • Loading branch information
Trott authored and MylesBorins committed Aug 7, 2018
1 parent e751460 commit 12f7642
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -71,11 +71,7 @@ The externally maintained libraries used by Node.js are:

- HTTP Parser, located at deps/http_parser, is licensed as follows:
"""
http_parser.c is based on src/http/ngx_http_parse.c from NGINX copyright
Igor Sysoev.

Additional changes are licensed under the same terms as NGINX and
copyright Joyent, Inc. and other Node contributors. All rights reserved.
Copyright Joyent, Inc. and other Node contributors.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to
Expand Down Expand Up @@ -561,7 +557,7 @@ The externally maintained libraries used by Node.js are:

- OpenSSL, located at deps/openssl, is licensed as follows:
"""
Copyright (c) 1998-2017 The OpenSSL Project. All rights reserved.
Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
Expand Down Expand Up @@ -664,6 +660,9 @@ The externally maintained libraries used by Node.js are:
- Valgrind client API header, located at third_party/valgrind/valgrind.h
This is release under the BSD license.

- antlr4 parser generator Cpp library located in third_party/antlr4
This is release under the BSD license.

These libraries have their own licenses; we recommend you read them,
as their terms may differ from the terms below.

Expand Down

0 comments on commit 12f7642

Please sign in to comment.