1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-06 16:49:32 +03:00
Commit Graph

88 Commits

Author SHA1 Message Date
Stefan Fritsch
cd17cd2c10 Consistenly use apr_file_* API instead of libc when dumping config because
mixing the two can give strange results due to buffering.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1180671 13f79535-47bb-0310-9956-ffa450edef68
2011-10-09 17:55:06 +00:00
Stefan Fritsch
1951a037bf More cleanup: Expand tabs and some more indentation fixes
No functional change


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1174929 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 18:08:42 +00:00
Rich Bowen
5ee61031b1 For consistency, makes the "Loaded Modules" section of the mod_info output into a top-level section, and provides a link to it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1152179 13f79535-47bb-0310-9956-ffa450edef68
2011-07-29 11:56:26 +00:00
Stefan Fritsch
01d5b49286 mod_info: Dump config to stdout during startup if -DDUMP_CONFIG is
specified.

This functionality should probably be moved into core, but for now
it's a lot better than nothing. And it may even help me debug some
other config related code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1086441 13f79535-47bb-0310-9956-ffa450edef68
2011-03-28 23:19:17 +00:00
Graham Leggett
c567949d0e Avoid unnecessariy initialisation before we test mod_info's handler name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024465 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 23:26:30 +00:00
Stefan Fritsch
ebb62867fb Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take
advantage of per-module loglevels


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@951895 13f79535-47bb-0310-9956-ffa450edef68
2010-06-06 16:59:50 +00:00
Nick Kew
2631cbd498 Strip SHARED_CORE deadwood.
PR 46239


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@893044 13f79535-47bb-0310-9956-ffa450edef68
2009-12-22 00:05:40 +00:00
Jeff Trawick
2e9668a33d Replace AcceptMutex, LockFile, RewriteLock, SSLMutex, SSLStaplingMutex,
and WatchdogMutexPath with a single Mutex directive.  Add APIs to
simplify setup and user customization of APR proc and global mutexes.  
(See util_mutex.h.)  Build-time setting DEFAULT_LOCKFILE is no longer
respected; set DEFAULT_REL_RUNTIMEDIR instead.

Some existing modules, such as mod_ldap and mod_auth_digest gain 
configurability for their mutexes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@883540 13f79535-47bb-0310-9956-ffa450edef68
2009-11-23 23:17:51 +00:00
Takashi Sato
10d068a06a Add the missing include of apu_version.h and thus fix a build failure.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@792570 13f79535-47bb-0310-9956-ffa450edef68
2009-07-09 14:50:03 +00:00
Guenter Knauf
748b4a8f34 removed font clutter as suggested by niq.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791646 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 22:57:38 +00:00
Guenter Knauf
266b72ffae added compile-time apr / apr-util versions as wrowe suggested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791622 13f79535-47bb-0310-9956-ffa450edef68
2009-07-06 21:41:52 +00:00
Guenter Knauf
a7a08708d2 added apr / apr-util version output (part two).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791316 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 20:39:24 +00:00
Guenter Knauf
2b63bdb61b added apr / apr-util version output.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@791313 13f79535-47bb-0310-9956-ffa450edef68
2009-07-05 20:31:17 +00:00
Jeff Trawick
0d2cef82b3 stop exporting APACHE_MPM_DIR to modules -- unclear why this was ever necessary, and it
makes no sense with loadable MPMs
axe the unnecessary MPM_DIR build variable
move the stray APACHE_SUBST(MPM_LIB) from configure.in to server/mpm/config.m4, where
  the other MPM_foos are handled


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@760403 13f79535-47bb-0310-9956-ffa450edef68
2009-03-31 11:34:49 +00:00
Jim Jagielski
a4df1f5fd1 Holey moley. Marcus Burke noted this in Rich's Nuts/Bolts talk.
How embarassing! 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@711421 13f79535-47bb-0310-9956-ffa450edef68
2008-11-04 21:42:17 +00:00
Paul Querna
a324a1d72f Remove all references to CORE_PRIVATE.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@645455 13f79535-47bb-0310-9956-ffa450edef68
2008-04-07 10:45:43 +00:00
Ruediger Pluem
b514669c7a * Set character set for HTML outputs generated by mod_ldap,
mod_proxy_balancer, mod_proxy_ftp, mod_info, mod_dav without a character
  set to ISO-8859-1.

Submitted by: jorton


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@606693 13f79535-47bb-0310-9956-ffa450edef68
2007-12-24 11:45:22 +00:00
Jim Jagielski
5ad2d637e8 PR 42847.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@562503 13f79535-47bb-0310-9956-ffa450edef68
2007-08-03 15:26:34 +00:00
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
Paul Querna
19c2fda63f Show the Quick Handlers in mod_info. Commit it to trunk, instead of the
Listen-Protocol Branch that my -dev workspace was using. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@169789 13f79535-47bb-0310-9956-ffa450edef68
2005-05-12 07:45:39 +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
Paul Querna
7efbc41588 mod_info: Added all Standard Hooks to the Hook Listing.
mod_info now has two sections, 'Startup Hooks' and 'Request Hooks'.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105001 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 07:19:08 +00:00
Paul Querna
29f9e866fa fix XHTML 1.0 Validation Errors.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@105000 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 06:35:32 +00:00
Paul Querna
e4a3bcb852 mod_info: Added ?hooks. Now outputs XHTML. Added more build info.
updated mod_info docs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104999 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 05:48:32 +00:00
Paul Querna
f8300b56ba Remove the use of sprintf.
Cleanup the history parts at the top of mod_info.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104981 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 02:11:16 +00:00
Paul Querna
d201a7a592 No Functional Changes to mod_info.
This is purely a style cleanup for mod_info.

I plan on making more functional changes later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104980 13f79535-47bb-0310-9956-ffa450edef68
2004-09-05 01:43:03 +00:00
Paul Querna
79c39b3a9b Rewrote config tree walk using recursion the way God intended.
Added ?config option. Added printout of config filename and line numbers.

PR: 30919
Submitted by: Rici Lake <rici ricilake.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104942 13f79535-47bb-0310-9956-ffa450edef68
2004-09-03 02:31:06 +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
d0e05bada9 fix copyright dates according to the first check in
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102565 13f79535-47bb-0310-9956-ffa450edef68
2004-02-08 12:07:22 +00:00
André Malo
0d57db3af2 apply Apache License, 2.0
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@102524 13f79535-47bb-0310-9956-ffa450edef68
2004-02-06 22:19:28 +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
Thom May
63abfc7538 * modules/generators/mod_info.c:
(mod_info_module_cmds) ap_escape_html() all directives and
        arguments.
PR: 24232


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101626 13f79535-47bb-0310-9956-ffa450edef68
2003-10-30 16:43:45 +00:00
Jeff Trawick
9650c40c9f Fix mod_info to use the real config file name, not the default
config file name.

Submitted by:   Aryeh Katz <aryeh@secured-services.com>
Reviewed by:    G�nter Knauf, Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101297 13f79535-47bb-0310-9956-ffa450edef68
2003-09-19 20:02:04 +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
Brian Pane
520e9383b4 Send output to the next filter even on header_only requests in mod_status
and mod_info


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95654 13f79535-47bb-0310-9956-ffa450edef68
2002-06-13 19:54:52 +00:00
William A. Rowe Jr
7af68c0bf5 Solve the 80/20 by initializing and storing server_rec->timeout and
server_rec->keep_alive_timeout in apr_time_interval_t format (in apr
  units, whatever they be), as both values exist to pass into APR, and
  all APR timeouts are in apr_time_t.

Reviewed by:	Cliff Woolley


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95623 13f79535-47bb-0310-9956-ffa450edef68
2002-06-12 23:59:31 +00:00
Bradley Nicholes
b63be3f064 Use the ap_get_server_xxx() calls to return the info rather than short cutting it with the server_rec. This avoids port showing up as 0 and also respects the UseCanonicalName setting in the .conf file.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95006 13f79535-47bb-0310-9956-ffa450edef68
2002-05-07 23:41:36 +00:00
Martin Kraemer
845448542e Fix long-standing typo (as of 1.17 when mod_info was ported to apache-2.0):
The containers would be printed as
   <Name ...>
   </,Name>
instead of the proper termination
   </Name>
(or was it intended?)
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94995 13f79535-47bb-0310-9956-ffa450edef68
2002-05-07 13:53:17 +00:00
Jeff Trawick
161365781c eliminate an unused variable
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94146 13f79535-47bb-0310-9956-ffa450edef68
2002-03-23 13:06:30 +00:00
Brian Pane
0adefd4831 Eliminate an 8KB buffer from the stack in mod_info's handler function
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94145 13f79535-47bb-0310-9956-ffa450edef68
2002-03-23 06:03:37 +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
6e932b2870 Fix the new method code. We need to cast 1 to an apr_int64_t or it will
be treated as a 32-bit integer, and it will wrap after being shifted
32 times.
Submitted by:	Cody Sherr <csherr@covalent.net> and
		Ryan Morgan <rmorgan@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@90090 13f79535-47bb-0310-9956-ffa450edef68
2001-08-11 04:04:13 +00:00
William A. Rowe Jr
10f9a8910c More obsessive changes to meet HTML 3.2, HTML 4.01 Transitional and
XHTML 1.0 Transitional


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89750 13f79535-47bb-0310-9956-ffa450edef68
2001-07-28 00:46:49 +00:00