From 620e5bc746d0fdf0b43f63a9e3e0b461e4fe952f Mon Sep 17 00:00:00 2001 From: Stefan Eissing Date: Tue, 26 May 2026 09:01:44 +0200 Subject: [PATCH] minor changes synched from httpd trunk --- mod_http2/h2_mplx.c | 4 ++-- mod_http2/h2_protocol.c | 4 ++-- mod_http2/h2_proxy_session.c | 2 +- mod_http2/h2_session.c | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/mod_http2/h2_mplx.c b/mod_http2/h2_mplx.c index addbea2a..8053f60c 100644 --- a/mod_http2/h2_mplx.c +++ b/mod_http2/h2_mplx.c @@ -1099,7 +1099,7 @@ static void s_mplx_be_happy(h2_mplx *m, conn_rec *c, h2_conn_ctx_t *conn_ctx) m->last_mood_change = now; m->irritations_since = 0; ap_log_cerror(APLOG_MARK, APLOG_TRACE1, 0, c, - H2_MPLX_MSG(m, "mood update, increasing worker limit " + H2_MPLX_MSG(m, "mood update, increasing worker limit" "to %d, processing %d right now"), m->processing_limit, m->processing_count); } @@ -1263,7 +1263,7 @@ static apr_status_t mplx_pollset_poll(h2_mplx *m, apr_interval_time_t timeout, if (APR_SUCCESS != rv) { if (APR_STATUS_IS_TIMEUP(rv)) { ap_log_cerror(APLOG_MARK, APLOG_TRACE2, 0, m->c1, - H2_MPLX_MSG(m, "polling timed out")); + H2_MPLX_MSG(m, "polling timed out ")); } else { ap_log_cerror(APLOG_MARK, APLOG_ERR, rv, m->c1, APLOGNO(10310) \ diff --git a/mod_http2/h2_protocol.c b/mod_http2/h2_protocol.c index 874753e4..84a17ef8 100644 --- a/mod_http2/h2_protocol.c +++ b/mod_http2/h2_protocol.c @@ -58,7 +58,7 @@ const char *H2_MAGIC_TOKEN = "PRI * HTTP/2.0\r\n\r\nSM\r\n\r\n"; /******************************************************************************* * HTTP/2 error stuff */ -static const char *h2_err_descr[] = { +static const char *const h2_err_descr[] = { "no error", /* 0x0 */ "protocol error", "internal error", @@ -91,7 +91,7 @@ const char *h2_protocol_err_description(unsigned int h2_error) * Black Listed Ciphers from RFC 7549 Appendix A * */ -static const char *RFC7540_names[] = { +static const char *const RFC7540_names[] = { /* ciphers with NULL encrpytion */ "NULL-MD5", /* TLS_NULL_WITH_NULL_NULL */ /* same */ /* TLS_RSA_WITH_NULL_MD5 */ diff --git a/mod_http2/h2_proxy_session.c b/mod_http2/h2_proxy_session.c index 3561c241..166b6468 100644 --- a/mod_http2/h2_proxy_session.c +++ b/mod_http2/h2_proxy_session.c @@ -1188,7 +1188,7 @@ static apr_status_t session_shutdown(h2_proxy_session *session, int reason, } -static const char *StateNames[] = { +static const char *const StateNames[] = { "INIT", /* H2_PROXYS_ST_INIT */ "DONE", /* H2_PROXYS_ST_DONE */ "IDLE", /* H2_PROXYS_ST_IDLE */ diff --git a/mod_http2/h2_session.c b/mod_http2/h2_session.c index dda6c771..3affaf2a 100644 --- a/mod_http2/h2_session.c +++ b/mod_http2/h2_session.c @@ -1416,7 +1416,7 @@ static void on_stream_output(void *ctx, h2_stream *stream) } -static const char *StateNames[] = { +static const char *const StateNames[] = { "INIT", /* H2_SESSION_ST_INIT */ "DONE", /* H2_SESSION_ST_DONE */ "IDLE", /* H2_SESSION_ST_IDLE */