1
0
mirror of https://github.com/apache/httpd.git synced 2025-08-26 05:42:34 +03:00
Commit Graph

34 Commits

Author SHA1 Message Date
William A. Rowe Jr
01f4c4f960 The lots of little ones... APR_IS_STATUS_condition(rv) conditional macros
replacing the majority of fallible rv == APR_condition tests.  But there
  are lots more to fix, these are the obvious ones that already did proper
  canonical error conversion.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86405 13f79535-47bb-0310-9956-ffa450edef68
2000-10-05 17:33:14 +00:00
Brian Havard
7ed141239d APRize disabling nagle (setting TCP_NODELAY).
Note that several areas have not been tested as they apply to MPMs or APR
code that I can't test.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86133 13f79535-47bb-0310-9956-ffa450edef68
2000-08-22 15:09:28 +00:00
William A. Rowe Jr
1a9db204f5 Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation...
see src/lib/apr/apr_compat.h for most details.
  Also a few minor nits to get Win32 to build.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@86008 13f79535-47bb-0310-9956-ffa450edef68
2000-08-06 06:07:53 +00:00
Doug MacEachern
059d8dd212 prefix libapr functions and types with apr_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85976 13f79535-47bb-0310-9956-ffa450edef68
2000-08-02 05:27:38 +00:00
Manoj Kasichainula
5f0b2584a4 Eliminate references to specific MPMs from mpm_common.c by having the
MPMs export interfaces to the tables used to keep track of children.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85951 13f79535-47bb-0310-9956-ffa450edef68
2000-07-30 12:03:48 +00:00
Manoj Kasichainula
de6d7efcca Change semantics of ap_child_table somewhat. Instead of checking for a
dead process with status == SERVER_DEAD, check with pid == 0. This
makes somewhat more sense conceptually, and also matches the behavior
of MPMs that use a shmem scoreboard to track children.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85950 13f79535-47bb-0310-9956-ffa450edef68
2000-07-30 11:49:29 +00:00
Ryan Bloom
4adecb112e Add a new MPM. Currently this is almost an exact copy of the dexter MPM.
In time, this will be the MPM that allows each child process to have a
unique user id.  I need a place to work and keep track of my changes.
Don't expect this to work until next week sometime.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85902 13f79535-47bb-0310-9956-ffa450edef68
2000-07-27 00:16:32 +00:00
Ryan Bloom
a123234f7b Cleanup the MPM #defines. Each MPM #defines a unique name that identifies
it to the system.  That name should be of the format NAME_MPM where name
is something like DEXTER, MPMT_PTHREAD, SPMT_OS2, etc.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85901 13f79535-47bb-0310-9956-ffa450edef68
2000-07-27 00:04:11 +00:00
Jeff Trawick
f34f4329b7 Fix some build issues for dexter:
. dexter/scoreboard.c needed apr_strings.h to get the right
  function prototypes

. main/mpm_common.c needed to recognize that we were building
  for dexter; otherwise, no ap_reclaim_child_processes() was
  compiled and linking failed

(It would be nice to standardize on which preprocessor symbols
are checked for...  mpmname_MPM seems nice enough.  Didn't the
check for symbol mpmname (no "_MPM") come with mpmt.c?)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85899 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 18:07:34 +00:00
Jeff Trawick
f0bb3353e6 Get ap_socket_disable_nagle() working again.
Submitted by:	Greg Ames
Reviewed by:	Jeff Trawick


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85894 13f79535-47bb-0310-9956-ffa450edef68
2000-07-26 14:12:38 +00:00
William A. Rowe Jr
847b20108c Add APR_EOL_STR for a platform specific text delimiter, provided by
apr.h (defined in apr.h.in and apr.hw).  This is needed -only- in APR
  created files (true raw files) such as logs.  It is not required in any
  splat to screen (stderr/stdout) formatting, nor any html markup.

  Some other modules slipped through in the prior apr_strings.h commit.
  Sorry 'bout that.

PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85878 13f79535-47bb-0310-9956-ffa450edef68
2000-07-25 01:06:32 +00:00
Bill Stoddard
c4aeab10dc #ifdef APR_HAS_OTHER_CHILD to #if APR_HAS_OTHER_CHILD. Not tested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85821 13f79535-47bb-0310-9956-ffa450edef68
2000-07-11 22:12:18 +00:00
Ryan Bloom
ffd0a49e40 Remove all pthreads calls from the mpmt MPM prefork emulation. This makes
the mpmt MPM look almost exactly like the original prefork MPM.  Basically,
all that's left is re-naming the defined directives so they work with 1.3
config files.  That will come later.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85819 13f79535-47bb-0310-9956-ffa450edef68
2000-07-11 19:00:16 +00:00
Ryan Bloom
f23ce00e31 Move sock_disable_nagle to mpm_common.c. Rename it to ap_sock_disable_nagle.
Again, I tried to modify all MPMs that are currently using this code.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85811 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 22:08:11 +00:00
Ryan Bloom
074e3c2fb4 Move process_child_status to mpm_common.c. This requires re-naming it
to ap_process_child_status and opening up ap_coredump_dir.  I have
modified all of the MPMs that I saw using this function to work with this
patch.  Sorry if I broke anybody.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85808 13f79535-47bb-0310-9956-ffa450edef68
2000-07-10 18:21:24 +00:00
Ryan Bloom
8bc702907e Fix mpm_common for use with the real prefork MPM. This was broken when
mpmt was added.  This change can be removed when the MPM stuff calms down
a bit and either mpmt or three separate MPMs are chosen.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85799 13f79535-47bb-0310-9956-ffa450edef68
2000-07-09 23:12:44 +00:00
Ryan Bloom
5b4dfe234e Initial version of the mpmt MPM. This MPM can emulate dexter, mpmt_pthread,
and prefork.  This basically just combines a lot of common code.  This
builds and serves pages in all three modes, but I don't think killing
the server works in any of them.  The configuration system hasn't changed
at all, so using --with-mpm=(prefork|dexter|mpmt_pthread) all work.

My goal is to remove the three separate MPMs in a few days, and then work
on merging one of the BeOS and the OS/2 MPMs into this as well.  :-)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85788 13f79535-47bb-0310-9956-ffa450edef68
2000-07-07 17:35:41 +00:00
David Reid
e2cc66000f Add the EXTRA_LIBS to get apache building on BONE again and now that
we're using ap_sleep remove the need for sys/socket.h in mpm_common.c


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85658 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 18:28:07 +00:00
Ryan Bloom
536d252495 Remove a few unnecessary calls to select. These calls used to be made so
that we would sleep for a specified number of microseconds.  APR provides
a function ap_sleep that does this for us.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85657 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 16:55:01 +00:00
David Reid
7231c3a12a Cut free mpm_common.c from ap_max_daemons_limit as a variable. Now we
get the value from the MPM and thus free the MPM to use any variable
name they like.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85655 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 01:36:33 +00:00
David Reid
b8182a9526 Small change in an effort to get restarts working correctly on BeOS.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85653 13f79535-47bb-0310-9956-ffa450edef68
2000-06-22 00:41:43 +00:00
David Reid
e67a4b2f80 Update mpm_common to work with the latest BeOS version and start
adding support for a new BeOS MPM that I'll commit in a few days.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85621 13f79535-47bb-0310-9956-ffa450edef68
2000-06-19 21:11:49 +00:00
David Reid
35e97374a7 Add sys/time.h to mpm_common to include define of timeval.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85569 13f79535-47bb-0310-9956-ffa450edef68
2000-06-14 13:50:40 +00:00
Ryan Bloom
4e7616169e Remove waitpid from the config checks and all calls to waitpid from the
server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85488 13f79535-47bb-0310-9956-ffa450edef68
2000-06-09 22:05:36 +00:00
David Reid
9d1a70c8d5 Add support for the BeOS mpm. Also change some things to make it easier
for future additions.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85372 13f79535-47bb-0310-9956-ffa450edef68
2000-06-01 18:42:04 +00:00
Brian Havard
7cdbb7194d Only compile ap_reclaim_child_processes() if a CHILD_INFO_TABLE is known.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85333 13f79535-47bb-0310-9956-ffa450edef68
2000-05-28 12:20:04 +00:00
Ryan Bloom
93d9ac51ce Fix a memory leak with ap_wait_or_timeout.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85286 13f79535-47bb-0310-9956-ffa450edef68
2000-05-24 00:42:01 +00:00
Greg Stein
026c77c19d use the correct size for 'ret'
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85284 13f79535-47bb-0310-9956-ffa450edef68
2000-05-23 23:32:35 +00:00
Ryan Bloom
ea432e5602 Fix a small bug/warning when compiling with use-maintiner-mode related
to the ap_proc_t change.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85283 13f79535-47bb-0310-9956-ffa450edef68
2000-05-23 23:26:51 +00:00
Ryan Bloom
f9f4c470a8 Convert ap_proc_t to a complete type. This lets us access the pid directly.
Only the prefork MPM has been ported so far, the rest of the Unix MPM's are
coming later today.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85279 13f79535-47bb-0310-9956-ffa450edef68
2000-05-23 21:04:03 +00:00
Roy T. Fielding
62a38109bd Temporary fix for misuse of int instead of pid_t.
Also include mpm_common.h to pick up the common prototypes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85257 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 07:10:57 +00:00
Jeff Trawick
42ec41c2a7 ap_wait_or_timeout() can't be static since it is called from
dexter.c, prefork.c, and mpmt_pthread.c.

(Yes, we still need a function prototype somewhere, but at least we
can link properly now.)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85252 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 02:37:17 +00:00
Ryan Bloom
c065c11580 Move wait_or_timeout from the MPM's into the new mpm_common.c file. I
also renamed wait_or_timeout to ap_wait_or_timeout for namespace
protection.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85250 13f79535-47bb-0310-9956-ffa450edef68
2000-05-19 01:05:26 +00:00
Ryan Bloom
2a648d2111 First function removed from Unix MPM's and moved to a common file. This
work is not anywhere near finished, but the cleanup has begun at least.
Had to make a couple of variables non-static, so a name change was required
since they are now viewable from outside the library.  The advantage to this
is code that is much easier to maintain into the future, because it is
duplicated less often.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85249 13f79535-47bb-0310-9956-ffa450edef68
2000-05-18 23:25:06 +00:00