From: Rich Bowen Date: Mon, 25 May 2026 20:24:12 +0000 (+0000) Subject: Rebuild with new images X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=5a18b3f953e9dc768b73b8838f4d5343205bfe36;p=thirdparty%2Fapache%2Fhttpd.git Rebuild with new images git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1934625 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/env.html.en.utf8 b/docs/manual/env.html.en.utf8 index ba73a3387d..5f591671dc 100644 --- a/docs/manual/env.html.en.utf8 +++ b/docs/manual/env.html.en.utf8 @@ -165,6 +165,18 @@
Related ModulesRelated Directives
+
+

Modern alternative: Expressions

+

Many use cases that previously required setting and testing + environment variables — including conditional headers, access + control, and logging — can now be handled more directly using + <If> expressions + with the reqenv function. See + Expressions in Apache HTTP Server for the + expression syntax and the full list of available + variables.

+
+

CGI Scripts

@@ -199,6 +211,10 @@ allows for flexible control of access to the server based on characteristics of the client. For example, you can use these directives to deny access to a particular browser (User-Agent). + For more complex conditions, + Require expr provides + an alternative that can evaluate environment variables using + the reqenv function alongside other request properties.

@@ -262,8 +278,14 @@ These have been adopted more broadly, and are a standard part of passing information between the browser and the server, and between processes on the server side. Here we - discuss a few of these. Refer to the CGI spec for further - details.

+ discuss a few of these. For the complete list of request + variables available in expressions + (including REQUEST_URI, REMOTE_ADDR, + SERVER_NAME, and many others), see the + expression variables reference.

+ +

Refer to the CGI spec for further details of the standard + CGI meta-variables.

QUERY_STRING

diff --git a/docs/manual/env.xml.fr b/docs/manual/env.xml.fr index 7c91dfa2fe..3fbaaac6eb 100644 --- a/docs/manual/env.xml.fr +++ b/docs/manual/env.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/env.xml.ja b/docs/manual/env.xml.ja index 5c781a5a8a..e31fc895e2 100644 --- a/docs/manual/env.xml.ja +++ b/docs/manual/env.xml.ja @@ -1,7 +1,7 @@ - + + + + diff --git a/docs/manual/images/rewrite_backreferences.svg b/docs/manual/images/rewrite_backreferences.svg new file mode 100644 index 0000000000..c1c768650c --- /dev/null +++ b/docs/manual/images/rewrite_backreferences.svg @@ -0,0 +1,79 @@ + + + + + + + + + + + + + + + + + RewriteCond + %{DOCUMENT_ROOT}/ + $1 + !-f + + + RewriteCond + %{HTTP_HOST} ^ + + (admin.example.com) + $ + + + RewriteRule + ^/? + + ([a-z]+) + / + + (.*) + $ + + /admin.foo?page= + $1 + &id= + $2 + &host= + %1 + [PT] + + + + + + + $1 + + + + $2 + + + + %1 + + + Blue $1, $2 = captured from RewriteRule Pattern (matched first). Red %1 = captured from last matched RewriteCond. $1 also available in Cond TestStrings. + \ No newline at end of file diff --git a/docs/manual/mod/mod_rewrite.html.en.utf8 b/docs/manual/mod/mod_rewrite.html.en.utf8 index bce87e333d..c2c7c93b8c 100644 --- a/docs/manual/mod/mod_rewrite.html.en.utf8 +++ b/docs/manual/mod/mod_rewrite.html.en.utf8 @@ -47,8 +47,9 @@ URLs on the fly

It provides a flexible and powerful way to manipulate URLs using an unlimited number of rules. Each rule can have an unlimited number of attached rule conditions, to allow you to rewrite URLs - based on server variables, environment variables, cookies, HTTP headers, - or timestamps. Rules can operate on the + based on server variables (including HTTP + headers, connection details, and timestamps), environment variables, + or other request properties. Rules can operate on the URL-path (including any trailing pathname information) and can also alter the @@ -210,7 +211,7 @@ URLs on the fly RewriteMap for more details.

  • - Server-Variables: These are variables of + Server variables: These are variables of the form %{ NAME_OF_VARIABLE } @@ -1218,7 +1219,7 @@ guide for complete details.
  • back-references (%N) to the last matched RewriteCond pattern
    • -
  • server-variables as in rule condition test-strings +
  • server variables as in rule condition test-strings (%{VARNAME})
  • mapping-function calls @@ -1236,7 +1237,7 @@ guide for complete details. matched RewriteCond CondPattern: %0 is the entire match and - %1..%9 are the captured groups. The server-variables are the same + %1..%9 are the captured groups. The server variables are the same as for the TestString of a RewriteCond directive. The mapping-functions come from the @@ -1279,7 +1280,7 @@ guide for complete details. B Escape non-alphanumeric characters in backreferences before - applying the transformation. For similar escaping of server-variables, see + applying the transformation. For similar escaping of server variables, see the "escape" mapping-function.details ... diff --git a/docs/manual/mod/mod_rewrite.xml.fr b/docs/manual/mod/mod_rewrite.xml.fr index 4e11e82f9d..844ad4d2ab 100644 --- a/docs/manual/mod/mod_rewrite.xml.fr +++ b/docs/manual/mod/mod_rewrite.xml.fr @@ -1,7 +1,7 @@ - + diff --git a/docs/manual/rewrite/flags.html.en.utf8 b/docs/manual/rewrite/flags.html.en.utf8 index bfe6be1710..0bec6d74bc 100644 --- a/docs/manual/rewrite/flags.html.en.utf8 +++ b/docs/manual/rewrite/flags.html.en.utf8 @@ -104,7 +104,7 @@ so backreferences are unescaped at the time they are applied. Using the B flag, non-alphanumeric characters in backreferences will be escaped. For example, consider the rule:

    -

    For similar escaping of server-variables, see +

    For similar escaping of server variables, see the "escape" mapping-function

    @@ -299,12 +299,14 @@ minutes (24 hours) and is returned for all URIs.

    top

    DPI|discardpath

    -

    The DPI flag causes the PATH_INFO portion of the rewritten URL-path to be -discarded.

    - -

    In per-directory context, -the URL-path each RewriteRule compares against -is the concatenation of the current URL-path and PATH_INFO.

    +

    The DPI flag causes the PATH_INFO +that was appended to the rewritten +URL-path to be discarded.

    + +

    In per-directory context, the +URL-path each +RewriteRule compares against is the concatenation +of the current URL-path and PATH_INFO.

    The current URL-path can be the initial path as requested by the client, the result of a previous round of mod_rewrite diff --git a/docs/manual/rewrite/flags.xml.de b/docs/manual/rewrite/flags.xml.de index 9c59afb218..3f7d989482 100644 --- a/docs/manual/rewrite/flags.xml.de +++ b/docs/manual/rewrite/flags.xml.de @@ -1,7 +1,7 @@ - + + + diff --git a/docs/manual/rewrite/flags.xml.ja b/docs/manual/rewrite/flags.xml.ja index 4da241aec3..4617dc70c9 100644 --- a/docs/manual/rewrite/flags.xml.ja +++ b/docs/manual/rewrite/flags.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/intro.xml.ja b/docs/manual/rewrite/intro.xml.ja index 215fef0ae8..f7219b057f 100644 --- a/docs/manual/rewrite/intro.xml.ja +++ b/docs/manual/rewrite/intro.xml.ja @@ -1,7 +1,7 @@ - + + + + + + + diff --git a/docs/manual/rewrite/tech.xml.ja b/docs/manual/rewrite/tech.xml.ja index 00abb3ebcc..d323373a9f 100644 --- a/docs/manual/rewrite/tech.xml.ja +++ b/docs/manual/rewrite/tech.xml.ja @@ -1,7 +1,7 @@ - + + + +