1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-05 05:30:39 +03:00
Commit Graph

114 Commits

Author SHA1 Message Date
Stefan Fritsch
92e366007c Add lots of unique tags to error log messages
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1209766 13f79535-47bb-0310-9956-ffa450edef68
2011-12-02 23:02:04 +00:00
Jim Jagielski
427c85bd23 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@1174751 13f79535-47bb-0310-9956-ffa450edef68
2011-09-23 13:39:32 +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
59c52538f3 Code cleanup: replace apr_table_set with non-copying apr_table_setn
in a few places

Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137413 13f79535-47bb-0310-9956-ffa450edef68
2011-06-19 18:50:12 +00:00
Stefan Fritsch
99a601df31 Display information about asynchronous connections in the server-status
PR: 44377


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1137360 13f79535-47bb-0310-9956-ffa450edef68
2011-06-19 12:27:23 +00:00
Stefan Fritsch
82ea6d066e Fix handling of cumulative system time
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135170 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 16:49:48 +00:00
Stefan Fritsch
032acb7d21 Merge repeated calls of ap_rputs.
Submitted by: Christophe JAILLET <christophe jaillet wanadoo fr>
PR: 51330


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1135085 13f79535-47bb-0310-9956-ffa450edef68
2011-06-13 11:11:48 +00:00
Jeff Trawick
6d7fe15c43 Follow on to 1057048:
In the map of active workers, don't print spaces for scoreboard
slots which aren't used due to ThreadsPerChild < ThreadLimit or 
MaxClients/ThreadsPerChild < ServerLimit; simply omit those slots
from the display.  Workers in those slots which are gracefully
exiting (from a previous generation with a different MPM config)
will be displayed, and the map will shrink as those workers exit.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1097070 13f79535-47bb-0310-9956-ffa450edef68
2011-04-27 10:31:06 +00:00
Jim Jagielski
6bd438fe64 Add in a configuration generation... this is independent of
MPM gen, just in case we ever switch MPMs at a graceful ;)

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1087331 13f79535-47bb-0310-9956-ffa450edef68
2011-03-31 15:12:09 +00:00
Stefan Fritsch
adb7fdd063 clarify that the displayed IP address may not be the public address,
as suggested by wrowe


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1057329 13f79535-47bb-0310-9956-ffa450edef68
2011-01-10 19:34:37 +00:00
Stefan Fritsch
b72b127ee4 Display the local IP address in server-status. This can be useful for HTTPDs
behind load balancers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1057050 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 23:07:52 +00:00
Stefan Fritsch
04a7510337 mod_status: Don't show slots which are disabled by MaxClients as open.
PR: 47022
Submitted by: Jordi Prats <jordi prats gmail com>, Stefan Fritsch


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1057048 13f79535-47bb-0310-9956-ffa450edef68
2011-01-09 23:00:33 +00:00
Graham Leggett
47399a2601 Avoid unnecessariy initialisation before we test mod_status's handler name.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1024462 13f79535-47bb-0310-9956-ffa450edef68
2010-10-19 23:11:58 +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
Ruediger Pluem
7b0668b8dc * We need to return an int as result of the pre_config hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@903607 13f79535-47bb-0310-9956-ffa450edef68
2010-01-27 11:01:45 +00:00
William A. Rowe Jr
78cf8c9212 Refactor mod_status out of the ExtendedStatus toggle picture, as other
modules can and should be able to use this scoreboard information.
Rename suggestions for such a directive are welcomed.

Note that mod_status toggles the default, to present the ExtendedStatus 
for server operators, whenever it is loaded.  Docs changes to follow.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@903020 13f79535-47bb-0310-9956-ffa450edef68
2010-01-26 00:05:37 +00:00
Brian Havard
60fbe11de1 Bring back OS/2 support.
Reverses r758929 with a little bit of conflict resolution.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@807930 13f79535-47bb-0310-9956-ffa450edef68
2009-08-26 08:56:13 +00:00
William A. Rowe Jr
2f556f331e Quit hiding the previous request information while the subsequent request is partially read
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@775341 13f79535-47bb-0310-9956-ffa450edef68
2009-05-15 21:09:21 +00:00
Jeff Trawick
301f0404f5 axe unmaintained 1.3-era code to support AUX, SunOS, IRIX, Next, Tandem, MPE,
LynxOS, QNX, and UnixWare


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758944 13f79535-47bb-0310-9956-ffa450edef68
2009-03-27 00:32:22 +00:00
Jeff Trawick
ee32468a33 remove OS/2 platform support
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@758929 13f79535-47bb-0310-9956-ffa450edef68
2009-03-26 23:47:52 +00:00
Jeff Trawick
e0eb7d1eef Introduce a new set of APIs to allow MPMs to be proper modules instead
of integral parts which share global variables, functions, and macros
with the rest of httpd.

Converted now:
  prefork, worker, event, simple, WinNT*

*WinNT hasn't been built or tested, and relies on a hack to include the
WinNT mpm.h to disable Unixy MPM support routines in mpm_common.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@757853 13f79535-47bb-0310-9956-ffa450edef68
2009-03-24 15:43:59 +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
Guenter Knauf
a31538b2ba Modified default refresh value to 10 secs so that its possible to correct a typo.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607873 13f79535-47bb-0310-9956-ffa450edef68
2008-01-01 17:23:16 +00:00
Ruediger Pluem
3edb06001b * Ensure refresh parameter is numeric to prevent a possible XSS attack caused
by redirecting to other URLs. Reported by SecurityReason.

Submitted by: Mark Cox, Joe Orton
Reviewed by: security@httpd.apache.org


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@607282 13f79535-47bb-0310-9956-ffa450edef68
2007-12-28 16:29:40 +00:00
Jim Jagielski
809dd5e30b Add in SeeRequestTail directive, to handle the shortcoming
of only storing 63 bytes of the request, when the requests
are longer than that and only vary towards the end; eg:

   GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/apples.jpg
   GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/pears.jpg
   GET /disk1/storage/apache/htdocs/images/image-store1/food/fruits/seeded/plums.jpg



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@590641 13f79535-47bb-0310-9956-ffa450edef68
2007-10-31 12:19:54 +00:00
William A. Rowe Jr
f75745f995 MMN major bump required; this API is altogether inconsistent, transparent
types should be opaque, opaque types should be transparent.

Solve one aspect, follow the _by_indexes() example for ap_get_scoreboard_worker
family of functions, and the primary one will now accept the abstracted conn_rec
value of sbh to find that connections slot.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@587770 13f79535-47bb-0310-9956-ffa450edef68
2007-10-24 03:50:24 +00:00
Jim Jagielski
05fe25163d Non-functional change. Simple cleanup.
PR: 42805


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@562492 13f79535-47bb-0310-9956-ffa450edef68
2007-08-03 14:54:40 +00:00
Joe Orton
a4ca339bc6 Fix CVE-2006-5752:
* modules/generators/mod_status.c (status_handler): Specify charset in
content-type to prevent browsers doing charset "detection", which
allows an XSS attack.  Use logitem-escaping on the request string to
make it charset-neutral.

Reported by: Stefan Esser <sesser hardened-php.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@549159 13f79535-47bb-0310-9956-ffa450edef68
2007-06-20 17:29:24 +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
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
Jeff Trawick
3e14f16867 worker MPM/mod_status: Support per-worker tracking of pid and
generation in the scoreboard so that mod_status can accurately
represent workers in processes which are gracefully terminating.

New child processes with worker MPM can take over slots of
individual threads within gracefully terminating processes.
Sometimes this is a problem (too many of these gracefully
terminating processes), so it is helpful to have mod_status
provide the information required to recognize these processes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@156274 13f79535-47bb-0310-9956-ffa450edef68
2005-03-05 20:06:55 +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
Joe Orton
25c9f93504 * modules/generators/mod_status.c: Mark private global variables
as static.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@104029 13f79535-47bb-0310-9956-ffa450edef68
2004-06-24 11:25:18 +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
Jeff Trawick
468254b6b0 mod_status: Report total CPU time accurately when using a threaded
MPM.

Note: It worked before with linuxthreads and it still does.  But now
it works with normal thread implementations too.

PR:     23795


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@101614 13f79535-47bb-0310-9956-ffa450edef68
2003-10-29 20:56:28 +00:00
André Malo
6e81ba064e fix mod_status compilation on Win32 (stolen from mod_dav).
We should consider a rename of AP_*_HOOK_* to CORE_*_HOOK_* ;-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100737 13f79535-47bb-0310-9956-ffa450edef68
2003-07-22 20:01:43 +00:00
Joe Orton
f1ba7c37fb Add optional hook to extend mod_status output.
* configure.in: Add modules/generators to include path.

* Makefile.in: Install mod_status.h.

* modules/generators/mod_status.h: New file.

* modules/generators/mod_status.c: Implement ap_run_status_hook.
(status_handler): Run status hooks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@100724 13f79535-47bb-0310-9956-ffa450edef68
2003-07-21 14:48:02 +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
27b74224a5 Replaced APR_USEC_PER_SEC division with apr_time_sec macro
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95917 13f79535-47bb-0310-9956-ffa450edef68
2002-06-30 18:20:13 +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
Greg Ames
d7c369a57d tweak "requests currently being processed". It is confusing to not have
old generation requests included after a graceful restart.  But we
shouldn't count workers who are starting up.

OTOH, the "ready" counter needs to pay attention to the generation, so it
stays in sync with how p_i_s_m counts idle workers.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95272 13f79535-47bb-0310-9956-ffa450edef68
2002-05-24 20:15:07 +00:00
Jeff Trawick
bc0cf18899 stop using APLOG_NOERRNO in calls to ap_log_[pr]error()
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95151 13f79535-47bb-0310-9956-ffa450edef68
2002-05-17 11:33:10 +00:00
Brian Pane
6b59ee40b9 Skip a potentially heavyweight call to sysconf, plus some
local variable initializations, in the common case where the
request is not for the server status page


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94745 13f79535-47bb-0310-9956-ffa450edef68
2002-04-22 04:48:11 +00:00
Jeff Trawick
3f3d6de769 move a loop-invariant computation out of the thread loop and
at the same time quiet a gcc warning (it assumed that thread_limit
could be zero, which would leave ps_record uninitialized when
referenced after the end of the thread loop)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94579 13f79535-47bb-0310-9956-ffa450edef68
2002-04-09 11:18:41 +00:00
Doug MacEachern
4157e579bf PR:
Obtained from:
Submitted by:   Ryan Morgan <rmorgan@covalent.net>
Reviewed by:	dougm, jimjag
Change mod_status to use scoreboard accessor functions so it can
be used in any MPM without having to be recompiled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@94558 13f79535-47bb-0310-9956-ffa450edef68
2002-04-09 01:55:44 +00:00