Repository navigation
[2.4.x] Backport mod_env SetEnvFromFile - #934
cisbiceanu wants to merge 4 commits into
Conversation
Backport trunk commit 837965f (r1938506). Include the stable-branch documentation, changelog, and test availability marker for 2.4.70. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
notroj
left a comment
There was a problem hiding this comment.
Thanks for filing the backport PR.
Apache 2.4.70 has already been released, and the 2.4.71-rc1 candidate does not contain SetEnvFromFile. Update the directive's documented availability and regression-test release threshold to the proposed 2.4.72 release. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Thanks @notroj for reviewing and approving this backport! |
Thanks for doing that adjustment, LGTM. With passing CI, you'll need two committers to review and then we can merge for the next release. |
|
Thanks @notroj for clarifying the next steps. All CI checks are now passing in my fork, including Linux, Windows, and Sanity: cisbiceanu#3 |
|
Hi @covener and @rpluem — thanks again for your feedback during the original SetEnvFromFile discussion on dev@, particularly around the .htaccess security concerns. |
Keep the existing backport review history while updating to the current stable development branch. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
Backport trunk commit 784e454 (apache#1004), addressing the review requests on apache#934. Reject non-EOF read failures with file and line diagnostics. Support SetEnv-style single- and double-quoted values, preserve quoted whitespace, and reject malformed quoting. Carry all accepted regression cases and XML guidance while retaining the 2.4.72 availability marker and stable-branch documentation formatting. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
|
Hi @rpluem, It looks like all the checks are passing now: https://github.com/cisbiceanu/httpd/pull/3/checks Whenever you have some time, I’d really appreciate it if you could have a look and approve the PR. In parallel, I’m trying to secure the remaining approval out of the three required. Hopefully, I can get everything lined up before the end of the year. Thanks a lot! |
|
Hi @rpluem, thanks for approving the backport. The Windows CI job failed in The upstream Could you rerun the failed Windows job when you have a chance? |
This PR proposes backporting the
SetEnvFromFiledirective from trunk to the stable2.4.xbranch.The implementation was accepted in 837965fd1e (r1938506), following discussion in #750.
Motivation
SetEnvFromFileallows administrators to populate httpd’s internal environment from a file ofname=valueentries, read at configuration time. This keeps variable values separate from the main configuration while preserving the behavior ofSetEnvfor CGI, SSI, and other consumers.Changes
mod_envimplementation without functional changes.As in trunk, the directive is not permitted in
.htaccess, to prevent untrusted configuration authors from exposing files readable by the server.Validation
Built and tested locally on macOS against Apache 2.4.70-dev. All four directive regression tests passed: file parsing, malformed-line handling,
.htaccessrejection, and missing-file configuration failure. Documentation DTD validation also passed.The release number is provisional and can be adjusted to the version selected for the backport. The corresponding
backported_intest marker should also be mirrored to trunk when the backport is accepted.