1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-13 21:42:17 +03:00
Commit Graph

38 Commits

Author SHA1 Message Date
Igor Galić
4cb4ebab5e as reported by comments
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1414094 13f79535-47bb-0310-9956-ffa450edef68
2012-11-27 10:29:20 +00:00
Daniel Gruno
a3d2bba55b Syntax for mod_a*.xml and MPMs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1330911 13f79535-47bb-0310-9956-ffa450edef68
2012-04-26 15:47:56 +00:00
Jim Jagielski
69c1a5c854 Cleanup effort in prep for GA push:
Trim trailing whitespace... no func change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174747 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:36:39 +00:00
Stefan Fritsch
6d8de2ff42 Rename MaxClients to MaxRequestWorkers which describes more accurately what
it does.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137744 13f79535-47bb-0310-9956-ffa450edef68
2011-06-20 19:00:52 +00:00
Stefan Fritsch
5bcd082e3d Rename MaxRequestsPerChild to MaxConnectionsPerChild, which
describes more accurately what the directive does.

The old name still works but logs a warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1021924 13f79535-47bb-0310-9956-ffa450edef68
2010-10-12 21:12:37 +00:00
Rich Bowen
05dce833d2 Remove mentions of HTTPD. Mea culpa.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@924467 13f79535-47bb-0310-9956-ffa450edef68
2010-03-17 20:26:42 +00:00
Jeff Trawick
6565e2228b move a couple of special warnings for SysV sems and Posix sems out of the
performance tuning guide and into the common Mutex documentation; remove the
other (duplicate) information from that guide and instead point to the Mutex
directive

mpm_common: axe docs for old accept mutex directives

worker and prefork: axe links to old accept mutex directives, mention the use
of the accept mutex and how it can be configured

event: axe links to old mutex directives where were already N/A

mod_rewrite: axe old RewriteLock directive, mention use of the rewrite map
mutex for RewriteMap programs and how it can be configured

fix other miscellaneous LockFile or AcceptMutex references


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883878 13f79535-47bb-0310-9956-ffa450edef68
2009-11-24 21:08:37 +00:00
Nick Kew
c4e721bfae Introduce mod_unixd into the documentation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@713242 13f79535-47bb-0310-9956-ffa450edef68
2008-11-12 01:31:39 +00:00
Chris Darroch
e69f467709 Introduce a check_config phase between pre_config and open_logs,
to allow modules to review interdependent configuration directive
values and adjust them while messages can still be logged to the
console.

The open_logs phase is already used somewhat for this purpose by
certain MPMs (winnt, prefork, worker, and event) but only by forcing
their functions ahead of the core ap_open_logs() function, and
since this phase runs after the ap_signal_server function during startup,
it can not be used to generate messages on the console when restarting.

Add the check_config phase to mod_info and mod_example.

Handle relevant MPM directives during this phase and format messages
for both the console and the error log, as appropriate.  Bounds and sanity
checks on the values of the MPM directives are handled in sequence in
this phase instead of in the various directive handling functions, since
those functions (e.g., set_max_clients()) may not be called at all if their
directives do not appear in the configuration files, and even if they
are called, there is no guarantee that this will occur in any particular
order.

Remove from the worker and event MPMs the code in the pre_config phase
that alters the configuration node tree by re-ordering ThreadsPerChild
ahead of MaxClients.  This code is effective but insufficient; for
example, if ServerLimit follows MaxClients, the test against server_limit
in set_max_clients() is invalid.  (In practice, this only results in
incorrect or absent warnings on the console, because server_limit is
set to its configured value when the main loop re-runs the configuration
process.)

Prevent ap_threads_per_child from exceeding thread_limit in the
winnt, worker, and event MPMs.  This situation could occur if
ThreadsPerChild was not specified in the configuration files and
ThreadLimit was set to a value smaller than DEFAULT_THREADS_PER_CHILD,
because set_threads_per_child() would never be called and therefore
its bounds check against thread_limit would not be performed.

Remove from the winnt, prefork, worker, and event MPMs the
changed_limit_at_restart flag.  Set the first_server_limit and
first_thread_limit values during the first execution of the check_config
function, and use them to detect changes to ServerLimit and ThreadLimit
across restarts and issue appropriately formatted warnings.  Remove the
comments about the error log being a "bit bucket"; this was true when
the code was originally committed in r92530 but that was due to a bug
fixed in r92769.

Be consistent about setting all MPM configuration directive values in the
pre_config phase.

Rephrase and reformat the console and log file messages relating to
MPM configuration directives to be consistent across all MPMs.  Use
briefer messages when logging to the error log than to the console.

Update miscellaneous stale comments and messages (e.g., reference to
daemons_min_free in worker and event MPMs, "prefork open_logs" in
winnt MPM, and StartServers in netware MPM).

The winnt, netware, beos, and mpmt_os2 MPMs should be tested by developers
with access to those platforms, especially the winnt MPM, which has
unique logic with respect to distinguishing between parent and child
processes during the configuration phases.

Update the English documentation for the worker MPM's ThreadsPerChild
directive, which no longer needs to precede other MPM directives in the
configuration files if it has a non-default value.  The German (.de) and
Japanese (.ja) translations should be updated by developers fluent in
those languages.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@431460 13f79535-47bb-0310-9956-ffa450edef68
2006-08-14 22:55:45 +00:00
Roy T. Fielding
44fa6e0073 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420990 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:55:32 +00:00
Colm MacCarthaigh
dd95d7c37c Update the copyright year in all .c, .h and .xml files
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@395228 13f79535-47bb-0310-9956-ffa450edef68
2006-04-19 12:11:27 +00:00
Joshua Slive
8c9f959b53 Give a clue about what event really does, and some
small improvements to the leader and worker docs.

Submitted by: Noirin Plunkett <firebird nerdchic.net>, Joshua Slive


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@354164 13f79535-47bb-0310-9956-ffa450edef68
2005-12-05 20:35:24 +00:00
Stas Bekman
9e05636b03 Document the ReceiveBufferSize change done in r157583
Submitted by: Murray Nesbitt <murray@cpan.org>]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@280384 13f79535-47bb-0310-9956-ffa450edef68
2005-09-12 18:14:19 +00:00
Justin Erenkrantz
905cdf9f0b Update copyright year to 2005 and standardize on current copyright owner line.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@151408 13f79535-47bb-0310-9956-ffa450edef68
2005-02-04 20:28:49 +00:00
André Malo
9ade04f57c fix copyright notice
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@125277 13f79535-47bb-0310-9956-ffa450edef68
2005-01-15 17:01:17 +00:00
André Malo
5e311552a2 minor cleanups
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106851 13f79535-47bb-0310-9956-ffa450edef68
2004-11-28 21:54:52 +00:00
André Malo
fd5a98d464 use <program> for programs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106803 13f79535-47bb-0310-9956-ffa450edef68
2004-11-28 13:25:21 +00:00
André Malo
4ac4e5a1e3 $Revision$ is slightly misdocumented (only available since svn 1.1)
use LastChangedRevision instead


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105989 13f79535-47bb-0310-9956-ffa450edef68
2004-11-20 18:42:58 +00:00
André Malo
3b900e6993 adjust properties and revision expansion of the English docs
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105981 13f79535-47bb-0310-9956-ffa450edef68
2004-11-20 17:06:17 +00:00
André Malo
f08df46e89 add $Revision$ keyword
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103423 13f79535-47bb-0310-9956-ffa450edef68
2004-04-17 10:49:23 +00:00
André Malo
b3e2599e9a fix directive name and link
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@103045 13f79535-47bb-0310-9956-ffa450edef68
2004-03-19 21:20:55 +00:00
Jeff Trawick
854d853e53 Change "new" WorkerStackSize directive to ThreadStackSize
Move existing Netware docs and links on ThreadStackSize to
mpm_common


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102976 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 23:24:40 +00:00
André Malo
e987f97673 add initial documentation for EnableExceptionHook. Please review.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102965 13f79535-47bb-0310-9956-ffa450edef68
2004-03-15 20:45:58 +00:00
Jeff Trawick
4c5070798f add docs for WorkerStackSize directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102948 13f79535-47bb-0310-9956-ffa450edef68
2004-03-13 14:07:40 +00:00
André Malo
b68721ed3a fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102617 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:22:54 +00:00
André Malo
f4bd111108 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102532 13f79535-47bb-0310-9956-ffa450edef68
2004-02-07 15:12:30 +00:00
Jeff Trawick
a17fd1388f update worker doc to mention that
. a potentially large number of child processes can be in
  termination state

. ServerLimit/ThreadLimit should be coded before other worker
  MPM directives which control processes/threads


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102295 13f79535-47bb-0310-9956-ffa450edef68
2004-01-12 16:22:35 +00:00
André Malo
ac5865dcd7 keep consistent with 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99547 13f79535-47bb-0310-9956-ffa450edef68
2003-04-23 19:39:51 +00:00
André Malo
94fc883415 add the metafile attribute to all xml files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@99326 13f79535-47bb-0310-9956-ffa450edef68
2003-04-11 01:25:58 +00:00
André Malo
1943752149 - mpm_common:
* fixed the <modulelist>s in mpm_common
  * moved AcceptMutex to mpm_common;
    document the mutex mechanism "posixsem"
  * added BS2000Account to mpm_common
    (I'm not sure, whether it should appear here or elsewhere. It *seems*
    to be supported only by prefork and perchild (if perchild would work)).
    The description is obtained from the 1.3 docs.
  * fixed several default values
  * moved MaxThreadsPerChild and NumServers out to perchild
    (btw: we could consider to rename NumServers to StartServers...)
  * rearranged some stuff and added several comments, that I found useful
    ;-)
- mpm_netware:
  * MaxThreads 2048 (as maximum and default)
- perchild:
  * extended the explanations about using different user ids. Hope, that's
    correct.
  * extended and adjusted the directive descriptions
    (remember, NumServers and MaxThreadsPerChild moved in)
- prefork:
  * moved AcceptMutex to mpm_common (as stated already above)
- mpm_winnt:
  * added reference to ScoreBoardFile
- worker:
  * added reference to AcceptMutex
- general: markup & formatting


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98075 13f79535-47bb-0310-9956-ffa450edef68
2002-12-22 22:31:24 +00:00
André Malo
a75d816777 the MPM module docs:
- <em> -> <var>
- a little other markup changes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@97258 13f79535-47bb-0310-9956-ffa450edef68
2002-10-18 02:18:04 +00:00
Jeff Trawick
c414d4b706 Add English doc for MaxMemFree
Obtained from: Sander Striker


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96782 13f79535-47bb-0310-9956-ffa450edef68
2002-09-13 15:57:23 +00:00
Joshua Slive
c8ef6fe380 One further change to the worker docs regarding the MaxClients confusion.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96466 13f79535-47bb-0310-9956-ffa450edef68
2002-08-21 13:52:53 +00:00
Joshua Slive
9d7f67e1b9 Update docs on MaxClients under worker, and clean up a few things.
This has been wrong for a LONG time, and it could really use a review
by some of the worker MPM developers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96458 13f79535-47bb-0310-9956-ffa450edef68
2002-08-20 20:30:58 +00:00
Joshua Slive
de63e8af08 Simplify the worker mpm docs a little.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95469 13f79535-47bb-0310-9956-ffa450edef68
2002-06-02 15:47:38 +00:00
Joshua Slive
68adf9ffbd Update the stylesheet reference to the new language-specific version.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95244 13f79535-47bb-0310-9956-ffa450edef68
2002-05-23 14:50:12 +00:00
Cliff Woolley
7586599090 worker is not the default Unix MPM. [This statement has been in the docs
ever since this was copy-and-pasted from the threaded MPM documentation,
and threaded *was* the default at one point.]

Reported by: kap@katchoo.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94670 13f79535-47bb-0310-9956-ffa450edef68
2002-04-16 06:13:48 +00:00
Joshua Slive
cf13d8185e Another few xml files. Only one or two left to go.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93825 13f79535-47bb-0310-9956-ffa450edef68
2002-03-10 04:34:21 +00:00