You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ic...@apache.org on 2023/10/16 12:43:45 UTC
svn commit: r1913020 - in /httpd/httpd/branches/2.4.x: ./ modules/http2/h2_session.c
Author: icing
Date: Mon Oct 16 12:43:44 2023
New Revision: 1913020
URL: http://svn.apache.org/viewvc?rev=1913020&view=rev
Log:
* modules/http2/h2_session.c (h2_session_start):
Restrict WebSockets options handling to with-WS builds.
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/http2/h2_session.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1913019
Modified: httpd/httpd/branches/2.4.x/modules/http2/h2_session.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/http2/h2_session.c?rev=1913020&r1=1913019&r2=1913020&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/http2/h2_session.c (original)
+++ httpd/httpd/branches/2.4.x/modules/http2/h2_session.c Mon Oct 16 12:43:44 2023
@@ -1085,11 +1085,13 @@ static apr_status_t h2_session_start(h2_
settings[slen].value = win_size;
++slen;
}
+#if H2_USE_WEBSOCKETS
if (h2_config_sgeti(session->s, H2_CONF_WEBSOCKETS)) {
settings[slen].settings_id = NGHTTP2_SETTINGS_ENABLE_CONNECT_PROTOCOL;
settings[slen].value = 1;
++slen;
}
+#endif
ap_log_cerror(APLOG_MARK, APLOG_DEBUG, status, session->c1,
H2_SSSN_LOG(APLOGNO(03201), session,