1
0
mirror of https://github.com/apache/httpd.git synced 2025-05-31 12:21:16 +03:00

2265 Commits

Author SHA1 Message Date
Jim Jagielski
40cde75faf Fix context error
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432359 13f79535-47bb-0310-9956-ffa450edef68
2006-08-17 19:40:17 +00:00
Jim Jagielski
62cb62c571 Update docs for proxy:
1. Put params in abc order
  2. Add hot-standby example
  3. Add in new features that hadn't been documented yet (lbset, ...)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@432352 13f79535-47bb-0310-9956-ffa450edef68
2006-08-17 19:21:33 +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
Bradley Nicholes
e6d2a7d4df revert the definitive bit for the reject directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428800 13f79535-47bb-0310-9956-ffa450edef68
2006-08-04 17:56:50 +00:00
Bradley Nicholes
601c29aedc fix typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@428163 13f79535-47bb-0310-9956-ffa450edef68
2006-08-02 21:50:08 +00:00
Bradley Nicholes
fecc476d87 fix a typo
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427783 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 23:05:48 +00:00
Bradley Nicholes
6b831e7059 Converted the reject directive to be definitive and enabled directory_merge to merge all of the authorization rules and logic.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@427780 13f79535-47bb-0310-9956-ffa450edef68
2006-08-01 22:54:38 +00:00
Mladen Turk
79c25adcda Document new ping parameter.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425999 13f79535-47bb-0310-9956-ffa450edef68
2006-07-27 08:09:02 +00:00
Jeff Trawick
3206eea9ff ScriptSock has been global-only for a couple of years
now; fix the docs


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@425124 13f79535-47bb-0310-9956-ffa450edef68
2006-07-24 17:23:37 +00:00
William A. Rowe Jr
5616f79841 Alas, it was not to be. Deprecate mod_aspdotnet, and certainly don't
introduce these docs into the next release or consider for backport.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@423387 13f79535-47bb-0310-9956-ffa450edef68
2006-07-19 07:05:13 +00:00
Nick Kew
d801d08bb0 Typo fix
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421725 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 22:59:46 +00:00
Nick Kew
346c6c3e76 Support environment variable interpolation in reverse proxy configuration
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421686 13f79535-47bb-0310-9956-ffa450edef68
2006-07-13 19:00:26 +00:00
André Malo
ef27013c2f update revision references
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421136 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 05:37:53 +00:00
Roy T. Fielding
5347b4715f update collective copyright notice in manual
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421086 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 02:42:24 +00:00
Roy T. Fielding
891555dc16 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@421072 13f79535-47bb-0310-9956-ffa450edef68
2006-07-12 01:54:21 +00:00
Roy T. Fielding
47e590252a update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420993 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 21:18:15 +00:00
André Malo
6c75787445 update mod_ssl transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420992 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 21:12:08 +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
Joe Orton
3ea7729f3f - clean up SSLProtocol description; "flavo[u]r" is meaningless in this context,
use "version" instead


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419861 13f79535-47bb-0310-9956-ffa450edef68
2006-07-07 10:32:17 +00:00
André Malo
867439c7bc update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419695 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 20:36:56 +00:00
André Malo
04e0d8f56d update German translation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419694 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 20:31:10 +00:00
André Malo
57314bfd7c add description for the T status
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419692 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 20:29:11 +00:00
André Malo
0ae7a3db11 Don't mess with fixed fields like status.
move external url to status/@href


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419691 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 20:28:43 +00:00
André Malo
459217fff2 fixup properties
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419688 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 20:05:12 +00:00
William A. Rowe Jr
a6566261af Might be my imagination, but seems full set hasn't been
generated in quite a while.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419671 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 19:25:28 +00:00
William A. Rowe Jr
5e0953e3aa Generate for mod_aspdotnet
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419668 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 19:24:08 +00:00
William A. Rowe Jr
92d86d6a00 New module, an extern, self referencing into the httpd server.
Note docs are in the future tense, quite fitting for docs trunk/


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@419666 13f79535-47bb-0310-9956-ffa450edef68
2006-07-06 19:23:02 +00:00
Joshua Slive
b37cb49a96 Make it clear what is meant by per-directory rewrites
and specify the rewrites in <Location> is unsupported.
(The same is probably true for <Files>, but I'd have to
think about that a little more.)

PR: 39843


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@418360 13f79535-47bb-0310-9956-ffa450edef68
2006-06-30 19:04:50 +00:00
Martin Kraemer
d5c831afe5 Add missing space
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@418200 13f79535-47bb-0310-9956-ffa450edef68
2006-06-30 08:28:51 +00:00
Bradley Nicholes
caf50e1f77 Change the example code to use the AuthzLDAPAutoritative directive and remove the AuthLDAPEnabled directive.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@417838 13f79535-47bb-0310-9956-ffa450edef68
2006-06-28 18:42:16 +00:00
Ruediger Pluem
58f86ac058 * Add the following environment variables to expose the information
* about
  the route, the sticky session and the worker used during a request to
  other modules:

  BALANCER_SESSION_STICKY
  BALANCER_SESSION_ROUTE
  BALANCER_NAME
  BALANCER_WORKER_NAME
  BALANCER_WORKER_ROUTE

PR: 39806
Submitted by: Brian <brectanu gmail.com>
Reviewed by: rpluem


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@417238 13f79535-47bb-0310-9956-ffa450edef68
2006-06-26 16:59:38 +00:00
Rich Bowen
d65a57ea79 Patch submitted by Matt Lewandowsky - fixes name of mod_isapi handler.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@417237 13f79535-47bb-0310-9956-ffa450edef68
2006-06-26 16:55:29 +00:00
Astrid Malo
1a4f9d000a update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@416990 13f79535-47bb-0310-9956-ffa450edef68
2006-06-25 07:35:09 +00:00
Wilfredo Sanchez
07ed6599a6 Whoops, double patch. Argh.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@415461 13f79535-47bb-0310-9956-ffa450edef68
2006-06-19 23:46:17 +00:00
Wilfredo Sanchez
00ad628fd2 Add CheckCaseOnly doc.
Submitted by: olivier Thereaux <ot@w3.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@415460 13f79535-47bb-0310-9956-ffa450edef68
2006-06-19 23:41:43 +00:00
Noirin Plunkett
256c8b5e1f Things I forgot to commit
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@415207 13f79535-47bb-0310-9956-ffa450edef68
2006-06-18 22:04:36 +00:00
Noirin Plunkett
737e626d2b Teeny tiny typo, noticed by Matt Lewandowsky
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@415199 13f79535-47bb-0310-9956-ffa450edef68
2006-06-18 21:33:38 +00:00
Nick Kew
9130728c91 Documenting new mod_speling directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@414146 13f79535-47bb-0310-9956-ffa450edef68
2006-06-14 08:24:59 +00:00
Noirin Plunkett
fdc5cb4858 Corrections & clarifications
Submitted by Matt Lewandowsky


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@414143 13f79535-47bb-0310-9956-ffa450edef68
2006-06-14 08:23:34 +00:00
Noirin Plunkett
33ff763673 Simple language fixes, been sitting around in my repos for a while
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413844 13f79535-47bb-0310-9956-ffa450edef68
2006-06-13 09:23:50 +00:00
André Malo
60d54e5a18 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413722 13f79535-47bb-0310-9956-ffa450edef68
2006-06-12 18:23:29 +00:00
Rich Bowen
25099ab25a A little bit more detail, and an example, for how DocumentRoot is
handled. Examples good.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413683 13f79535-47bb-0310-9956-ffa450edef68
2006-06-12 15:28:52 +00:00
Rich Bowen
ab2d671437 Submitted by Vincent 'noodl' Bray, this adds a link from the module doc
to the caching discussion, for clarification of obscure points.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413486 13f79535-47bb-0310-9956-ffa450edef68
2006-06-11 17:49:34 +00:00
André Malo
e4c75ade5b update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413440 13f79535-47bb-0310-9956-ffa450edef68
2006-06-11 12:38:13 +00:00
Rich Bowen
4f11aeb5bc Submitted by Matt Lewandowsky (matt@iamcode.net).
The handler name is now isapi-handler instead of isapi-isa, although
apparently both will still work, at least for now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@413220 13f79535-47bb-0310-9956-ffa450edef68
2006-06-10 03:25:25 +00:00
Ruediger Pluem
33369080f1 * Update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409457 13f79535-47bb-0310-9956-ffa450edef68
2006-05-25 20:19:08 +00:00
Ruediger Pluem
f9612fc346 * Add a note about trailing slashes for ProxyPass and fix the balancer example
accordingly.

PR: 39203


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409455 13f79535-47bb-0310-9956-ffa450edef68
2006-05-25 20:14:52 +00:00
Ruediger Pluem
941ab8b905 * Fix documentation about the data types of attributes in the AJP protocol.
PR: 39658


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@409442 13f79535-47bb-0310-9956-ffa450edef68
2006-05-25 19:41:40 +00:00
André Malo
4c29a9bc25 update transformation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@408516 13f79535-47bb-0310-9956-ffa450edef68
2006-05-21 22:50:20 +00:00
Sander Temme
b2b4cd8169 Document r399947, addition of optional scheme:// to ServerName directive
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@406697 13f79535-47bb-0310-9956-ffa450edef68
2006-05-15 18:15:19 +00:00