From 8f45813aa8b632c9750458111bf0f180c2e4a31f Mon Sep 17 00:00:00 2001 From: Nilgun Belma Buguner Date: Wed, 24 Sep 2008 09:41:47 +0000 Subject: [PATCH] pre-translation improvements git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@698483 13f79535-47bb-0310-9956-ffa450edef68 --- docs/manual/mod/mod_suexec.xml | 9 ++- docs/manual/mod/mod_userdir.xml | 131 +++++++++++++++++--------------- 2 files changed, 75 insertions(+), 65 deletions(-) diff --git a/docs/manual/mod/mod_suexec.xml b/docs/manual/mod/mod_suexec.xml index f6517a7d28..75e9d07c54 100644 --- a/docs/manual/mod/mod_suexec.xml +++ b/docs/manual/mod/mod_suexec.xml @@ -42,7 +42,7 @@ and Group SuexecUserGroup -User and group permissions for CGI programs +User and group for CGI programs to run as SuexecUserGroup User Group server config virtual host @@ -52,9 +52,10 @@ later.

The SuexecUserGroup directive allows you to specify a user and group for CGI programs to run as. Non-CGI - requests are still processes with the user specified in the User - directive. This directive replaces the Apache 1.3 configuration of - using the User and Group directives inside of VirtualHosts.

+ requests are still processes with the user specified in the User directive. This directive replaces + the Apache 1.3 configuration of using the User and + Group directives inside of VirtualHosts.

Example diff --git a/docs/manual/mod/mod_userdir.xml b/docs/manual/mod/mod_userdir.xml index 71989d0e2a..98f4a91657 100644 --- a/docs/manual/mod/mod_userdir.xml +++ b/docs/manual/mod/mod_userdir.xml @@ -84,27 +84,31 @@ host http://www.example.com/~bob/one/two.html will be translated to:

- - - - - - -
UserDir directive usedTranslated path
UserDir public_html~bob/public_html/one/two.html
UserDir /usr/web/usr/web/bob/one/two.html
UserDir /home/*/www/home/bob/www/one/two.html
- -

The following directives will send redirects to the client:

- - - - - - - -
UserDir directive usedTranslated path
UserDir http://www.example.com/usershttp://www.example.com/users/bob/one/two.html
UserDir -http://www.example.com/*/usrhttp://www.example.com/bob/usr/one/two.html
UserDir -http://www.example.com/~*/http://www.example.com/~bob/one/two.html
- - + + + + + + + + + +
UserDir directive usedTranslated path
UserDir public_html~bob/public_html/one/two.html
UserDir /usr/web/usr/web/bob/one/two.html
UserDir /home/*/www/home/bob/www/one/two.html
+ +

The following directives will send redirects to the client:

+ + + + + + + + + + +
UserDir directive usedTranslated path
UserDir http://www.example.com/usershttp://www.example.com/users/bob/one/two.html
UserDir http://www.example.com/*/usrhttp://www.example.com/bob/usr/one/two.html
UserDir http://www.example.com/~*/http://www.example.com/~bob/one/two.html
+ + Be careful when using this directive; for instance, "UserDir ./" would map "/~root" to "/" - which is probably undesirable. It is strongly @@ -113,49 +117,54 @@ http://www.example.com/~*/http://www.example.com/~bob/one/two.html module="core">Directory directive and the Security Tips page for more information. - - -

Additional examples:

- -

To allow a few users to have UserDir directories, but -not anyone else, use the following:

- - -UserDir disabled
-UserDir enabled user1 user2 user3 - - -

To allow most users to have UserDir directories, but -deny this to a few, use the following:

- - -UserDir enabled
-UserDir disabled user4 user5 user6 - - -

It is also possible to specify alternative user directories. -If you use a command like:

- -Userdir public_html /usr/web http://www.example.com/ - -

With a request for http://www.example.com/~bob/one/two.html, will try to -find the page at ~bob/public_html/one/two.html first, then -/usr/web/bob/one/two.html, and finally it will send a redirect -to http://www.example.com/bob/one/two.html.

-

If you add a redirect, it must be the last alternative in the list. -Apache cannot determine if the redirect succeeded or not, so if you have -the redirect earlier in the list, that will always be the alternative -that is used.

- -

User directory substitution is not active by default in versions -2.1.4 and later. In earlier versions, UserDir public_html -was assumed if no UserDir -directive was present.

+ + +

Additional examples:

+ +

To allow a few users to have UserDir directories, but + not anyone else, use the following:

+ + + UserDir disabled
+ UserDir enabled user1 user2 user3 + + +

To allow most users to have UserDir directories, but + deny this to a few, use the following:

+ + + UserDir enabled
+ UserDir disabled user4 user5 user6 + + +

It is also possible to specify alternative user directories. + If you use a command like:

+ + + Userdir public_html /usr/web http://www.example.com/ + + +

With a request for + http://www.example.com/~bob/one/two.html, will try to + find the page at ~bob/public_html/one/two.html first, then + /usr/web/bob/one/two.html, and finally it will send a + redirect to http://www.example.com/bob/one/two.html.

+ +

If you add a redirect, it must be the last alternative in the list. + Apache cannot determine if the redirect succeeded or not, so if you have + the redirect earlier in the list, that will always be the alternative + that is used.

+ +

User directory substitution is not active by default in versions + 2.1.4 and later. In earlier versions, UserDir public_html + was assumed if no UserDir + directive was present.

 -public_html -tutorial + + public_html tutorial + -- 2.50.1