1
0
mirror of https://github.com/apache/httpd.git synced 2026-10-23 22:49:01 +03:00
Commit Graph

57 Commits

Author SHA1 Message Date
Jeff Trawick
743a621e8d Replace ap_get_server_version with ap_get_server_banner() and
ap_get_server_description().

High-level summary:

The full server version information is now included in the error log at
startup as well as server status reports, irrespective of the setting
of the ServerTokens directive.

Third-party modules must now use ap_get_server_banner() or 
ap_get_server_description() in place of ap_get_server_version().



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@440337 13f79535-47bb-0310-9956-ffa450edef68
2006-09-05 13:08:15 +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
de659cbed0 update license header text
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@420983 13f79535-47bb-0310-9956-ffa450edef68
2006-07-11 20:33:53 +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
Jim Jagielski
5061d9fa92 No functional Change: Removing trailing whitespace. This also
means that "blank" lines consisting of just spaces or
tabs are now really blank lines


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332306 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:11:44 +00:00
Jim Jagielski
5d2fae4818 No functional change: simple detabbing of indented code.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@332305 13f79535-47bb-0310-9956-ffa450edef68
2005-11-10 15:05:51 +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
William A. Rowe Jr
d962fcfc8b FINALLY Correct ap_http_method()! It is NOT a method, it's a SCHEME!
Bumped mmn, and ap module cookie, for this function rename.

  It's not a deprecation, as ap_http_method would be a lovely function
  name sometime in the future: to determine what the function name implies.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@123882 13f79535-47bb-0310-9956-ffa450edef68
2005-01-02 05:33:44 +00:00
Nick Kew
6f349a2b3d PR: 29709,32051
Submitted by: Gabriel Kalkuhl
Add warning notice about basing code on mod_example.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105679 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 10:04:16 +00:00
André Malo
a688f06b19 fix name of The Apache Software Foundation
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102618 13f79535-47bb-0310-9956-ffa450edef68
2004-02-09 20:31:03 +00:00
André Malo
a438c92cbb fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102560 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 11:44:42 +00:00
André Malo
4f02cb1e18 apply Apache License, Version 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102525 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:58:42 +00:00
André Malo
fb07607180 update license to 2004.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102135 13f79535-47bb-0310-9956-ffa450edef68
2004-01-01 13:26:26 +00:00
Jeff Trawick
c41b3046a1 fix cut-n-paste errors in the logging of the current hook
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102041 13f79535-47bb-0310-9956-ffa450edef68
2003-12-13 15:41:33 +00:00
Jeff Trawick
2ce99f2814 add map_to_storage hook to mod_example
Submitted by: Geoffrey Young <geoff@modperlcookbook.org>
Reviewed by:  Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101397 13f79535-47bb-0310-9956-ffa450edef68
2003-10-10 09:19:12 +00:00
André Malo
742af25096 finished that boring job:
update license to 2003.

Happy New Year! ;-))


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@98573 13f79535-47bb-0310-9956-ffa450edef68
2003-02-03 17:53:28 +00:00
William A. Rowe Jr
39479368ee Clean up docs and add a hook for clarification.
Submitted by:	Stas Bekman <stas@stason.org>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@96006 13f79535-47bb-0310-9956-ffa450edef68
2002-07-11 06:09:34 +00:00
Ian Holsman
cc5d29c4d0 remove a redundant piece of code
Submitted By: Wayne Pascoe <wayne@pengiunpowered.org.uk>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95720 13f79535-47bb-0310-9956-ffa450edef68
2002-06-17 01:59:32 +00:00
Jeff Trawick
9457ca8ecf try to be a better example of a process-connection hook
(compiling cleanly is a good start)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95572 13f79535-47bb-0310-9956-ffa450edef68
2002-06-07 19:20:39 +00:00
Ryan Bloom
902fd9b10c More docs for mod_example.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95571 13f79535-47bb-0310-9956-ffa450edef68
2002-06-07 17:34:15 +00:00
Jeff Trawick
8f04ed6a4d signature of quick_handler hook changed
(mod_example's quick_handler hook doesn't have to do anything
with the new parameter)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94262 13f79535-47bb-0310-9956-ffa450edef68
2002-03-28 11:17:59 +00:00
Bill Stoddard
d5c24720dc Commit 1 of 2 to:
1. rename ap_rset_content_type to ap_set_content_type
2. reverse the arguments on the call to aligh with ap_set_content_length


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94056 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 17:41:55 +00:00
Bill Stoddard
470edb9dd8 First commit to introduce accessor function to set r->content_type..
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94027 13f79535-47bb-0310-9956-ffa450edef68
2002-03-20 01:58:47 +00:00
Roy T. Fielding
845cbfd508 Update our copyright for this year.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93918 13f79535-47bb-0310-9956-ffa450edef68
2002-03-13 20:48:07 +00:00
Ryan Bloom
862f407872 Remove the install_transport_filters hook. The same function can be
acheived with the pre_connection hook.  I have added the socket to the
pre_connection phase to make this possible.
Reviewed by:	Bill Stoddard


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93259 13f79535-47bb-0310-9956-ffa450edef68
2002-02-05 22:18:49 +00:00
Aaron Bannert
d5fdaf9cfd The pre_config hook now takes a return value. This allows modules to
cause the server to bail out under error conditions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@93063 13f79535-47bb-0310-9956-ffa450edef68
2002-01-28 23:49:40 +00:00
William A. Rowe Jr
4b08741638 Ok one typo... that's it for me for one evening
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92807 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 09:20:28 +00:00
William A. Rowe Jr
30d1548be6 Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92805 13f79535-47bb-0310-9956-ffa450edef68
2002-01-10 09:11:33 +00:00
Ian Holsman
c7c6e876a9 change open_logs hook to return a value, allowing you to flag a error
while opening logs

Obtained from: Doug MacEachern


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92149 13f79535-47bb-0310-9956-ffa450edef68
2001-11-24 00:08:30 +00:00
Ian Holsman
86b792b21c Modify post_config hook so that it can return a error,
causing the server not to start.
previous method was to call exit(1) which would not fail
gracefully

PR:
Obtained from:
Submitted by:
Reviewed by:	(Idea only Jeff Trawick)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@92144 13f79535-47bb-0310-9956-ffa450edef68
2001-11-23 16:35:22 +00:00
Doug MacEachern
12749e4ff8 disabling mod_example ap_hook_{http_method,default_port}
breaks things such as httpd-test when http_method is "foo"
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91475 13f79535-47bb-0310-9956-ffa450edef68
2001-10-15 23:14:11 +00:00
Doug MacEachern
d1fb0f93fc x_handler() was not checking r->handler, leaving it to handle every request
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@91454 13f79535-47bb-0310-9956-ffa450edef68
2001-10-13 01:53:46 +00:00
Jeff Trawick
3a60a51c77 a couple of hacks to mod_example to get it to behave a little better:
1) return DECLINED instead of OK from the quick_handler so we get
   some output

2) don't install x_fixer_upper() as a create_request handler; otherwise
   we segfault since r->per_dir_config hasn't been initialized yet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89955 13f79535-47bb-0310-9956-ffa450edef68
2001-08-06 21:36:32 +00:00
Ryan Bloom
0caa23e8db Remove all the warnings from mod_example.c.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89935 13f79535-47bb-0310-9956-ffa450edef68
2001-08-06 13:46:48 +00:00
Chuck Murcko
7ea50abc30 Sorting things out
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89704 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 07:12:19 +00:00
Chuck Murcko
594feb7de5 fix warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89685 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 21:50:21 +00:00
Ken Coar
e0a0b2ec59 Checkpoint my mod_example work. It does not work correctly yet,
and certainly should not be used until it does, but at least it
	compiles (with a couple of warnings).  I am adding examples of
	all the missing hooks to it; this is definitely a work in progress
	right now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89205 13f79535-47bb-0310-9956-ffa450edef68
2001-05-22 20:40:57 +00:00
William A. Rowe Jr
16231360f1 Goodbye ap_send_http_header
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88390 13f79535-47bb-0310-9956-ffa450edef68
2001-02-28 15:24:09 +00:00
Roy T. Fielding
381f88d56a Update copyright to 2001
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88184 13f79535-47bb-0310-9956-ffa450edef68
2001-02-16 04:26:53 +00:00
Doug MacEachern
88d3406f9a renaming various functions for consistency sake
see: http://apr.apache.org/~dougm/apr_rename.pl
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88019 13f79535-47bb-0310-9956-ffa450edef68
2001-02-08 07:45:33 +00:00
William A. Rowe Jr
59bbd68bec The big change. This is part 3 of the apr-util symbols rename, please
see the first commit of srclib/apr-util/include (cvs apr-util/include)
  for the quick glance at symbols changed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87731 13f79535-47bb-0310-9956-ffa450edef68
2001-01-19 07:04:36 +00:00
William A. Rowe Jr
40655f8641 Provide apr_pool_t arg to register_hooks, since anything they do in that
step -must- be done with a pool that will not outlive the cmd pool, from
  which they may have been dynamically loaded.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87697 13f79535-47bb-0310-9956-ffa450edef68
2001-01-17 15:52:12 +00:00
Ryan Bloom
0d5a270ea3 Get mod_example building cleanly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87103 13f79535-47bb-0310-9956-ffa450edef68
2000-11-28 18:52:24 +00:00
Ken Coar
8095e3bc8d Fix a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86122 13f79535-47bb-0310-9956-ffa450edef68
2000-08-21 15:39:41 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
Tony Finch
ccd36c357b Add mod_example to the build system.
I also fixed a few bogosities in mod_example itself, mostly improved
ordering of the code; I also fixed the long-standing numbering mistake
for the order of the request processing stages, and added the hook
registering function to the module record.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85191 13f79535-47bb-0310-9956-ffa450edef68
2000-05-11 20:25:46 +00:00
Doug MacEachern
2f45db7e82 back out APR_ prefix for TRUE,FALSE
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85081 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 18:27:55 +00:00
Doug MacEachern
f3a4cf49be prefix TRUE,FALSE with APR_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85074 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 06:49:53 +00:00
Doug MacEachern
6644b34387 add AP_ prefix to *HOOK* macros
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85045 13f79535-47bb-0310-9956-ffa450edef68
2000-04-26 07:14:39 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00