quic: remove quic

PR-URL: #37067 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Michael Dawson <[email protected]> Reviewed-By: Trivikram Kamat <[email protected]>
nodejs · Feb 2, 2021 · 11dd267 · 11dd267
1 parent f74b376
commit 11dd267
Show file tree

Hide file tree

Showing 234 changed files with 16 additions and 83,440 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -39,7 +39,7 @@
 /doc/api/net.md @nodejs/net
 /lib/dgram.js @nodejs/net
 /lib/dns.js @nodejs/net
-/lib/net.js @nodejs/net @nodejs/quic
+/lib/net.js @nodejs/net
 /lib/internal/dgram.js @nodejs/net
 /lib/internal/dns/* @nodejs/net
 /lib/internal/net.js @nodejs/net
@@ -59,7 +59,7 @@
 /lib/crypto.js @nodejs/crypto
 /lib/tls.js @nodejs/crypto @nodejs/net
 /src/node_crypto* @nodejs/crypto
-/src/crypto/* @nodejs/crypto @nodejs/quic
+/src/crypto/* @nodejs/crypto
 
 # http
 
@@ -68,7 +68,7 @@
 /lib/_http_* @nodejs/http @nodejs/net
 /lib/http.js @nodejs/http @nodejs/net
 /lib/https.js @nodejs/crypto @nodejs/net @nodejs/http
-/src/node_http_common* @nodejs/http @nodejs/http2 @nodejs/quic @nodejs/net
+/src/node_http_common* @nodejs/http @nodejs/http2 @nodejs/net
 /src/node_http_parser.cc @nodejs/http @nodejs/net
 
 # http2
@@ -80,15 +80,6 @@
 /src/node_http2* @nodejs/http2 @nodejs/net
 /src/node_mem* @nodejs/http2
 
-# quic
-
-/deps/ngtcp2/ @nodejs/quic
-/deps/nghttp3/ @nodejs/quic
-/doc/api/quic.md @nodejs/quic
-/lib/internal/quic/ @nodejs/quic
-/src/node_bob* @nodejs/quic
-/src/quic/ @nodejs/quic
-
 # modules
 
 /doc/api/modules.md @nodejs/modules

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -14,7 +14,7 @@ env:
   FLAKY_TESTS: dontcare
 
 jobs:
-  build-windows-with-quic:
+  build-windows:
     if: github.event.pull_request.draft == false
     runs-on: windows-latest
     steps:
@@ -28,4 +28,4 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Build
-        run: ./vcbuild.bat experimental-quic
+        run: ./vcbuild.bat
diff --git a/.github/workflows/test-linux.yml b/.github/workflows/test-linux.yml
@@ -29,19 +29,3 @@ jobs:
         run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn"
       - name: Test
         run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"
-
-  test-linux-with-quic:
-    if: github.event.pull_request.draft == false
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - name: Set up Python ${{ env.PYTHON_VERSION }}
-        uses: actions/setup-python@v2
-        with:
-          python-version: ${{ env.PYTHON_VERSION }}
-      - name: Environment Information
-        run: npx envinfo
-      - name: Build
-        run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
-      - name: Test
-        run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"
diff --git a/.github/workflows/test-macos.yml b/.github/workflows/test-macos.yml
@@ -14,7 +14,7 @@ env:
   FLAKY_TESTS: dontcare
 
 jobs:
-  test-macOS-with-quic:
+  test-macOS:
     if: github.event.pull_request.draft == false
     runs-on: macos-latest
     steps:
@@ -26,6 +26,6 @@ jobs:
       - name: Environment Information
         run: npx envinfo
       - name: Build
-        run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
+        run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn"
       - name: Test
         run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"
diff --git a/LICENSE b/LICENSE
@@ -1333,58 +1333,6 @@ The externally maintained libraries used by Node.js are:
     WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
   """
 
-- ngtcp2, located at deps/ngtcp2, is licensed as follows:
-  """
-    The MIT License
-
-    Copyright (c) 2016 ngtcp2 contributors
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  """
-
-- nghttp3, located at deps/nghttp3, is licensed as follows:
-  """
-    The MIT License
-
-    Copyright (c) 2019 nghttp3 contributors
-
-    Permission is hereby granted, free of charge, to any person obtaining
-    a copy of this software and associated documentation files (the
-    "Software"), to deal in the Software without restriction, including
-    without limitation the rights to use, copy, modify, merge, publish,
-    distribute, sublicense, and/or sell copies of the Software, and to
-    permit persons to whom the Software is furnished to do so, subject to
-    the following conditions:
-
-    The above copyright notice and this permission notice shall be
-    included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-    EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-    MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-    NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-    LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-    OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-    WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-  """
-
 - node-inspect, located at deps/node-inspect, is licensed as follows:
   """
     Copyright Node.js contributors. All rights reserved.

diff --git a/configure.py b/configure.py
@@ -122,12 +122,6 @@
     default=None,
     help='Turn compiler warnings into errors for node core sources.')
 
-parser.add_argument('--experimental-quic',
-    action='store_true',
-    dest='experimental_quic',
-    default=None,
-    help='enable experimental quic support')
-
 parser.add_argument('--gdb',
     action='store_true',
     dest='gdb',
@@ -289,50 +283,6 @@
     dest='shared_nghttp2_libpath',
     help='a directory to search for the shared nghttp2 DLLs')
 
-shared_optgroup.add_argument('--shared-ngtcp2',
-    action='store_true',
-    dest='shared_ngtcp2',
-    default=None,
-    help='link to a shared ngtcp2 DLL instead of static linking')
-
-shared_optgroup.add_argument('--shared-ngtcp2-includes',
-    action='store',
-    dest='shared_ngtcp2_includes',
-    help='directory containing ngtcp2 header files')
-
-shared_optgroup.add_argument('--shared-ngtcp2-libname',
-    action='store',
-    dest='shared_ngtcp2_libname',
-    default='ngtcp2',
-    help='alternative lib name to link to [default: %(default)s]')
-
-shared_optgroup.add_argument('--shared-ngtcp2-libpath',
-    action='store',
-    dest='shared_ngtcp2_libpath',
-    help='a directory to search for the shared ngtcp2 DLLs')
-
-shared_optgroup.add_argument('--shared-nghttp3',
-    action='store_true',
-    dest='shared_nghttp3',
-    default=None,
-    help='link to a shared nghttp3 DLL instead of static linking')
-
-shared_optgroup.add_argument('--shared-nghttp3-includes',
-    action='store',
-    dest='shared_nghttp3_includes',
-    help='directory containing nghttp3 header files')
-
-shared_optgroup.add_argument('--shared-nghttp3-libname',
-    action='store',
-    dest='shared_nghttp3_libname',
-    default='nghttp3',
-    help='alternative lib name to link to [default: %(default)s]')
-
-shared_optgroup.add_argument('--shared-nghttp3-libpath',
-    action='store',
-    dest='shared_nghttp3_libpath',
-    help='a directory to search for the shared nghttp3 DLLs')
-
 shared_optgroup.add_argument('--shared-openssl',
     action='store_true',
     dest='shared_openssl',
@@ -1290,14 +1240,6 @@ def configure_node(o):
   else:
     o['variables']['debug_nghttp2'] = 'false'
 
-  if options.experimental_quic:
-    if options.shared_openssl:
-      raise Exception('QUIC requires a modified version of OpenSSL and '
-                      'cannot be enabled when using --shared-openssl.')
-    o['variables']['experimental_quic'] = 1
-  else:
-    o['variables']['experimental_quic'] = 'false'
-
   o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
 
   o['variables']['node_shared'] = b(options.shared)
@@ -1421,8 +1363,6 @@ def without_ssl_error(option):
       without_ssl_error('--openssl-fips')
     if options.openssl_default_cipher_list:
       without_ssl_error('--openssl-default-cipher-list')
-    if options.experimental_quic:
-      without_ssl_error('--experimental-quic')
     return
 
   if options.use_openssl_ca_store:

diff --git a/deps/nghttp3/COPYING b/deps/nghttp3/COPYING
diff --git a/deps/nghttp3/lib/includes/config.h b/deps/nghttp3/lib/includes/config.h