Add a new SetEnvFromFile directive that reads internal environment va… - #750
Open
cisbiceanu wants to merge 3 commits into
Open
cisbiceanu wants to merge 3 commits into
cisbiceanu wants to merge 3 commits into
Conversation
…riables from a file of "name=value" lines at configuration time. Each entry is stored in the same per-directory table used by SetEnv, so the values merge and reach r->subprocess_env identically and are available to CGI, SSI, logging and other consumers.
cisbiceanu
force-pushed
the
mod-env-setEnvFromFile
branch
from
September 10, 2026 14:22
8406019 to
aa364b5
Compare
# Conflicts: # docs/log-message-tags/next-number # test/modules/metadata/env.py
- Expect the renumbered AH10632 log tag: the trunk merge moved it from AH10624, which collided with mod_mime_libmagic. - Make the malformed-line and missing-file tests pass under mpm_winnt. apachectl_stderr is None on the winnt start path, and the AH10632 warning lands in the error log (possibly more than once) rather than on stderr. Guard stderr, accept the warning from either place, and mark it as caught so the teardown log check does not flag it. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
cisbiceanu
force-pushed
the
mod-env-setEnvFromFile
branch
from
September 18, 2026 12:18
02768eb to
e52c2ca
Compare
Author
|
Hi @notroj , I created a separate PR on my personal fork: https://github.com/cisbiceanu/httpd/pull/1/checks It looks like all checks have passed successfully. Thank you for guiding me through the process and helping me get to this point. If you notice anything I may have overlooked or if there are areas that could be improved, please feel free to tag me. I'd be happy to take a closer look and make any necessary updates. |
Collaborator
|
If there's no other feedback from dev@ I'll merge this next week. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
mod_env: Add SetEnvFromFile directive
Add a new SetEnvFromFile directive that reads internal environment
variables from a file of "name=value" lines at configuration time.
Each entry is stored in the same per-directory table used by SetEnv,
so the values merge and reach r->subprocess_env identically and are
available to CGI, SSI, logging and other consumers.
The file is read once when the configuration is parsed. Blank lines
and '#' comments are ignored, surrounding whitespace is stripped, and
a line without '=' sets the variable to an empty string. A line ending
in a backslash is continued on the next line, as in the main
configuration files. A line with no variable name (e.g. beginning with
'=') is skipped with a warning. Relative paths are resolved against
ServerRoot. A missing or unreadable file fails configuration with an
error, consistent with other file-backed directives.
Unlike SetEnv, SetEnvFromFile reads the contents of a file into the
environment, so it is restricted to the main server configuration
(RSRC_CONF | ACCESS_CONF) and is not permitted in .htaccess. This
prevents an untrusted author from reading any file the server can
read into the environment.
Because SetEnvFromFile and SetEnv write the same table, precedence
follows configuration order (last writer wins), matching existing
SetEnv semantics.
the SetEnvFromFile (RSRC_CONF | ACCESS_CONF, TAKE1) directive; warn
(AH10624) on a line with no variable name.
backslash continuation and the .htaccess restriction.
tests for parsing (including whitespace and line continuation), the
malformed-line warning, rejection in .htaccess, and failure on a
missing file.