Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
python: Fixed log header for scgi-wsgi.
[ashd.git]
/
doc
/
dirplex.doc
diff --git
a/doc/dirplex.doc
b/doc/dirplex.doc
index
9f3aab2
..
9d2240d
100644
(file)
--- a/
doc/dirplex.doc
+++ b/
doc/dirplex.doc
@@
-126,7
+126,7
@@
as part of the word. Empty lines are ignored, and lines whose first
character after leading whitespace is a hash character (`#`) are
treated as comments and ignored.
character after leading whitespace is a hash character (`#`) are
treated as comments and ignored.
-The follow configuration directives are recognized:
+The follow
ing
configuration directives are recognized:
*include* ['FILENAME'...]::
*include* ['FILENAME'...]::
@@
-189,7
+189,7
@@
The follow configuration directives are recognized:
above is aborted as soon as the directory containing the
`.htrc` file is encountered. The request is passed, with any
remaining rest string, to the specified 'HANDLER', which must
above is aborted as soon as the directory containing the
`.htrc` file is encountered. The request is passed, with any
remaining rest string, to the specified 'HANDLER', which must
- b
y
a named request handler specified either in the same
+ b
e
a named request handler specified either in the same
`.htrc` file or elsewhere. The *capture* directive accepts no
follow-up lines. Note that the `X-Ash-File` header is not
added to requests passed via *capture* directives.
`.htrc` file or elsewhere. The *capture* directive accepts no
follow-up lines. Note that the `X-Ash-File` header is not
added to requests passed via *capture* directives.
@@
-224,11
+224,13
@@
The following rules are recognized:
*pathname* 'PATTERN'...::
*pathname* 'PATTERN'...::
- Matches if the entire path (relative as considered from the
- root directory being served) of the file under consideration
+ Matches if the entire path of the file under consideration
matches any of the 'PATTERNs'. A 'PATTERN' is an ordinary glob
pattern, except that slashes are not matched by wildcards. See
matches any of the 'PATTERNs'. A 'PATTERN' is an ordinary glob
pattern, except that slashes are not matched by wildcards. See
- *fnmatch*(3) for more information.
+ *fnmatch*(3) for more information. If a *pathname* rule is
+ specified in a `.htrc` file, the path will be examined as
+ relative to the directory containing the `.htrc` file, rather
+ than to the root directory being served.
*default*::
*default*::
@@
-261,8
+263,8
@@
following actions are recognized:
by a *fchild* stanza. This action exists mostly for
convenience.
by a *fchild* stanza. This action exists mostly for
convenience.
-A *match* stanza may also contain any number of
*set* lines, as
-
follow
s:
+A *match* stanza may also contain any number of
the following,
+
optional directive
s:
*set* 'HEADER' 'VALUE'::
*set* 'HEADER' 'VALUE'::
@@
-270,6
+272,13
@@
follows:
named HTTP 'HEADER' in the request is set to 'VALUE' before
passing the request on to the specified handler.
named HTTP 'HEADER' in the request is set to 'VALUE' before
passing the request on to the specified handler.
+*xset* 'HEADER' 'VALUE'::
+
+ *xset* does exactly the same thing as *set*, except that
+ 'HEADER' is automatically prepended with the `X-Ash-`
+ prefix. The intention is only to make configuration files
+ look nicer in this very common case.
+
404 RESPONSES
-------------
404 RESPONSES
-------------
@@
-279,7
+288,7
@@
A HTTP 404 response is sent to the client if
* A path element is encountered during mapping which, after URL
unescaping, either begins with a dot or contains slashes;
* The mapping procedure finds a file which is neither a directory nor
* A path element is encountered during mapping which, after URL
unescaping, either begins with a dot or contains slashes;
* The mapping procedure finds a file which is neither a directory nor
- a regular file;
+ a regular file
(or a symbolic link to any of the same)
;
* An empty, non-final path element is encountered during mapping; or
* The mapping procedure results in a file which is not matched by any
*match* stanza.
* An empty, non-final path element is encountered during mapping; or
* The mapping procedure results in a file which is not matched by any
*match* stanza.
@@
-300,9
+309,13
@@
EXAMPLES
The *sendfile*(1) program can be used to serve HTML files as follows.
--------
The *sendfile*(1) program can be used to serve HTML files as follows.
--------
+fchild send
+ exec sendfile
+
match
match
- filename *.html
- fork sendfile -c text/html
+ filename *.html *.htm
+ xset content-type text/html
+ handler send
--------
Assuming the PHP CGI interpreter is installed on the system, PHP
--------
Assuming the PHP CGI interpreter is installed on the system, PHP
@@
-337,9
+350,9
@@
match directory
The following configuration can be placed in a `.htrc` file in order
to dedicate the directory containing that file to some external SCGI
script engine. Note that *callscgi*, and therefore the script engine
The following configuration can be placed in a `.htrc` file in order
to dedicate the directory containing that file to some external SCGI
script engine. Note that *callscgi*, and therefore the script engine
-itself, is started in the
directory itself
, so that arbitrary code
-modules or data files can be put directly in that directory and
easily
-found.
+itself, is started in the
same directory
, so that arbitrary code
+modules or data files can be put directly in that directory and
be
+
easily
found.
--------
child foo
--------
child foo