randy 96/11/30 22:57:36
Modified: htdocs/manual new_features_1_2.html
htdocs/manual/mod core.html directives.html
Log:
Added docs for RLimit directives.
Revision Changes Path
1.10 +2 -2 apache/htdocs/manual/new_features_1_2.html
Index: new_features_1_2.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/new_features_1_2.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** new_features_1_2.html 1996/12/01 06:38:11 1.9
--- new_features_1_2.html 1996/12/01 06:57:20 1.10
***************
*** 66,72 ****
href="xssi.html">XSSI</a>, this allows you to write browser-based
conditional HTML documents.
! <li><b><xa href="sucgi.html">SetUID CGI Execution</a></b>
[Documentation to be written]<br>
Apache now
supports the execution of CGI scripts as users other
--- 66,72 ----
href="xssi.html">XSSI</a>, this allows you to write browser-based
conditional HTML documents.
! <li><b><xa href="suexec.html">SetUID CGI Execution</a></b>
[Documentation to be written]<br>
Apache now
supports the execution of CGI scripts as users other
***************
*** 116,122 ****
variables, input headers, POST data, output, and more. This makes CGI
scripts much easier to debug.
! <li><b><xa href="rlimit.html">Resource Limits for CGI Scripts</a></b>
[Documentation to be written]<br>
New directives allow the limiting of resources used by CGI scripts
(e.g. max CPU time). This is helpful in preventing 'runaway' CGI
--- 116,122 ----
variables, input headers, POST data, output, and more. This makes CGI
scripts much easier to debug.
! <li><b><xa href="mod/core.html#rlimit">Resource Limits for CGI
Scripts</a></b>
[Documentation to be written]<br>
New directives allow the limiting of resources used by CGI scripts
(e.g. max CPU time). This is helpful in preventing 'runaway' CGI
1.10 +72 -6 apache/htdocs/manual/mod/core.html
Index: core.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/core.html,v
retrieving revision 1.9
retrieving revision 1.10
diff -C3 -r1.9 -r1.10
*** core.html 1996/11/30 17:06:40 1.9
--- core.html 1996/12/01 06:57:34 1.10
***************
*** 45,55 ****
<li><A HREF="#port">Port</A>
<li><A HREF="#require">require</A>
<li><A HREF="#resourceconfig">ResourceConfig</A>
! <li>RLimitCPU
! <li>RLimitMEM
! <li>RLimitNPROC
<li>Satisfy
! <li><A HREF="#sendbuffersize>SendBufferSize</A>
<li><A HREF="#serveradmin">ServerAdmin</A>
<li><A HREF="#serveralias">ServerAlias</A>
<li><A HREF="#servername">ServerName</A>
--- 45,55 ----
<li><A HREF="#port">Port</A>
<li><A HREF="#require">require</A>
<li><A HREF="#resourceconfig">ResourceConfig</A>
! <li><A HREF="#rlimitcpu">RLimitCPU</A>
! <li><A HREF="#rlimitmem">RLimitMEM</A>
! <li><A HREF="#rlimitnproc">RLimitNPROC</A>
<li>Satisfy
! <li><A HREF="#sendbuffersize">SendBufferSize</A>
<li><A HREF="#serveradmin">ServerAdmin</A>
<li><A HREF="#serveralias">ServerAlias</A>
<li><A HREF="#servername">ServerName</A>
***************
*** 410,416 ****
<!--%plaintext <?INDEX {\tt Group} directive> -->
<strong>Syntax:</strong> Group <em>unix-group</em><br>
<strong>Default:</strong> <code>Group #-1</code><br>
! <strong>Context:</strong> server config<br>
<strong>Status:</strong> core<p>
The Group directive sets the group under which the server will answer
requests.
--- 410,416 ----
<!--%plaintext <?INDEX {\tt Group} directive> -->
<strong>Syntax:</strong> Group <em>unix-group</em><br>
<strong>Default:</strong> <code>Group #-1</code><br>
! <strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<p>
The Group directive sets the group under which the server will answer
requests.
***************
*** 431,436 ****
--- 431,439 ----
to the specified, and will instead continue to run as the group of the
original user. <p>
+ Special note: Use of this directive in <VirtualHost> requires a
+ properly configured <A HREF="suexec">SUEXEC wrapper</A>.<p>
+
SECURITY: See <A HREF="#user">User</A> for a discussion of the security
considerations.<p><hr>
***************
*** 865,870 ****
--- 868,933 ----
See also <A HREF="#accessconfig">AccessConfig</A>.<p><hr>
+ <A name="rlimit">
+ <A name="rlimitcpu"><h2>RLimitCPU directive</h2></A>
+ <!--%plaintext <?INDEX {\tt RLimitCPU} directive> -->
+ <strong>Syntax:</strong> RLimitCPU <em># or 'max'</em> <em>[# or
'max']</em><br>
+ <strong>Default:</strong> <code>Unset uses operating system
defaults</code><br>
+ <strong>Context:</strong> server config, virtual host<br>
+ <strong>Status:</strong> core<p>
+
+ Takes 1 or 2 parameters. The first parameter sets the soft resource limit
for all
+ processes and the second parameter sets the maximum resource limit. Either
parameter
+ can be a number, or <em>max</em> to indicate to the server that the limit
should
+ be set to the maximum allowed by the operating system configuration.
Raising the
+ maximum resource limit requires that the server is running as root, or in
the initial
+ startup phase.<p>
+
+ CPU resource limits are expressed in seconds per process.<p>
+
+ See also <A HREF="#rlimitmem">RLimitMEM</A> or <A
HREF="#rlimitnproc">RLimitNPROC</A>.<p><hr>
+
+ <A name="rlimitmem"><h2>RLimitMEM directive</h2></A>
+ <!--%plaintext <?INDEX {\tt RLimitMEM} directive> -->
+ <strong>Syntax:</strong> RLimitMEM <em># or 'max'</em> <em>[# or
'max']</em><br>
+ <strong>Default:</strong> <code>Unset uses operating system
defaults</code><br>
+ <strong>Context:</strong> server config, virtual host<br>
+ <strong>Status:</strong> core<p>
+
+ Takes 1 or 2 parameters. The first parameter sets the soft resource limit
for all
+ processes and the second parameter sets the maximum resource limit. Either
parameter
+ can be a number, or <em>max</em> to indicate to the server that the limit
should
+ be set to the maximum allowed by the operating system configuration.
Raising the
+ maximum resource limit requires that the server is running as root, or in
the initial
+ startup phase.<p>
+
+ Memory resource limits are expressed in bytes per process.<p>
+
+ See also <A HREF="#rlimitcpu">RLimitCPU</A> or <A
HREF="#rlimitnproc">RLimitNPROC</A>.<p><hr>
+
+ <A name="rlimitnproc"><h2>RLimitNPROC directive</h2></A>
+ <!--%plaintext <?INDEX {\tt RLimitNPROC} directive> -->
+ <strong>Syntax:</strong> RLimitNPROC <em># or 'max'</em> <em>[# or
'max']</em><br>
+ <strong>Default:</strong> <code>Unset uses operating system
defaults</code><br>
+ <strong>Context:</strong> server config, virtual host<br>
+ <strong>Status:</strong> core<p>
+
+ Takes 1 or 2 parameters. The first parameter sets the soft resource limit
for all
+ processes and the second parameter sets the maximum resource limit. Either
parameter
+ can be a number, or <em>max</em> to indicate to the server that the limit
should
+ be set to the maximum allowed by the operating system configuration.
Raising the
+ maximum resource limit requires that the server is running as root, or in
the initial
+ startup phase.<p>
+
+ Process limits control the number of processes per user.<p>
+
+ Note: If CGI processes are <b>not</b> running under userids other than the
+ webserver userid, this directive will limit the number of processes that the
+ server itself can create. Evidence of this situation will be indicated by
+ <b><em>cannot fork</em></b> messages in the error_log.<p>
+
+ See also <A HREF="#rlimitmem">RLimitMEM</A> or <A
HREF="#rlimitcpu">RLimitCPU</A>.<p><hr>
+
<A name="sendbuffersize"><h2>SendBufferSize</h2></A>
<!--%plaintext <?INDEX {\tt AccessConfig} directive> -->
<strong>Syntax:</strong> SendBufferSize <em>bytes</em><br>
***************
*** 1009,1015 ****
<!--%plaintext <?INDEX {\tt User} directive> -->
<strong>Syntax:</strong> User <em>unix-userid</em><br>
<strong>Default:</strong> <code>User #-1</code><br>
! <strong>Context:</strong> server config<br>
<strong>Status:</strong> core<p>
The User directive sets the userid as which the server will answer requests.
--- 1072,1078 ----
<!--%plaintext <?INDEX {\tt User} directive> -->
<strong>Syntax:</strong> User <em>unix-userid</em><br>
<strong>Default:</strong> <code>User #-1</code><br>
! <strong>Context:</strong> server config, virtual host<br>
<strong>Status:</strong> core<p>
The User directive sets the userid as which the server will answer requests.
***************
*** 1033,1038 ****
--- 1096,1104 ----
to the lesser privileged user, and will instead continue to run as
that original user. If you do start the server as root, then it is normal
for the parent process to remain running as root.<p>
+
+ Special note: Use of this directive in <VirtualHost> requires a
+ properly configured <A HREF="suexec">SUEXEC wrapper</A>.<p>
SECURITY: Don't set User (or <A HREF="#group">Group</A>) to
<code>root</code> unless you know exactly what you are doing, and what the
1.4 +3 -0 apache/htdocs/manual/mod/directives.html
Index: directives.html
===================================================================
RCS file: /export/home/cvs/apache/htdocs/manual/mod/directives.html,v
retrieving revision 1.3
retrieving revision 1.4
diff -C3 -r1.3 -r1.4
*** directives.html 1996/11/28 07:42:16 1.3
--- directives.html 1996/12/01 06:57:35 1.4
***************
*** 101,106 ****
--- 101,109 ----
<li><A HREF="core.html#require">require</A>
<li><A HREF="mod_alias.html#redirect">Redirect</A>
<li><A HREF="core.html#resourceconfig">ResourceConfig</A>
+ <li><A HREF="core.html#rlimitcpu">RLimitCPU</A>
+ <li><A HREF="core.html#rlimitmem">RLimitMEM</A>
+ <li><A HREF="core.html#rlimitnproc">RLimitNPROC</A>
<li><A HREF="mod_actions.html#script">Script</A>
<li><A HREF="mod_alias.html#scriptalias">ScriptAlias</A>
<li><A HREF="mod_cgi.html#scriptlog">ScriptLog</A>
