Skip to content

TS-3620: Enable HTTP/2 by default #826

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryancall merged 1 commit into from
Jul 27, 2016
Merged

TS-3620: Enable HTTP/2 by default #826

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ci/tsqa/tests/test_http2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ def setUpEnv(cls, env):
cls.http2_port = tsqa.utils.bind_unused_port()[1]

# HTTP2 configs
cls.configs['records.config']['CONFIG']['proxy.config.http2.enabled'] = 1
cls.configs['records.config']['CONFIG']['proxy.config.http.server_ports'] += ' {0}:ssl'.format(cls.http2_port)
cls.configs['records.config']['CONFIG']['proxy.config.ssl.server.cert.path'] = helpers.tests_file_path('rsa_keys')
cls.configs['records.config']['CONFIG']['proxy.config.diags.debug.enabled'] = 1
Expand Down
1 change: 0 additions & 1 deletion ci/tsqa/tests/test_http2_spec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ def setUpEnv(cls, env):
cls.http2_port = tsqa.utils.bind_unused_port()[1]

# HTTP2 configs
cls.configs['records.config']['CONFIG']['proxy.config.http2.enabled'] = 1
cls.configs['records.config']['CONFIG']['proxy.config.http.server_ports'] += ' {0}:ssl'.format(cls.http2_port)
cls.configs['records.config']['CONFIG']['proxy.config.ssl.server.cert.path'] = helpers.tests_file_path('rsa_keys')
cls.configs['records.config']['CONFIG']['proxy.config.diags.debug.enabled'] = 1
Expand Down
10 changes: 0 additions & 10 deletions doc/admin-guide/files/records.config.en.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3276,16 +3276,6 @@ HTTP/2 Configuration
====================


.. ts:cv:: CONFIG proxy.config.http2.enabled INT 0

Enable the experimental HTTP/2 feature. This implements most of the
specifications, with the one big exception being server PUSH.

.. note::

This configuration will be eliminated for v6.0.0, where HTTP/2 is
enabled by default and controlled via the ports configuration.

.. ts:cv:: CONFIG proxy.config.http2.max_concurrent_streams_in INT 100
:reloadable:

Expand Down
7 changes: 0 additions & 7 deletions lib/records/RecHttp.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,13 +618,6 @@ ts_session_protocol_well_known_name_indices_init()

DEFAULT_TLS_SESSION_PROTOCOL_SET.markAllIn();

// Don't enable HTTP/2 by default until it is stable.
int http2_enabled = 0;
REC_ReadConfigInteger(http2_enabled, "proxy.config.http2.enabled");
if (!http2_enabled) {
DEFAULT_TLS_SESSION_PROTOCOL_SET.markOut(HTTP2_PROTOCOL_SET);
}

DEFAULT_NON_TLS_SESSION_PROTOCOL_SET = HTTP_PROTOCOL_SET;
}

Expand Down
2 changes: 0 additions & 2 deletions mgmt/RecordsConfig.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1438,8 +1438,6 @@ static const RecordElement RecordsConfig[] =
//# HTTP/2 global configuration.
//#
//############
{RECT_CONFIG, "proxy.config.http2.enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http2.stream_priority_enabled", RECD_INT, "0", RECU_DYNAMIC, RR_NULL, RECC_INT, "[0-1]", RECA_NULL}
,
{RECT_CONFIG, "proxy.config.http2.max_concurrent_streams_in", RECD_INT, "100", RECU_DYNAMIC, RR_NULL, RECC_STR, "^[0-9]+$", RECA_NULL}
Expand Down
6 changes: 0 additions & 6 deletions proxy/config/records.config.default.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,6 @@ CONFIG proxy.config.exec_thread.affinity INT 1
##############################################################################
CONFIG proxy.config.http.server_ports STRING 8080

##############################################################################
# Enable HTTP/2 Support. Docs:
# https://docs.trafficserver.apache.org/records.config#http-2-configuration
##############################################################################
CONFIG proxy.config.http2.enabled INT 0

##############################################################################
# Via: headers. Docs:
# https://docs.trafficserver.apache.org/records.config#proxy-config-http-insert-response-via-str
Expand Down