summaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorRich Trott <rtrott@gmail.com>2018-06-22 11:03:56 -0700
committerRich Trott <rtrott@gmail.com>2018-06-24 20:41:58 -0700
commit1e7ff81e47bed3275728eee1a676ba95e4f2b41d (patch)
tree866c5d1a0e4ab364ba63033351ecfb4f6411d75f /LICENSE
parent537a4baa443daea9850a8e324b5b4d7c21dd2717 (diff)
downloadnode-new-1e7ff81e47bed3275728eee1a676ba95e4f2b41d.tar.gz
doc: update LICENSE file
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: https://github.com/nodejs/node/pull/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>
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE11
1 files changed, 5 insertions, 6 deletions
diff --git a/LICENSE b/LICENSE
index e425dff429..d768eb3e2d 100644
--- a/LICENSE
+++ b/LICENSE
@@ -93,11 +93,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
@@ -612,7 +608,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
@@ -715,6 +711,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.