1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00

11136 Commits

Author SHA1 Message Date
Eric Covener
a8846a542e Post 2.4.68-rc1 tag updates
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/tags/2.4.68-rc1-candidate@1935021 13f79535-47bb-0310-9956-ffa450edef68
2026-06-05 12:03:44 +00:00
Rich Bowen
759eb62f2a docs: Rewrite AllowOverride Options= warning
The existing note about implicit disabling of Options was difficult
to parse. Rewrite as a type="warning" note with:
- Clear statement that the restriction controls enabling, not disabling
- Explanation of absolute vs relative (+/-) Options syntax
- Concrete example showing how inherited options get implicitly disabled

BZ#70099


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934980 13f79535-47bb-0310-9956-ffa450edef68
2026-06-04 15:23:59 +00:00
Lucien Gentis
0f35e2dc1d fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934931 13f79535-47bb-0310-9956-ffa450edef68
2026-06-03 15:47:17 +00:00
Lucien Gentis
8ff2fbeff7 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934893 13f79535-47bb-0310-9956-ffa450edef68
2026-06-02 15:55:24 +00:00
Joe Orton
4b51444e86 Merge r1931452, r1931453 from trunk:
core: Add millisecond support to ErrorLogFormat time specifiers

%{m} prints the timestamp in millisecond-resolution.

* include/util_time.h:
  Define new AP_CTIME_OPTION_MSEC option for printing time in milliseconds
  format.

* server/util_time.c (ap_recent_ctime_ex):
  Handle AP_CTIME_OPTION_MSEC to print time in a millisecond format.

* server/log.c (log_ctime):
  Recognize the m time option in both fast-path and composite %{...}t formats.

Submitted by: Luboš Uhliarik <luhliari redhat.com>

* server/log.c (log_ctime): Fix syntax error in r1931452
  (added by me when tweaking whitespace, not from the PR author).

Reviewed by: jorton, covener, jim
Github: closes #599


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934884 13f79535-47bb-0310-9956-ffa450edef68
2026-06-02 13:54:17 +00:00
Rich Bowen
023b3170d8 Fix RedirectMatch regex in ACME exemption recipe (bug 70084)
The negative lookahead (?!...) is zero-width and non-capturing, so
the original pattern matched only the leading slash and \$1 was
undefined. Add a capturing group (.*)$ after the lookahead so that
\$1 contains the remainder of the URL-path.

Same as trunk r1934878.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934879 13f79535-47bb-0310-9956-ffa450edef68
2026-06-02 12:56:53 +00:00
Lucien Gentis
6ffc8d0fdb fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934841 13f79535-47bb-0310-9956-ffa450edef68
2026-06-01 15:50:36 +00:00
Rich Bowen
7e1fb13d48 Rebuild all 2.4 docs to valid html5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934819 13f79535-47bb-0310-9956-ffa450edef68
2026-05-31 13:57:20 +00:00
Rich Bowen
203a26fd6c Update build/style to build valid html5
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934818 13f79535-47bb-0310-9956-ffa450edef68
2026-05-31 13:54:29 +00:00
Lucien Gentis
775ef9bed5 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934778 13f79535-47bb-0310-9956-ffa450edef68
2026-05-30 15:32:20 +00:00
Rich Bowen
0a963740fd Adds missing hooks to the request handling doc. (token_checker is
trunk-only)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934757 13f79535-47bb-0310-9956-ffa450edef68
2026-05-29 17:58:19 +00:00
Lucien Gentis
b13585f659 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934754 13f79535-47bb-0310-9956-ffa450edef68
2026-05-29 15:53:34 +00:00
Lucien Gentis
4698bc31b2 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934729 13f79535-47bb-0310-9956-ffa450edef68
2026-05-28 15:24:22 +00:00
Rich Bowen
ed39b58e34 rebuild
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934700 13f79535-47bb-0310-9956-ffa450edef68
2026-05-28 00:11:00 +00:00
Rich Bowen
881bc3def9 Correct backreference in ACME RedirectMatch
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934698 13f79535-47bb-0310-9956-ffa450edef68
2026-05-28 00:09:20 +00:00
Lucien Gentis
e65589df94 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934690 13f79535-47bb-0310-9956-ffa450edef68
2026-05-27 15:51:53 +00:00
Rich Bowen
a7356daef8 Remove redundant phrase
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934684 13f79535-47bb-0310-9956-ffa450edef68
2026-05-27 14:24:17 +00:00
Rich Bowen
6295c2de53 Rebuild rewrite docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934665 13f79535-47bb-0310-9956-ffa450edef68
2026-05-27 03:46:42 +00:00
Rich Bowen
c554bfec58 Backport rewrite guide improvements from trunk
Sync reorganized and expanded mod_rewrite documentation from trunk:
- Rewritten index with structured navigation
- Expanded flags reference with new examples (chain, cookie, DPI)
- Renamed htaccess doc to 'Per-directory Rewrites' with new sections
  on path stripping, RewriteBase, and loop behavior
- Expanded tech.xml with detailed per-directory processing explanation
- New recipes in remapping.xml: HTTPS behind load balancer, ACME
  exemption, trailing-slash handling, front-controller patterns
- Added prg: map Python example in rewritemap.xml
- Cross-reference links and glossary terms throughout
- Fixed incorrect <since> tags: SameSite is 2.4.47, UnsafePrefixStat
  is 2.4.60, UNC is 2.4.63 (were erroneously marked 2.5.1)
- Removed N flag iteration-limit paragraph (trunk-only feature)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934664 13f79535-47bb-0310-9956-ffa450edef68
2026-05-27 03:46:07 +00:00
Rich Bowen
822cd1ca19 Rebuild install docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934661 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 21:34:43 +00:00
Rich Bowen
2401972de5 Remove broken link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934660 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 21:30:35 +00:00
Christophe Jaillet
809839e753 Add a missing space in the syntax of GlobalLog.
While at it, remove some trailing spaces and add some "" to improve syntax highlight in an example. This also makes doc closer to trunk.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934652 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 18:30:25 +00:00
Christophe Jaillet
d00ba93749 Remove a compatibility reference to httpd 2.0.x.
While at it, synch with trunk, fix a typo and remove some trailing spaces.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934651 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 18:02:04 +00:00
Lucien Gentis
a50968ff50 fr doc XML files updates.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934645 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 15:32:31 +00:00
Rich Bowen
9085641693 docs: Modernize install.xml
- Remove mirrors reference and binary releases (both retired)
- Update all external links to https
- Update version examples to current 2.4.66/2.4.67
- Replace two-step gzip/tar with single tar xzf
- Reword download section for source builds
- Consolidate verification link to verification.html
- Remove minimizing language (easy, simple, simply)
- Add language="sh" to all highlight blocks
- Update disk space: 200 MB build (was 50), 50 MB installed (was 10)
- Replace deprecated ntpdate/xntpd with systemd-timesyncd/chrony
- Remove outdated Perl 5.003 version floor
- Update release examples from dead 2.0/2.2 to 2.4/2.6
- Update 'Mac OS X, Solaris' to 'macOS'
- Requirements intro: 'building' → 'building and running'

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934638 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 10:11:24 +00:00
Rich Bowen
78d29a9463 Rebuild html, metafiles
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934636 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 09:35:20 +00:00
Rich Bowen
0c659faa0a Correct systemctl syntax
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934634 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 09:34:05 +00:00
Rich Bowen
639f28ef38 docs: Regenerate rewrite PNGs at 125% size for readability
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934631 13f79535-47bb-0310-9956-ffa450edef68
2026-05-26 09:21:40 +00:00
Rich Bowen
3d24765e02 Rebuild with new diagrams
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934624 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 20:23:28 +00:00
Rich Bowen
f63116bd28 docs: Add SVG source for RewriteCond syntax diagram, regenerate PNG
Recreate syntax_rewritecond as editable SVG with color-coded callouts
for TestString, CondPattern, and [Flags]. Matches style of RewriteRule
syntax diagram.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934623 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 20:21:01 +00:00
Rich Bowen
f0e1235a55 docs: Add SVG source for RewriteRule syntax diagram, regenerate PNG
Recreate syntax_rewriterule as editable SVG with color-coded callouts
for Pattern, Substitution, and [Flags]. Text matches original content.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934621 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 20:16:43 +00:00
Rich Bowen
144583d241 docs: Regenerate PNGs from SVG sources
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934619 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 19:31:58 +00:00
Rich Bowen
2e9a852a59 docs: Remove unused rewrite_rule_flow diagram
Orphaned image never referenced in any doc. Its content is covered
by rewrite_process_uri which serves as Figure 2 in rewrite/tech.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934617 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 19:07:25 +00:00
Rich Bowen
f2ee119574 docs: Add SVG source for rewrite_process_uri, regenerate PNG
Recreate the ruleset processing flowchart as editable SVG. Adds
explicit 'no more rules' exit path and names RewriteCond in the
conditions diamond for clarity. Regenerate PNG from SVG source.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934615 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 19:04:11 +00:00
Rich Bowen
2892517b28 docs: Add backreference flow diagram (Figure 3) in rewrite/tech
Add SVG source and regenerated PNG for mod_rewrite_fig2 showing how
backreferences flow: $N from RewriteRule Pattern (matched first) to
all RewriteCond TestStrings and Substitution; %N from last matched
CondPattern to Substitution. Insert as Figure 3 in tech.html. Add
crosslink from intro.html backreferences section to the new diagram.
Remove obsolete GIF.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934613 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 18:41:58 +00:00
Rich Bowen
ebd80dfbdb docs: Insert mod_rewrite overview flowchart as Figure 1 in rewrite/tech
Add new per-request rewrite process diagram (Figure 1) showing both
per-server and per-directory phases with RewriteCond evaluation.
Renumber existing ruleset diagram to Figure 2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934611 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 18:21:56 +00:00
Rich Bowen
27bd04e66a docs: Add SVG source for rewrite overview flowchart
Add editable SVG source for mod_rewrite_fig1. Regenerate PNG from SVG.
Insert as Figure 1 in rewrite/tech.html showing the full per-request
rewrite process (per-server rules, redirect check, per-directory rules,
including RewriteCond evaluation). Remove obsolete GIF. Renumber existing
diagram to Figure 2.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934609 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 18:20:00 +00:00
Rich Bowen
c958729c80 docs: Normalize "server-variables" to "server variables" in mod_rewrite
Remove hyphenation from "Server-Variables"/"server-variables" in
mod/mod_rewrite.xml and rewrite/flags.xml — no RFC precedent exists
for the hyphenated form (RFC 3875 uses "meta-variables"). Rework the
module summary to clarify that HTTP headers and timestamps are a
subset of server variables, not separate categories. Link the term
to its definition in RewriteCond.

Addresses: https://bz.apache.org/bugzilla/show_bug.cgi?id=70059


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934606 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 17:48:25 +00:00
Rich Bowen
b36b083a03 docs: Clarify DPI flag wording re: PATH_INFO vs URL-path
The opening sentence of the DPI|discardpath section implied PATH_INFO
was a "portion of" the URL-path/URI, while the next sentence described
it as a separate value concatenated to the URL-path/URI. Reword to
make clear that PATH_INFO is appended, not an inherent component.

Also add glossary links for URL-path (trunk only).

bz#70052


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934604 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 17:21:23 +00:00
Rich Bowen
fdd7a60537 Add crosslinks between env.html and expr.html
env.html now references expr.html for the modern expression-based
approach to conditional headers, access control, and logging.
The CGI variables section links to the complete variable reference
on expr.html (including REQUEST_URI, REMOTE_ADDR, etc.).

expr.html now links back to env.html for how environment variables
are set (SetEnv, SetEnvIf, [E=...]) and for the special-purpose
variable list.

Addresses: https://bz.apache.org/bugzilla/show_bug.cgi?id=70066


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934600 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 16:35:10 +00:00
Lucien Gentis
15a575d7db fr doc XML file update.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934596 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 15:54:40 +00:00
Lucien Gentis
5d0eb2e375 fr doc XML file update
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934593 13f79535-47bb-0310-9956-ffa450edef68
2026-05-25 15:26:16 +00:00
Rich Bowen
d1d1036c53 Rebuild fix for bz#64596
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934557 13f79535-47bb-0310-9956-ffa450edef68
2026-05-24 16:02:27 +00:00
Rich Bowen
9502dccd31 Remove repeated line (bz#64596)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934556 13f79535-47bb-0310-9956-ffa450edef68
2026-05-24 16:00:16 +00:00
Rich Bowen
16ec562f7d Rebuild recent changes
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934539 13f79535-47bb-0310-9956-ffa450edef68
2026-05-23 15:35:45 +00:00
Rich Bowen
8be714d522 Update link to platform-specific docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934537 13f79535-47bb-0310-9956-ffa450edef68
2026-05-23 15:34:56 +00:00
Rich Bowen
c3b74e26ed docs: replace curly/smart quotes (U+2018/2019/201C/201D) with straight equivalents across all translations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934520 13f79535-47bb-0310-9956-ffa450edef68
2026-05-22 20:02:31 +00:00
Rich Bowen
8f31b3cb42 fr: fix missing apostrophe, invalid entities in lang/fr.xml, broken href to new_features_2_0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934518 13f79535-47bb-0310-9956-ffa450edef68
2026-05-22 20:01:44 +00:00
Rich Bowen
0b081b91b5 Fixes a number of (admittedly rather nit-picky) style and typographical
things in the mod_deflate docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934517 13f79535-47bb-0310-9956-ffa450edef68
2026-05-22 19:47:23 +00:00
Rich Bowen
a4478a4034 Yet Another build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1934515 13f79535-47bb-0310-9956-ffa450edef68
2026-05-22 19:42:39 +00:00