You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2025/12/01 12:06:46 UTC
svn commit: r1930168 - in httpd/httpd/branches/2.4.x: . modules/mappers modules/metadata
Author: covener
Date: Mon Dec 1 12:06:46 2025
New Revision: 1930168
Log:
Merge r1930164 from trunk:
don't use request notes for suexec
also, stop accepting the obscure "note" option in
RequestHeader, it is only documented/described as being
meant for Header (output filter).
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/modules/mappers/mod_userdir.c
httpd/httpd/branches/2.4.x/modules/metadata/mod_headers.c
Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_userdir.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_userdir.c Mon Dec 1 12:06:00 2025 (r1930167)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_userdir.c Mon Dec 1 12:06:46 2025 (r1930168)
@@ -334,7 +334,7 @@ static int translate_userdir(request_rec
r->finfo = statbuf;
/* For use in the get_suexec_identity phase */
- apr_table_setn(r->notes, "mod_userdir_user", user);
+ ap_set_module_config(r->request_config, &userdir_module, (void *)user);
return OK;
}
@@ -348,7 +348,7 @@ static ap_unix_identity_t *get_suexec_id
{
ap_unix_identity_t *ugid = NULL;
#if APR_HAS_USER
- const char *username = apr_table_get(r->notes, "mod_userdir_user");
+ const char *username = (const char*) ap_get_module_config(r->request_config, &userdir_module);
if (username == NULL) {
return NULL;
Modified: httpd/httpd/branches/2.4.x/modules/metadata/mod_headers.c
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/metadata/mod_headers.c Mon Dec 1 12:06:00 2025 (r1930167)
+++ httpd/httpd/branches/2.4.x/modules/metadata/mod_headers.c Mon Dec 1 12:06:46 2025 (r1930168)
@@ -455,8 +455,12 @@ static APR_INLINE const char *header_ino
new->action = hdr_edit;
else if (!strcasecmp(action, "edit*"))
new->action = hdr_edit_r;
- else if (!strcasecmp(action, "note"))
+ else if (!strcasecmp(action, "note")) {
+ if (cmd->info == &hdr_in) {
+ return "RequestHeader does not support the 'note' action";
+ }
new->action = hdr_note;
+ }
else
return "first argument must be 'add', 'set', 'setifempty', 'append', 'merge', "
"'unset', 'echo', 'note', 'edit', or 'edit*'.";