*) Constify static arrays of string constants.

jimjag · jimjag · commit 95e4ddaaa01d · 2026-07-02T19:54:30.000Z
trunk patch: https://svn.apache.org/r1933659 git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1935817 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/STATUS b/STATUS
@@ -163,11 +163,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-  *) Constify static arrays of string constants.
-     trunk patch: https://svn.apache.org/r1933659
-     2.4.x patch: svn merge -c 1933659 ^/httpd/httpd/trunk .
-     +1: rjung, jorton, jim
-
   *) include/httpd.h: Define HTTP_EARLY_HINTS (103) per RFC 8297.
      modules/http/http_protocol.c (status_lines): Add 103 response.
      Needed by backport 1934913 below.
diff --git a/modules/cache/mod_cache.c b/modules/cache/mod_cache.c
@@ -39,7 +39,7 @@ static ap_filter_rec_t *cache_invalidate_filter_handle;
 /**
  * Entity headers' names
  */
-static const char *MOD_CACHE_ENTITY_HEADERS[] = {
+static const char *const MOD_CACHE_ENTITY_HEADERS[] = {
     "Allow",
     "Content-Encoding",
     "Content-Language",
@@ -819,7 +819,7 @@ static apr_status_t cache_save_filter(ap_filter_t *f, apr_bucket_brigade *in)
     apr_time_t exp, date, lastmod, now;
     apr_off_t size = -1;
     cache_info *info = NULL;
-    const char *reason, **eh;
+    const char *reason, *const *eh;
     apr_pool_t *p;
     apr_bucket *e;
     apr_table_t *headers;
diff --git a/modules/filters/mod_proxy_html.c b/modules/filters/mod_proxy_html.c
@@ -1304,7 +1304,7 @@ static void proxy_html_insert(request_rec *r)
 }
 static void proxy_html_hooks(apr_pool_t *p)
 {
-    static const char *aszSucc[] = { "mod_filter.c", NULL };
+    static const char *const aszSucc[] = { "mod_filter.c", NULL };
     ap_register_output_filter_protocol("proxy-html", proxy_html_filter,
                                        NULL, AP_FTYPE_RESOURCE,
                           AP_FILTER_PROTO_CHANGE|AP_FILTER_PROTO_CHANGE_LENGTH);
diff --git a/modules/http2/h2_protocol.c b/modules/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/modules/http2/h2_proxy_session.c b/modules/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/modules/http2/h2_session.c b/modules/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 */
diff --git a/modules/loggers/mod_logio.c b/modules/loggers/mod_logio.c
@@ -254,7 +254,7 @@ static const command_rec logio_cmds[] = {
 
 static void register_hooks(apr_pool_t *p)
 {
-    static const char *pre[] = { "mod_log_config.c", NULL };
+    static const char *const pre[] = { "mod_log_config.c", NULL };
 
     ap_hook_pre_connection(logio_pre_conn, NULL, NULL, APR_HOOK_MIDDLE);
     ap_hook_pre_config(logio_pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST);
diff --git a/modules/mappers/mod_speling.c b/modules/mappers/mod_speling.c
@@ -125,7 +125,7 @@ typedef enum {
     SP_VERYDIFFERENT = 6
 } sp_reason;
 
-static const char *sp_reason_str[] =
+static const char *const sp_reason_str[] =
 {
     "identical",
     "miscapitalized",
diff --git a/modules/md/md_log.c b/modules/md/md_log.c
@@ -22,7 +22,7 @@
 
 #define LOG_BUFFER_LEN  1024
 
-static const char *level_names[] = {
+static const char *const level_names[] = {
     "emergency",
     "alert",
     "crit",
diff --git a/modules/md/md_store.c b/modules/md/md_store.c
@@ -47,7 +47,7 @@
 #define GNAME_STAGING      
 #define GNAME_ARCHIVE      
 
-static const char *GROUP_NAME[] = {
+static const char *const GROUP_NAME[] = {
     "none",
     "accounts",
     "challenges",
diff --git a/modules/proxy/ajp_header.c b/modules/proxy/ajp_header.c
@@ -21,7 +21,7 @@
 
 APLOG_USE_MODULE(proxy_ajp);
 
-static const char *response_trans_headers[] = {
+static const char *const response_trans_headers[] = {
     "Content-Type",
     "Content-Language",
     "Content-Length",
diff --git a/modules/proxy/mod_proxy_http.c b/modules/proxy/mod_proxy_http.c
@@ -772,7 +772,7 @@ static request_rec *make_fake_req(conn_rec *c, request_rec *r)
 static void process_proxy_header(request_rec *r, proxy_dir_conf *c,
                                  const char *key, const char *value)
 {
-    static const char *date_hdrs[]
+    static const char *const date_hdrs[]
         = { "Date", "Expires", "Last-Modified", NULL };
     static const struct {
         const char *name;
@@ -1038,7 +1038,7 @@ int ap_proxy_http_process_response(proxy_http_req_t *req)
     int pread_len = 0;
     apr_table_t *save_table;
     int backend_broke = 0;
-    static const char *hop_by_hop_hdrs[] =
+    static const char *const hop_by_hop_hdrs[] =
         {"Keep-Alive", "Proxy-Authenticate", "TE", "Trailer", "Upgrade", NULL};
     int i;
     const char *te = NULL;
diff --git a/modules/ssl/mod_ssl.c b/modules/ssl/mod_ssl.c
@@ -714,12 +714,12 @@ static void ssl_register_hooks(apr_pool_t *p)
 {
     /* ssl_hook_ReadReq needs to use the BrowserMatch settings so must
      * run after mod_setenvif's post_read_request hook. */
-    static const char *pre_prr[] = { "mod_setenvif.c", NULL };
+    static const char *const pre_prr[] = { "mod_setenvif.c", NULL };
     /* The ssl_init_Module post_config hook should run before mod_proxy's
      * for the ssl proxy main configs to be merged with vhosts' before being
      * themselves merged with mod_proxy's in proxy_hook_section_post_config.
      */
-    static const char *b_pc[] = { "mod_proxy.c", NULL};
+    static const char *const b_pc[] = { "mod_proxy.c", NULL};
 
 
     ssl_io_filter_register(p);
diff --git a/server/protocol.c b/server/protocol.c
@@ -76,7 +76,7 @@ AP_DECLARE_DATA ap_filter_rec_t *ap_old_write_func = NULL;
 
 
 /* Patterns to match in ap_make_content_type() */
-static const char *needcset[] = {
+static const char *const needcset[] = {
     "text/plain",
     "text/html",
     NULL

Original file line number	Diff line number	Diff line change
`@@ -1304,7 +1304,7 @@ static void proxy_html_insert(request_rec *r)`
`1304`	`1304`	`}`
`1305`	`1305`	`static void proxy_html_hooks(apr_pool_t *p)`
`1306`	`1306`	`{`
`1307`		`- static const char *aszSucc[] = { "mod_filter.c", NULL };`
	`1307`	`+ static const char *const aszSucc[] = { "mod_filter.c", NULL };`
`1308`	`1308`	`ap_register_output_filter_protocol("proxy-html", proxy_html_filter,`
`1309`	`1309`	`NULL, AP_FTYPE_RESOURCE,`
`1310`	`1310`	`AP_FILTER_PROTO_CHANGE\|AP_FILTER_PROTO_CHANGE_LENGTH);`
Original file line number	Diff line number	Diff line change
`@@ -1188,7 +1188,7 @@ static apr_status_t session_shutdown(h2_proxy_session *session, int reason,`
`1188`	`1188`	`}`
`1189`	`1189`
`1190`	`1190`
`1191`		`-static const char *StateNames[] = {`
	`1191`	`+static const char *const StateNames[] = {`
`1192`	`1192`	`"INIT", /* H2_PROXYS_ST_INIT */`
`1193`	`1193`	`"DONE", /* H2_PROXYS_ST_DONE */`
`1194`	`1194`	`"IDLE", /* H2_PROXYS_ST_IDLE */`
Original file line number	Diff line number	Diff line change
`@@ -1416,7 +1416,7 @@ static void on_stream_output(void ctx, h2_stream stream)`
`1416`	`1416`	`}`
`1417`	`1417`
`1418`	`1418`
`1419`		`-static const char *StateNames[] = {`
	`1419`	`+static const char *const StateNames[] = {`
`1420`	`1420`	`"INIT", /* H2_SESSION_ST_INIT */`
`1421`	`1421`	`"DONE", /* H2_SESSION_ST_DONE */`
`1422`	`1422`	`"IDLE", /* H2_SESSION_ST_IDLE */`
Original file line number	Diff line number	Diff line change
`@@ -254,7 +254,7 @@ static const command_rec logio_cmds[] = {`
`254`	`254`
`255`	`255`	`static void register_hooks(apr_pool_t *p)`
`256`	`256`	`{`
`257`		`- static const char *pre[] = { "mod_log_config.c", NULL };`
	`257`	`+ static const char *const pre[] = { "mod_log_config.c", NULL };`
`258`	`258`
`259`	`259`	`ap_hook_pre_connection(logio_pre_conn, NULL, NULL, APR_HOOK_MIDDLE);`
`260`	`260`	`ap_hook_pre_config(logio_pre_config, NULL, NULL, APR_HOOK_REALLY_FIRST);`
Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ typedef enum {`
`125`	`125`	`SP_VERYDIFFERENT = 6`
`126`	`126`	`} sp_reason;`
`127`	`127`
`128`		`-static const char *sp_reason_str[] =`
	`128`	`+static const char *const sp_reason_str[] =`
`129`	`129`	`{`
`130`	`130`	`"identical",`
`131`	`131`	`"miscapitalized",`