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

617 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
Bradley Nicholes
0db7f2f986 Fix a make problem that occurred due to the removal of the other submakefiles. Referencing example.nlm twice is just a hack to fix the problem for now.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290836 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 21:32:14 +00:00
Joe Orton
2c14a52352 * modules/experimental/config.m4: Don't duplicate the mod_dbd
APACHE_MODULE expansion and remove the commented-out stuff.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290700 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 13:56:15 +00:00
Nick Kew
535d0ab956 Move mod_dbd from /experimental/ to /database/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290672 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 10:04:00 +00:00
Nick Kew
d2fa38ef90 Move mod_filter and mod_charset_lite from /experimental/ to /filters/
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@290669 13f79535-47bb-0310-9956-ffa450edef68
2005-09-21 09:46:12 +00:00
Ian Holsman
4ac48b6d7d Fix config file for mod_dbd
Submitted: Brian J. France <list firehawksystems.com>



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@279940 13f79535-47bb-0310-9956-ffa450edef68
2005-09-10 03:44:08 +00:00
Ian Holsman
8c1e315d3f Doxygen fixup / cleanup
submited by: Neale Ranns neale ranns.org
reviewed by: Ian Holsman



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@263931 13f79535-47bb-0310-9956-ffa450edef68
2005-08-28 23:03:59 +00:00
Nick Kew
4e2d0a4998 mod_dbd:
(1) Export new ap_dbd_prepare function
  (2) Put all dbd_open() stuff in one place
  (3) Remove the servertoken


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@234017 13f79535-47bb-0310-9956-ffa450edef68
2005-08-20 10:36:50 +00:00
Nick Kew
39d6c7d5c5 Add const-ness to apr_dbd_driver_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231464 13f79535-47bb-0310-9956-ffa450edef68
2005-08-11 14:12:13 +00:00
Nick Kew
614849d27a Update mod_dbd to API that hides apr_dbd_driver_t struct.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@231275 13f79535-47bb-0310-9956-ffa450edef68
2005-08-10 16:05:17 +00:00
Joe Orton
d3f1127215 * modules/experimental/mod_filter.c (filter_trace): Fix gcc
-Wformat-security warning.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@225725 13f79535-47bb-0310-9956-ffa450edef68
2005-07-28 08:00:43 +00:00
Joe Orton
9687f8c6a7 Update remaining 2004 copyright notices.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@190592 13f79535-47bb-0310-9956-ffa450edef68
2005-06-14 13:54:34 +00:00
Nick Kew
e696c7a4cf Fix up header in mod_dbd.h (I remembered .c but not .h before previous commit)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170730 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 09:23:20 +00:00
Nick Kew
b5198abba6 Committing mod_dbd as new.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170729 13f79535-47bb-0310-9956-ffa450edef68
2005-05-18 09:19:34 +00:00
William A. Rowe Jr
20d06d7a06 Reintroduce stack frame construction with /Oy- (removal was implied by /O2).
This makes binaries far easier to debug, during operation and for post-crash
  .dmp analysis.  Do not alter /Gs optimizations per brane.

Reviewed by: stoddard, brane

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@170253 13f79535-47bb-0310-9956-ffa450edef68
2005-05-15 19:11:57 +00:00
Joe Orton
a0570c8746 Move the POSIX reg* implementations into the ap_* namespace;
internalise the ap_reg*<->PCRE wrapper:

* configure.in: Add srclib/pcre to the include path.

* include/ap_regex.h: Renamed from include/pcreposix.h.  Prefix all
constants with AP_; prefix all functions and types with ap_.  Define
AP_DECLARE to nothing if necessary.  Remove regcomp error codes.

* include/httpd.h: Include ap_regex.h not pcreposix.h.
(ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/.
(ap_regexec, ap_regerror): Prototypes moved to ap_regex.h.

* server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree):
Adjust for ap_ prefixed types.  (ap_regexec, ap_regerror): Removed.

* server/Makefile.in: Build util_pcre.c.

* server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use
of PCRE-internals to do error mapping; rename types to add AP_/ap_
prefixes as above.  Use APR includes.  (ap_regerror): Use apr_snprintf.

* srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la.

* modules/*: Update to use new type and constant names.

PR: 27750 (part one)
Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@153384 13f79535-47bb-0310-9956-ffa450edef68
2005-02-11 12:00:41 +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
Bradley Nicholes
804ff9ab22 Allow APR to exist and build outside of the httpd/srclib file structure
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106975 13f79535-47bb-0310-9956-ffa450edef68
2004-11-30 00:12:39 +00:00
Bradley Nicholes
1918883c39 Move mod_cache out of experimental for the NetWare build
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106757 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 20:42:00 +00:00
Bradley Nicholes
da062b024d Add mod_filter to the NetWare build.
Submitted by:normw bocnet.com.au

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106745 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:40:49 +00:00
Justin Erenkrantz
63dd4623e1 At long last, promote mod_cache and friends out of experimental/.
Also, take quick pass through docs files to remove experimental label for them.

Reviewed by: Paul Querna, Bill Stoddard, Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106737 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 19:06:48 +00:00
Nick Kew
9e804e259e Use ap_log_cerror and loglevel debug in filter_trace
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@106691 13f79535-47bb-0310-9956-ffa450edef68
2004-11-27 08:04:01 +00:00
Joe Orton
c36ecfa64f Remove the .cvsignore files.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105796 13f79535-47bb-0310-9956-ffa450edef68
2004-11-19 09:07:29 +00:00
Justin Erenkrantz
3380d808ed mod_disk_cache: Remove a bunch of non-implemented garbage collection
and cache size directives that are now available through htcacheclean.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105699 13f79535-47bb-0310-9956-ffa450edef68
2004-11-06 07:56:20 +00:00
Joe Orton
5da2cc3d8e * modules/experimental/mod_disk_cache.c (recall_headers,
create_entity): Remove unused variables.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105686 13f79535-47bb-0310-9956-ffa450edef68
2004-11-04 21:51:12 +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
Nick Kew
fc0a01f194 Fix compile trouble.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105648 13f79535-47bb-0310-9956-ffa450edef68
2004-11-01 10:00:52 +00:00
Nick Kew
62f6d3d6bd Change FilterDeclare/FilterProvider semantics as discussed in
http://marc.theaimsgroup.com/?l=apache-httpd-dev&m=109899588616670&w=2


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105646 13f79535-47bb-0310-9956-ffa450edef68
2004-10-31 18:00:43 +00:00
Nick Kew
a5278a9c0b Fixup broken handling of range header.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105613 13f79535-47bb-0310-9956-ffa450edef68
2004-10-28 13:21:08 +00:00
Nick Kew
8bed492892 Fix mod_filter to support the case where a provider sets its own f->ctx
in its filter_init [grumble about filter_init ....]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105604 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 10:46:26 +00:00
Nick Kew
ae6b8dcb99 Move ap_filter_provider_t back out of public API
(suggested by nd; makes sense to niq)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105603 13f79535-47bb-0310-9956-ffa450edef68
2004-10-27 09:20:33 +00:00
Jean-Jacques Clar
ac4c881fba fixed a type match warning on NetWare
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105594 13f79535-47bb-0310-9956-ffa450edef68
2004-10-25 16:08:09 +00:00
Justin Erenkrantz
41ee74561c mod_cache: Add CacheIgnoreHeaders directive.
(Justin made some minor tweaks to the patch.)

PR: 30399
Submitted by:	R�diger Pl�m <r.pluem@t-online.de>
Reviewed by:	Justin Erenkrantz


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105569 13f79535-47bb-0310-9956-ffa450edef68
2004-10-23 17:45:55 +00:00
Paul Querna
923e847ade use the correct struct for CacheDisable.
(cache_disable instead of cache_enable)

PR: 31128
Submitted by: Edward Rudd <eddie omegaware.com>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105510 13f79535-47bb-0310-9956-ffa450edef68
2004-10-18 00:49:31 +00:00
André Malo
a9a11aab67 allow <= and >= for filter dispatcher
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105507 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 18:31:44 +00:00
André Malo
bb5a48b58e minor optimizations
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105506 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 17:05:59 +00:00
André Malo
9336f02135 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105505 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:58:10 +00:00
André Malo
d4e324f687 actually reg_extended has no effect in pcre context.
It's probably more confusing for users


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105504 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:24:34 +00:00
André Malo
a3d6111d89 oops. removed a space too much
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105503 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:01:24 +00:00
André Malo
ab98b109df style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105502 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 16:00:02 +00:00
André Malo
551b03d1fb use more speaking names
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105501 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 15:44:21 +00:00
André Malo
00435c29c1 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105498 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 14:07:09 +00:00
André Malo
b2002ed3e3 style
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105497 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 14:03:09 +00:00
André Malo
ce8f5b1d25 - the bucket types already store their names; use them.
- use APR_SIZE_T_FMT for writing an apr_size_t value.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105496 13f79535-47bb-0310-9956-ffa450edef68
2004-10-17 13:58:57 +00:00