From: Joe Orton Date: Wed, 19 May 2010 15:56:53 +0000 (+0000) Subject: - amalgamate the sections describing the env vars available X-Git-Tag: 2.3.6~100 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d06c2e16f250a69f28227a819083c3ec7994599;p=thirdparty%2Fapache%2Fhttpd.git - amalgamate the sections describing the env vars available - update the docs for PeerExtList - fix the markup of the SSLRequire example git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@946243 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/docs/manual/mod/mod_ssl.html.en b/docs/manual/mod/mod_ssl.html.en index f99318eee84..e513b252b4f 100644 --- a/docs/manual/mod/mod_ssl.html.en +++ b/docs/manual/mod/mod_ssl.html.en @@ -161,6 +161,35 @@ included two OU fields, SSL_SERVER_S_DN_OU_0 and

SSL_CLIENT_V_REMAIN is only available in version 2.1 and later.

+

A number of additional environment variables can also be used +in SSLRequire expressions, or in custom log +formats:

+ +
HTTP_USER_AGENT        PATH_INFO             AUTH_TYPE
+HTTP_REFERER           QUERY_STRING          SERVER_SOFTWARE
+HTTP_COOKIE            REMOTE_HOST           API_VERSION
+HTTP_FORWARDED         REMOTE_IDENT          TIME_YEAR
+HTTP_HOST              IS_SUBREQ             TIME_MON
+HTTP_PROXY_CONNECTION  DOCUMENT_ROOT         TIME_DAY
+HTTP_ACCEPT            SERVER_ADMIN          TIME_HOUR
+THE_REQUEST            SERVER_NAME           TIME_MIN
+REQUEST_FILENAME       SERVER_PORT           TIME_SEC
+REQUEST_METHOD         SERVER_PROTOCOL       TIME_WDAY
+REQUEST_SCHEME         REMOTE_ADDR           TIME
+REQUEST_URI            REMOTE_USER
+ +

In these contexts, two special formats can also be used:

+ +
+
ENV:variablename
+
This will expand to the standard environment + variable variablename.
+ +
HTTP:headername
+
This will expand to the value of the request header with name + headername.
+
+
top

Custom Log Formats

@@ -1549,7 +1578,7 @@ variable ::= "%{" varname "}" function ::= funcname "(" funcargs ")" -

while for varname any variable from Table 3 can be used. Finally for +

For varname any of the variables described in Environment Variables can be used. For funcname the following functions are available:

top
diff --git a/docs/manual/mod/mod_ssl.xml b/docs/manual/mod/mod_ssl.xml index 4374fa76c92..a82260f57cd 100644 --- a/docs/manual/mod/mod_ssl.xml +++ b/docs/manual/mod/mod_ssl.xml @@ -109,6 +109,35 @@ included two OU fields, SSL_SERVER_S_DN_OU_0 and

SSL_CLIENT_V_REMAIN is only available in version 2.1 and later.

+

A number of additional environment variables can also be used +in SSLRequire expressions, or in custom log +formats:

+ +
HTTP_USER_AGENT        PATH_INFO             AUTH_TYPE
+HTTP_REFERER           QUERY_STRING          SERVER_SOFTWARE
+HTTP_COOKIE            REMOTE_HOST           API_VERSION
+HTTP_FORWARDED         REMOTE_IDENT          TIME_YEAR
+HTTP_HOST              IS_SUBREQ             TIME_MON
+HTTP_PROXY_CONNECTION  DOCUMENT_ROOT         TIME_DAY
+HTTP_ACCEPT            SERVER_ADMIN          TIME_HOUR
+THE_REQUEST            SERVER_NAME           TIME_MIN
+REQUEST_FILENAME       SERVER_PORT           TIME_SEC
+REQUEST_METHOD         SERVER_PROTOCOL       TIME_WDAY
+REQUEST_SCHEME         REMOTE_ADDR           TIME
+REQUEST_URI            REMOTE_USER
 + +

In these contexts, two special formats can also be used:

+ +
+
ENV:variablename
+
This will expand to the standard environment + variable variablename.
+ +
HTTP:headername
+
This will expand to the value of the request header with name + headername.
+
+
Custom Log Formats @@ -1206,8 +1235,8 @@ variable ::= "%{" varname "}" function ::= funcname "(" funcargs ")" -

while for varname any variable from Table 3 can be used. Finally for +

For varname any of the variables described in Environment Variables can be used. For funcname the following functions are available: