From: Rich Bowen Date: Fri, 22 May 2026 19:42:04 +0000 (+0000) Subject: Yet another rebuild X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9faf736bfdcf84051533a1f2e30ba3b16437f090;p=thirdparty%2Fapache%2Fhttpd.git Yet another rebuild git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934514 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/core.html.en.utf8 b/docs/manual/mod/core.html.en.utf8 index 1daabe1d23..d0540c5278 100644 --- a/docs/manual/mod/core.html.en.utf8 +++ b/docs/manual/mod/core.html.en.utf8 @@ -757,26 +757,42 @@ variables Module:core Compatibility:Available in Apache HTTP Server 2.4.21 and later -

This directive controls how some CGI variables are set.

- -

REQUEST_URI rules:

+

This directive controls how certain CGI environment variables are + set when requests are passed to CGI scripts or other handlers that + receive a CGI environment. Currently, the only variable supported is + REQUEST_URI.

+ +

By default, the CGI environment variable REQUEST_URI + is set to the original URI from the client's request line. This means + that even if mod_rewrite or an internal redirect + changes which resource is actually being served, the CGI script still + sees the original URI that the client sent.

+ +

With CGIVar REQUEST_URI current-uri, the value is + instead set to the current URI after any rewrites or internal + redirects have been applied.

+ +

Allowed values:

original-uri (default)
-
The value is taken from the original request line, and will not - reflect internal redirects or subrequests which change the requested - resource.
+
Set REQUEST_URI to the URI from the original client + request, regardless of any internal redirects or rewrites.
current-uri
-
The value reflects the resource currently being processed, - which may be different than the original request from the client - due to internal redirects or subrequests.
+
Set REQUEST_URI to the URI of the resource + currently being processed, which may differ from the original + request due to internal redirects or rewrites.
+ 
# Show CGI scripts the rewritten URI rather than the original
+CGIVar REQUEST_URI current-uri
+ +

Note

-

The CGI environment variable REQUEST_URI contains the - full original URI from the request line, including the query string. - This differs from the server variable %{REQUEST_URI} - used in mod_rewrite and - ap_expr, which contains only the path component.

+

The CGI environment variable REQUEST_URI (in either + mode) contains the full URI including the query string. This differs + from the server variable %{REQUEST_URI} used in + mod_rewrite and ap_expr, + which contains only the path component (no query string).

top
diff --git a/docs/manual/mod/core.xml.de b/docs/manual/mod/core.xml.de index 77f29dee14..a0bcaec474 100644 --- a/docs/manual/mod/core.xml.de +++ b/docs/manual/mod/core.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/core.xml.ja b/docs/manual/mod/core.xml.ja index 4bd01735de..40ce773a55 100644 --- a/docs/manual/mod/core.xml.ja +++ b/docs/manual/mod/core.xml.ja @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/mod/quickreference.html.de b/docs/manual/mod/quickreference.html.de index 22088c96d6..b9807ff942 100644 --- a/docs/manual/mod/quickreference.html.de +++ b/docs/manual/mod/quickreference.html.de @@ -1062,7 +1062,7 @@ must succeed for the enclosing directive to not fail. svEDefines a mapping function for key-lookup RewriteOptions OptionssvdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]svdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]svdhEDefines rules for the rewriting engine RLimitCPU Sekunden|max [Sekunden|max]svdhCBegrenzt den CPU-Verbrauch von Prozessen, die von Apache-Kindprozessen gestartet wurden RLimitMEM Bytes|max [Bytes|max]svdhCBegrenzt den Speicherverbrauch von Prozessen, die von diff --git a/docs/manual/mod/quickreference.html.en.utf8 b/docs/manual/mod/quickreference.html.en.utf8 index d03e15bbb7..df3e29652a 100644 --- a/docs/manual/mod/quickreference.html.en.utf8 +++ b/docs/manual/mod/quickreference.html.en.utf8 @@ -1054,7 +1054,7 @@ must succeed for the enclosing directive to not fail. svEDefines a mapping function for key-lookup RewriteOptions OptionssvdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]svdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]svdhEDefines rules for the rewriting engine RLimitCPU seconds|max [seconds|max]svdhCLimits the CPU consumption of processes launched by Apache httpd children RLimitMEM bytes|max [bytes|max]svdhCLimits the memory consumption of processes launched diff --git a/docs/manual/mod/quickreference.html.es.utf8 b/docs/manual/mod/quickreference.html.es.utf8 index 2ac3649e63..04ae416973 100644 --- a/docs/manual/mod/quickreference.html.es.utf8 +++ b/docs/manual/mod/quickreference.html.es.utf8 @@ -1049,7 +1049,7 @@ must succeed for the enclosing directive to not fail. svEDefines a mapping function for key-lookup RewriteOptions OptionssvdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]svdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]svdhEDefines rules for the rewriting engine RLimitCPU seconds|max [seconds|max]svdhCLimits the CPU consumption of processes launched by Apache httpd children RLimitMEM bytes|max [bytes|max]svdhCLimits the memory consumption of processes launched diff --git a/docs/manual/mod/quickreference.html.ja.utf8 b/docs/manual/mod/quickreference.html.ja.utf8 index c881c77d12..7e4d2b286b 100644 --- a/docs/manual/mod/quickreference.html.ja.utf8 +++ b/docs/manual/mod/quickreference.html.ja.utf8 @@ -1001,7 +1001,7 @@ must succeed for the enclosing directive to not fail. svEDefines a mapping function for key-lookup RewriteOptions OptionssvdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]svdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]svdhEDefines rules for the rewriting engine RLimitCPU seconds|max [seconds|max]svdhCApache の子プロセスから起動されたプロセスの CPU 消費量を 制限する RLimitMEM bytes|max [bytes|max]svdhCApache の子プロセスから起動されたプロセスのメモリ消費量を diff --git a/docs/manual/mod/quickreference.html.ko.euc-kr b/docs/manual/mod/quickreference.html.ko.euc-kr index f113c00482..3ae5a7bce6 100644 --- a/docs/manual/mod/quickreference.html.ko.euc-kr +++ b/docs/manual/mod/quickreference.html.ko.euc-kr @@ -1017,7 +1017,7 @@ must succeed for the enclosing directive to not fail. svEDefines a mapping function for key-lookup RewriteOptions OptionssvdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]svdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]svdhEDefines rules for the rewriting engine RLimitCPU seconds|max [seconds|max]svdhCLimits the CPU consumption of processes launched by Apache httpd children RLimitMEM bytes|max [bytes|max]svdhCLimits the memory consumption of processes launched diff --git a/docs/manual/mod/quickreference.html.tr.utf8 b/docs/manual/mod/quickreference.html.tr.utf8 index 3c84b30f7a..09da2204c1 100644 --- a/docs/manual/mod/quickreference.html.tr.utf8 +++ b/docs/manual/mod/quickreference.html.tr.utf8 @@ -1052,7 +1052,7 @@ must succeed for the enclosing directive to not fail. skEDefines a mapping function for key-lookup RewriteOptions OptionsskdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]skdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]skdhEDefines rules for the rewriting engine RLimitCPU saniye|max [saniye|max]skdhÇApache httpd alt süreçleri tarafından çalıştırılan süreçlerin işlemci tüketimine sınırlama getirir. RLimitMEM bayt-sayısı|max [bayt-sayısı|max] diff --git a/docs/manual/mod/quickreference.html.zh-cn.utf8 b/docs/manual/mod/quickreference.html.zh-cn.utf8 index 8eff0671a9..cc9a46b0a6 100644 --- a/docs/manual/mod/quickreference.html.zh-cn.utf8 +++ b/docs/manual/mod/quickreference.html.zh-cn.utf8 @@ -1049,7 +1049,7 @@ must succeed for the enclosing directive to not fail. svEDefines a mapping function for key-lookup RewriteOptions OptionssvdhESets some special options for the rewrite engine RewriteRule - Pattern Substitution [flags]svdhEDefines rules for the rewriting engine + [!]Pattern Substitution [flags]svdhEDefines rules for the rewriting engine RLimitCPU seconds|max [seconds|max]svdhCLimits the CPU consumption of processes launched by Apache httpd children RLimitMEM bytes|max [bytes|max]svdhCLimits the memory consumption of processes launched diff --git a/docs/manual/rewrite/intro.html.en.utf8 b/docs/manual/rewrite/intro.html.en.utf8 index f31e2b1044..345ca23b54 100644 --- a/docs/manual/rewrite/intro.html.en.utf8 +++ b/docs/manual/rewrite/intro.html.en.utf8 @@ -82,12 +82,12 @@ it will tell you exactly how each rule is processed.

Regular Expressions

-

mod_rewrite uses the Perl Compatible -Regular Expression vocabulary. In this document, we do not attempt +

mod_rewrite uses the Perl Compatible +Regular Expressions vocabulary, via the PCRE2 library. In this document, we do not attempt to provide a detailed reference to regular expressions. For that, we -recommend the PCRE man pages, the +recommend the PCRE2 documentation, the Perl regular -expression man page, and Mastering +expressions man page, and Mastering Regular Expressions, by Jeffrey Friedl (the third edition is from 2006, but regular expression syntax is essentially unchanged, and this remains the definitive reference on the subject).

diff --git a/docs/manual/rewrite/intro.xml.de b/docs/manual/rewrite/intro.xml.de index 40d67cb32b..5abf890856 100644 --- a/docs/manual/rewrite/intro.xml.de +++ b/docs/manual/rewrite/intro.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/rewrite/intro.xml.ja b/docs/manual/rewrite/intro.xml.ja index 530052400d..215fef0ae8 100644 --- a/docs/manual/rewrite/intro.xml.ja +++ b/docs/manual/rewrite/intro.xml.ja @@ -1,7 +1,7 @@ - + + + +