1
0
mirror of https://github.com/apache/httpd.git synced 2025-11-11 02:42:23 +03:00
Commit Graph

122 Commits

Author SHA1 Message Date
Jeff Trawick
5112dac930 fix some generation logic/displays in mod_status by setting
the generation field in parent_score


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89050 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 17:55:01 +00:00
Jeff Trawick
e4fad412b8 minor scoreboard/status improvements:
. get the SS field in extended status output formatted correctly
  (seconds since beginning of request shouldn't be a huge
  negative number :) )
. use APR_OS_PID_T_FMT and pid_t where appropriate in mod_status
  to avoid casting, some of which may have been broken on some
  architectures


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89048 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 16:24:14 +00:00
Jeff Trawick
d3dcba691d tweak ap_get_remote_host() so that the caller can find out if she got
back an IP address

mod_access needed to know this, but the old code didn't handle IPv6


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88484 13f79535-47bb-0310-9956-ffa450edef68
2001-03-09 20:30:34 +00:00
Ryan Bloom
d2d23882af Allow modules to query the MPM about it's execution profile. This
query API can and should be extended in the future, but for now,
max_daemons, and threading or forking is a very good start.

Non-Unix MPM's do have the MPM query function, although there is no
garauntee that the information is perfect, please check.

Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88437 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 22:46:33 +00:00
Greg Stein
ee3fe477e3 *) fix inline handling. we had: apr_inline, APR_INLINE, USE_GNU_INLINE, and
INLINE. Now, we just have APR_INLINE and APR_HAS_INLINE.
   - convert all usage
   - note that apr_general messed up the defn (compared to apr.h)
   - simplify the inline decision logic in os/*/os.h
   - simplify the code in os/*/os-inline.c

*) toss ap_checkconv() [no longer used]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88298 13f79535-47bb-0310-9956-ffa450edef68
2001-02-24 11:23:31 +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
Bill Stoddard
6bb2157915 Start getting extended status working again.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88151 13f79535-47bb-0310-9956-ffa450edef68
2001-02-14 02:52:23 +00:00
Greg Stein
8068b49327 *) include the strings stuff the right way (some platforms use string.h;
apr_want figures all that out for us)
*) include ap_mpm.h to pick up a moved func declaration


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88102 13f79535-47bb-0310-9956-ffa450edef68
2001-02-12 02:42:10 +00:00
Ben Laurie
c7a5d82778 Fix a warning.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88094 13f79535-47bb-0310-9956-ffa450edef68
2001-02-11 20:58:12 +00:00
Greg Stein
bb282b75f7 Clean up some of the includes:
- explicitly include apr_lib.h since ap_config.h doesn't
- use apr_want.h where possible
- use APR_HAVE_ where possible
- remove some unneeded includes


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88060 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 13:05:29 +00:00
Greg Stein
23714288fe *) remove obsolete http_conf_globals.h
*) simplify all this #ifdef'ing: just nuke the unixd.h header. it isn't
   actually needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88045 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 03:03:18 +00:00
David Reid
846602b174 BeOS doesn't have unixd.h either.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88043 13f79535-47bb-0310-9956-ffa450edef68
2001-02-10 00:52:22 +00:00
Bill Stoddard
e2456e4963 Replace reinit_scoreboard with ap_create_scoreboard.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88037 13f79535-47bb-0310-9956-ffa450edef68
2001-02-09 16:11:50 +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
Ryan Bloom
c59cc03086 Fix graceful shutdown with the scoreboard changes. Basically, we want
to set the sb_type only after we zero out the scoreboard.  Before this,
we were segfaulting when we tried to free() a shared memory scoreboard.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88013 13f79535-47bb-0310-9956-ffa450edef68
2001-02-07 21:41:43 +00:00
Ryan Bloom
ded4233ad5 Get the Unix MPMs restarting again. If we are going to register a cleanup
for ap_cleanup_scoreboard, then we have to kill that cleanup with the same
function.  This also makes ap_cleanup_scoreboard a non-static function, and
makes ap_cleanup_shared_mem a static function.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88012 13f79535-47bb-0310-9956-ffa450edef68
2001-02-07 20:49:25 +00:00
Ryan Bloom
9eb59aec0a Setup the server start time correctly. This also gets the server uptime
to be reported correctly.  I have also moved this code into a common
location, so that individual MPMs do not need to worry about setting up
the start time.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87994 13f79535-47bb-0310-9956-ffa450edef68
2001-02-06 20:41:07 +00:00
Brian Havard
2e86e9ae83 Get OS/2 MPM running again after the reunification of the scoreboard code.
mod_status still doesn't work right, I'll look into that next.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87989 13f79535-47bb-0310-9956-ffa450edef68
2001-02-06 15:16:05 +00:00
Jeff Trawick
b842381ff3 cleanups need to return apr_status_t
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87963 13f79535-47bb-0310-9956-ffa450edef68
2001-02-03 00:32:20 +00:00
Bill Stoddard
7e9641b6fb Ooops, that S and D are right next to each other.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87960 13f79535-47bb-0310-9956-ffa450edef68
2001-02-02 22:31:00 +00:00
Bill Stoddard
b119ec0e60 Begin restructuring scoreboard code to enable adding back in
the ability to use IPC other than shared memory.
Get mod_status working on Windows again.

Still to do:
Rename some of the function APIs. Replace all calls to reinit_scoreboard with
ap_create_scoreboard. Add back in support for scoreboard files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87959 13f79535-47bb-0310-9956-ffa450edef68
2001-02-02 21:32:34 +00:00
Ryan Bloom
deab760727 Bring mod_status for 2.0 back in line with mod_status for 1.3. This is
basically a straight port of the 1.3 module to 2.0.  The MPMs need to be
modified a bit to work with mod_status, but prefork, mpmt_pthread, and
dexter have already been changed.  I will fix perchild tonight.  There
is a lot of common code that can be abstracted, and there seems to be a
small bug with regard to what mpmt_pthread and dexter report as current
connections.  ExtendedStatus does work again, although until the bug
mentioned above is fixed, it isn't as useful on mpmt_pthread and dexter.

Next week, I will look at allowing other modules to add data to the
STATUS page and possibly to the scoreboard itself.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87949 13f79535-47bb-0310-9956-ffa450edef68
2001-02-01 21:55:16 +00:00