Skip to content

Commit c3d6d50

Browse files
committed
quic: remove quic
PR-URL: #37067 Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Rich Trott <rtrott@gmail.com> Reviewed-By: Tobias Nießen <tniessen@tnie.de> Reviewed-By: Michael Dawson <midawson@redhat.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
1 parent f763a80 commit c3d6d50

File tree

234 files changed

+16
-83440
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+16
-83440
lines changed

.github/CODEOWNERS

+3-12
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
/doc/api/net.md @nodejs/net
4040
/lib/dgram.js @nodejs/net
4141
/lib/dns.js @nodejs/net
42-
/lib/net.js @nodejs/net @nodejs/quic
42+
/lib/net.js @nodejs/net
4343
/lib/internal/dgram.js @nodejs/net
4444
/lib/internal/dns/* @nodejs/net
4545
/lib/internal/net.js @nodejs/net
@@ -59,7 +59,7 @@
5959
/lib/crypto.js @nodejs/crypto
6060
/lib/tls.js @nodejs/crypto @nodejs/net
6161
/src/node_crypto* @nodejs/crypto
62-
/src/crypto/* @nodejs/crypto @nodejs/quic
62+
/src/crypto/* @nodejs/crypto
6363

6464
# http
6565

@@ -68,7 +68,7 @@
6868
/lib/_http_* @nodejs/http @nodejs/net
6969
/lib/http.js @nodejs/http @nodejs/net
7070
/lib/https.js @nodejs/crypto @nodejs/net @nodejs/http
71-
/src/node_http_common* @nodejs/http @nodejs/http2 @nodejs/quic @nodejs/net
71+
/src/node_http_common* @nodejs/http @nodejs/http2 @nodejs/net
7272
/src/node_http_parser.cc @nodejs/http @nodejs/net
7373

7474
# http2
@@ -80,15 +80,6 @@
8080
/src/node_http2* @nodejs/http2 @nodejs/net
8181
/src/node_mem* @nodejs/http2
8282

83-
# quic
84-
85-
/deps/ngtcp2/ @nodejs/quic
86-
/deps/nghttp3/ @nodejs/quic
87-
/doc/api/quic.md @nodejs/quic
88-
/lib/internal/quic/ @nodejs/quic
89-
/src/node_bob* @nodejs/quic
90-
/src/quic/ @nodejs/quic
91-
9283
# modules
9384

9485
/doc/api/modules.md @nodejs/modules

.github/workflows/build-windows.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
FLAKY_TESTS: dontcare
1515

1616
jobs:
17-
build-windows-with-quic:
17+
build-windows:
1818
if: github.event.pull_request.draft == false
1919
runs-on: windows-latest
2020
steps:
@@ -28,4 +28,4 @@ jobs:
2828
- name: Environment Information
2929
run: npx envinfo
3030
- name: Build
31-
run: ./vcbuild.bat experimental-quic
31+
run: ./vcbuild.bat

.github/workflows/test-linux.yml

-16
Original file line numberDiff line numberDiff line change
@@ -29,19 +29,3 @@ jobs:
2929
run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn"
3030
- name: Test
3131
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"
32-
33-
test-linux-with-quic:
34-
if: github.event.pull_request.draft == false
35-
runs-on: ubuntu-latest
36-
steps:
37-
- uses: actions/checkout@v2
38-
- name: Set up Python ${{ env.PYTHON_VERSION }}
39-
uses: actions/setup-python@v2
40-
with:
41-
python-version: ${{ env.PYTHON_VERSION }}
42-
- name: Environment Information
43-
run: npx envinfo
44-
- name: Build
45-
run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
46-
- name: Test
47-
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"

.github/workflows/test-macos.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ env:
1414
FLAKY_TESTS: dontcare
1515

1616
jobs:
17-
test-macOS-with-quic:
17+
test-macOS:
1818
if: github.event.pull_request.draft == false
1919
runs-on: macos-latest
2020
steps:
@@ -26,6 +26,6 @@ jobs:
2626
- name: Environment Information
2727
run: npx envinfo
2828
- name: Build
29-
run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn --experimental-quic"
29+
run: make build-ci -j2 V=1 CONFIG_FLAGS="--error-on-warn"
3030
- name: Test
3131
run: make run-ci -j2 V=1 TEST_CI_ARGS="-p actions"

LICENSE

-52
Original file line numberDiff line numberDiff line change
@@ -1333,58 +1333,6 @@ The externally maintained libraries used by Node.js are:
13331333
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
13341334
"""
13351335

1336-
- ngtcp2, located at deps/ngtcp2, is licensed as follows:
1337-
"""
1338-
The MIT License
1339-
1340-
Copyright (c) 2016 ngtcp2 contributors
1341-
1342-
Permission is hereby granted, free of charge, to any person obtaining
1343-
a copy of this software and associated documentation files (the
1344-
"Software"), to deal in the Software without restriction, including
1345-
without limitation the rights to use, copy, modify, merge, publish,
1346-
distribute, sublicense, and/or sell copies of the Software, and to
1347-
permit persons to whom the Software is furnished to do so, subject to
1348-
the following conditions:
1349-
1350-
The above copyright notice and this permission notice shall be
1351-
included in all copies or substantial portions of the Software.
1352-
1353-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1354-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1355-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1356-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1357-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1358-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1359-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1360-
"""
1361-
1362-
- nghttp3, located at deps/nghttp3, is licensed as follows:
1363-
"""
1364-
The MIT License
1365-
1366-
Copyright (c) 2019 nghttp3 contributors
1367-
1368-
Permission is hereby granted, free of charge, to any person obtaining
1369-
a copy of this software and associated documentation files (the
1370-
"Software"), to deal in the Software without restriction, including
1371-
without limitation the rights to use, copy, modify, merge, publish,
1372-
distribute, sublicense, and/or sell copies of the Software, and to
1373-
permit persons to whom the Software is furnished to do so, subject to
1374-
the following conditions:
1375-
1376-
The above copyright notice and this permission notice shall be
1377-
included in all copies or substantial portions of the Software.
1378-
1379-
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
1380-
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
1381-
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
1382-
NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
1383-
LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
1384-
OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
1385-
WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
1386-
"""
1387-
13881336
- node-inspect, located at deps/node-inspect, is licensed as follows:
13891337
"""
13901338
Copyright Node.js contributors. All rights reserved.

configure.py

-60
Original file line numberDiff line numberDiff line change
@@ -122,12 +122,6 @@
122122
default=None,
123123
help='Turn compiler warnings into errors for node core sources.')
124124

125-
parser.add_argument('--experimental-quic',
126-
action='store_true',
127-
dest='experimental_quic',
128-
default=None,
129-
help='enable experimental quic support')
130-
131125
parser.add_argument('--gdb',
132126
action='store_true',
133127
dest='gdb',
@@ -289,50 +283,6 @@
289283
dest='shared_nghttp2_libpath',
290284
help='a directory to search for the shared nghttp2 DLLs')
291285

292-
shared_optgroup.add_argument('--shared-ngtcp2',
293-
action='store_true',
294-
dest='shared_ngtcp2',
295-
default=None,
296-
help='link to a shared ngtcp2 DLL instead of static linking')
297-
298-
shared_optgroup.add_argument('--shared-ngtcp2-includes',
299-
action='store',
300-
dest='shared_ngtcp2_includes',
301-
help='directory containing ngtcp2 header files')
302-
303-
shared_optgroup.add_argument('--shared-ngtcp2-libname',
304-
action='store',
305-
dest='shared_ngtcp2_libname',
306-
default='ngtcp2',
307-
help='alternative lib name to link to [default: %(default)s]')
308-
309-
shared_optgroup.add_argument('--shared-ngtcp2-libpath',
310-
action='store',
311-
dest='shared_ngtcp2_libpath',
312-
help='a directory to search for the shared ngtcp2 DLLs')
313-
314-
shared_optgroup.add_argument('--shared-nghttp3',
315-
action='store_true',
316-
dest='shared_nghttp3',
317-
default=None,
318-
help='link to a shared nghttp3 DLL instead of static linking')
319-
320-
shared_optgroup.add_argument('--shared-nghttp3-includes',
321-
action='store',
322-
dest='shared_nghttp3_includes',
323-
help='directory containing nghttp3 header files')
324-
325-
shared_optgroup.add_argument('--shared-nghttp3-libname',
326-
action='store',
327-
dest='shared_nghttp3_libname',
328-
default='nghttp3',
329-
help='alternative lib name to link to [default: %(default)s]')
330-
331-
shared_optgroup.add_argument('--shared-nghttp3-libpath',
332-
action='store',
333-
dest='shared_nghttp3_libpath',
334-
help='a directory to search for the shared nghttp3 DLLs')
335-
336286
shared_optgroup.add_argument('--shared-openssl',
337287
action='store_true',
338288
dest='shared_openssl',
@@ -1290,14 +1240,6 @@ def configure_node(o):
12901240
else:
12911241
o['variables']['debug_nghttp2'] = 'false'
12921242

1293-
if options.experimental_quic:
1294-
if options.shared_openssl:
1295-
raise Exception('QUIC requires a modified version of OpenSSL and '
1296-
'cannot be enabled when using --shared-openssl.')
1297-
o['variables']['experimental_quic'] = 1
1298-
else:
1299-
o['variables']['experimental_quic'] = 'false'
1300-
13011243
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
13021244

13031245
o['variables']['node_shared'] = b(options.shared)
@@ -1421,8 +1363,6 @@ def without_ssl_error(option):
14211363
without_ssl_error('--openssl-fips')
14221364
if options.openssl_default_cipher_list:
14231365
without_ssl_error('--openssl-default-cipher-list')
1424-
if options.experimental_quic:
1425-
without_ssl_error('--experimental-quic')
14261366
return
14271367

14281368
if options.use_openssl_ca_store:

deps/nghttp3/COPYING

-22
This file was deleted.

deps/nghttp3/lib/includes/config.h

-39
This file was deleted.

0 commit comments

Comments
 (0)