1
0
mirror of https://github.com/apache/httpd.git synced 2026-01-26 19:01:35 +03:00
Commit Graph

279 Commits

Author SHA1 Message Date
William A. Rowe Jr
5b96031409 Change over to apr_strfsize() for apr_off_t file size formatting.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89713 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:34:15 +00:00
William A. Rowe Jr
6e1243809f Some cast magic for intentional float/int transformations, but I have
no idea what exactly this computation was trying to accomplish...

    req_time = (long)(((ws_record.stop_time - ws_record.start_time) * 1000)
		    + ((ws_record.stop_time - ws_record.start_time) / 1000));


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89712 13f79535-47bb-0310-9956-ffa450edef68
2001-07-25 21:15:54 +00:00
William A. Rowe Jr
7b2c62a74e Changes to respect the new apr bucket and brigade length types (either
apr_size_t for bucket lengths, or apr_off_t for aggregate brigade lengths.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89683 13f79535-47bb-0310-9956-ffa450edef68
2001-07-24 20:38:01 +00:00
William A. Rowe Jr
05fcc41a1f Update for latest structure changes for 2.0.21
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89644 13f79535-47bb-0310-9956-ffa450edef68
2001-07-20 20:00:50 +00:00
Paul J. Reder
620a48e609 Changed AP_MPMQ_MAX_DAEMONS to refer to MaxClients and
added an AP_MPMQ_MAX_DAEMON_USED to refer to the highest
daemon index actually used in the scoreboard. I also
updated the pertinent calls.

Paul J. Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89604 13f79535-47bb-0310-9956-ffa450edef68
2001-07-18 20:29:00 +00:00
Greg Ames
5139e492bd scratch an old itch - give lingering close its own state in the scoreboard.
clean up SERVER_ACCEPTING and SERVER_QUEUEING (never set) while I'm at it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89542 13f79535-47bb-0310-9956-ffa450edef68
2001-07-12 03:20:50 +00:00
Greg Ames
537f07df5e fix pid numbers in mod_status output when using a threaded mpm. pid_buffer was
being indexed by worker slot during initialization, then by process slot when
generating output.

This saves a little storage and a few cycles, too.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89534 13f79535-47bb-0310-9956-ffa450edef68
2001-07-10 22:50:54 +00:00
David Reid
a80a9b823f s/cont/pool/
Bring this back in line with changes to APR.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89511 13f79535-47bb-0310-9956-ffa450edef68
2001-07-07 16:21:53 +00:00
William A. Rowe Jr
f6f3f613e3 Refresh .mak files for tagging 2.0.19
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89458 13f79535-47bb-0310-9956-ffa450edef68
2001-06-28 00:31:04 +00:00
William A. Rowe Jr
ac61d1a8f8 Employ the new ap_sub_req_lookup_dirent() function for mod_autoindex.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89448 13f79535-47bb-0310-9956-ffa450edef68
2001-06-27 21:54:16 +00:00
Jeff Trawick
e47fad222b handle the SERVER_IDLE_KILL state in some of the ExtendedStatus=On
output

I don't have 100% confidence in my guess as to why some of the state labels
are in bold and some aren't (e.g., "<b>Write</b>" vs. "Graceful".  Hopefully
any rhyme or reason to it is maintained with my change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89249 13f79535-47bb-0310-9956-ffa450edef68
2001-05-31 18:10:04 +00:00
Jeff Trawick
303a191fdd a worker being cleaned up is not processing a request; filter out such
workers when counting the number of requests being processed

we won't count such workers as idle either, since they aren't available
to process new requests


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89248 13f79535-47bb-0310-9956-ffa450edef68
2001-05-30 14:14:26 +00:00
Bill Stoddard
53754c102e Get the Request Phase Participation change compiling on Windows.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89136 13f79535-47bb-0310-9956-ffa450edef68
2001-05-17 13:58:52 +00:00
Jeff Trawick
dfa372f602 don't destroy the pcgi pool when the other-child registration
of the cgi daemon goes away... it goes away *because* the
pcgi pool is being destroyed


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89130 13f79535-47bb-0310-9956-ffa450edef68
2001-05-16 19:19:56 +00:00
Jeff Trawick
62ade41102 clean up DSO builds on OS/390 a bit by ignoring some generated files
and by passing libtool the OS/390-specific options needed to split
the main httpd executable into a small executable with main() and a
dll with everything else (previously this information was hard-coded
in the OS/390 libtool program)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89124 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 17:30:44 +00:00
Doug MacEachern
7cbed3dc9d add "Request Phase Participation" info to mod_info
PR:
Obtained from:
Submitted by: dougm
Reviewed by: gstein


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89116 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 04:25:16 +00:00
Paul J. Reder
1b2262dd30 Make first phase changes to the scoreboard data structures in
preparation for the rewriting of the scoreboard per my posted
design notes. [Paul J. Reder]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89115 13f79535-47bb-0310-9956-ffa450edef68
2001-05-15 02:38:17 +00:00
Roy T. Fielding
8ea5039bdb Fix httpd's definition of LTFLAGS to be consistent with that of apr
and apr-util, allow it to be overridden by the configure command-line
(default="--silent") and introduce LT_LDFLAGS to replace what we were
formally abusing as LTFLAGS.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89094 13f79535-47bb-0310-9956-ffa450edef68
2001-05-12 03:48:31 +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
99ba37d329 Get rid of some Apache 1.x OPTIMIZE_TIMEOUTS cruft. Other logic
in 1.3 which used this stuff would send SIGALRM to children in
certain circumstances.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89047 13f79535-47bb-0310-9956-ffa450edef68
2001-05-07 15:49:42 +00:00
Jeff Trawick
7ed1b10217 Build (and do so cleanly) when !APR_HAS_OTHER_CHILD.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88986 13f79535-47bb-0310-9956-ffa450edef68
2001-05-04 18:42:51 +00:00
Jeff Trawick
58e376a83c Prevent a hang when a cgi handled by mod_cgid tries to read a
request body from its stdin but no reqest body is being written to
the cgi.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88975 13f79535-47bb-0310-9956-ffa450edef68
2001-05-02 16:58:21 +00:00
Roy T. Fielding
f1f5f01fdb Completely revamp configure so that it preserves the standard make
variables CPPFLAGS, CFLAGS, CXXFLAGS, LDFLAGS and LIBS by moving
the configure additions to EXTRA_* variables.  Also, allow the user
to specify NOTEST_* values for all of the above, which eliminates the
need for THREAD_CPPFLAGS, THREAD_CFLAGS, and OPTIM.  Fix the setting
of INCLUDES and EXTRA_INCLUDES.  Check flags as they are added to
avoid pointless duplications.  Fix the order in which flags are given
on the compile and link lines.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88960 13f79535-47bb-0310-9956-ffa450edef68
2001-04-29 05:24:11 +00:00
Ryan Bloom
cd0738be95 Add more options to the ap_mpm_query function. This also allows MPMs to
report if their threads are dynamic or static.  Finally, this also
implements a new API, ap_show_mpm, which returns the MPM that was
required into the core.

We tried to make all of the MPMs report their threading capabilities
correctly, but each MPM expert should double check us.

Submitted by:	Harrie Hazewinkel <harrie@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88851 13f79535-47bb-0310-9956-ffa450edef68
2001-04-13 19:00:39 +00:00
William A. Rowe Jr
18c79112fa Probably my own foobar
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88824 13f79535-47bb-0310-9956-ffa450edef68
2001-04-12 13:36:11 +00:00
Paul J. Reder
a3d7fb947d Changes required to make prefork clean up idle children properly. There was a window during which a starting worker deadlocks when an idle cleanup arrives before it completes init. Apache then keeps trying to cleanup the same deadlocked worker forever (until higher pids come along, but it still will never reduce below the deadlocked pid). Thus the number of children would not reduce to the correct idle level.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88741 13f79535-47bb-0310-9956-ffa450edef68
2001-04-06 20:12:09 +00:00
William A. Rowe Jr
5383bde83c Time to refresh mak on Win32
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88728 13f79535-47bb-0310-9956-ffa450edef68
2001-04-05 09:21:46 +00:00
Jeff Trawick
dcff7edfd1 clean up some mod_cgid issues related to other child maintenance...
the APR_OC_REASON_DEATH/APR_OC_REASON_LOST code was sending SIGWINCH
  to the parent (usually init) instead of itself

  APR_OC_REASON_RESTART/_UNREGISTER code separated so that we go through
  there once


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88697 13f79535-47bb-0310-9956-ffa450edef68
2001-04-03 19:12:14 +00:00
Jeff Trawick
2f0029b541 oops... really fix the storage leak this time... we were doing cleanups
after the last change, but we were losing the pool and its retained
storage


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88612 13f79535-47bb-0310-9956-ffa450edef68
2001-03-29 03:23:44 +00:00
Jeff Trawick
8fe24d1f1b Fix a storage leak in mod_cgid... the temporary pool created for
each request was not cleaned up.

This removes the nastiest symptom of some excess pipes being created
(i.e., we don't run out of file descriptors), though something
additional is needed to keep from creating the pipes to begin with.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88611 13f79535-47bb-0310-9956-ffa450edef68
2001-03-29 00:17:50 +00:00
Doug MacEachern
bc660e9860 top_module global variable renamed to ap_top_module
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88582 13f79535-47bb-0310-9956-ffa450edef68
2001-03-26 15:39:52 +00:00
Ryan Bloom
b2437fe0b1 Enable mod_status by default. This matches the docs and what 1.3 does.
Submitted by:	Ed Korthof


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88578 13f79535-47bb-0310-9956-ffa450edef68
2001-03-25 20:07:54 +00:00
William A. Rowe Jr
e935387c91 This should wrap this freshen up
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88559 13f79535-47bb-0310-9956-ffa450edef68
2001-03-22 05:56:59 +00:00
William A. Rowe Jr
070a459850 Refreshing the .mak files. Dang... should have done this in the a.m.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88472 13f79535-47bb-0310-9956-ffa450edef68
2001-03-08 05:38:17 +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
Jeff Trawick
26d5f3b1c8 get rid of unused parameter filename to function get_req()
PR:		6980


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88432 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 22:00:30 +00:00
Jeff Trawick
47b18adf09 no need to calculate the config file name in display_info() since we
don't have to read it

PR:		6980


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88431 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 21:51:00 +00:00
Ryan Bloom
4f7dd462ea Fix mod_info, so that <Directory> and <Location> directives are
not displayed twice when displaying the current configuration.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88416 13f79535-47bb-0310-9956-ffa450edef68
2001-03-02 05:50:05 +00:00
Jeff Trawick
7f17e1292a Fix a problem displaying status when a threaded MPM is used.
The line

   int indx = (i * HARD_THREAD_LIMIT) + j;

in the vicinity of the change was bad; k needed to be added
instead of j.

I swapped the use of j and k in this section so that i and j
had the same meaning as in an earlier nested loop.  I suspect
that the difference in meaning is what led to the bug.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88397 13f79535-47bb-0310-9956-ffa450edef68
2001-02-28 18:41:44 +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
Ryan Bloom
740968b2bf Get mod_cgi building again after moving a bunch of code from the HTTP
module to the core.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88345 13f79535-47bb-0310-9956-ffa450edef68
2001-02-26 06:24:44 +00:00
Ryan Bloom
4296146043 Begin to move functions from the http module to the core. The goal is to
have only functions that are HTTP specific in the http directory.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88341 13f79535-47bb-0310-9956-ffa450edef68
2001-02-26 04:38:22 +00:00
William A. Rowe Jr
d3fdebba53 A patch to clean up much bogusity in Win32. Eliminates absolute cd "/..."
references using build/fixwin32mak.pl, and the latest #if APR_HAVE_FOO_H
  fixes apparently worked, now that they no longer appear as dependencies
  [which had broken the build entirely.]


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88336 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 22:20:25 +00:00
William A. Rowe Jr
4f3f34e9d4 Whoops ... if I'm enabling mod_info to build on Win32, better clean
up the declarations of these private core symbols.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88333 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 20:57:51 +00:00
William A. Rowe Jr
77390b6985 Refresh all .mak files should we choose to roll again shortly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88317 13f79535-47bb-0310-9956-ffa450edef68
2001-02-25 02:53:30 +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
Ryan Bloom
192cc6b8a5 Namespace protect IOBUFSIZ since it is a public symbol.
Submitted by:	Jon Travis <jtravis@covalent.net>


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88282 13f79535-47bb-0310-9956-ffa450edef68
2001-02-23 00:50:24 +00:00
Bill Stoddard
6fcbaceea5 Performance: apr_now() was being called for -all- requests. Call it only
for calls to server-status.  This module is still a mess...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88265 13f79535-47bb-0310-9956-ffa450edef68
2001-02-21 21:02:57 +00:00
Ryan Bloom
f740468deb Close the accepted socket before creating the CGI process in mod_cgid.
This is safe, because we have already dup'ed the socket for the CGI
process itself.  This change allows CGI processes to fork long-lived
child processes without affecting how quickly the response gets back
to the broswer.

PR:	7273
Submitted by:	Taketo Kabe <kabe@sra-tohoku.co.jp>
Reviewed by:	Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88264 13f79535-47bb-0310-9956-ffa450edef68
2001-02-21 19:07:21 +00:00
Jeff Trawick
ad4230b947 get rid of a type mismatch warning
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@88246 13f79535-47bb-0310-9956-ffa450edef68
2001-02-20 09:27:45 +00:00