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

379 Commits

Author SHA1 Message Date
Doug MacEachern
f3a4cf49be prefix TRUE,FALSE with APR_
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85074 13f79535-47bb-0310-9956-ffa450edef68
2000-04-28 06:49:53 +00:00
Ryan Bloom
48ed70a21b apr_config.h is a private include file, and shouldn't be used by any
C files outside of APR.  ap_signal has been moved to apr.h, so this
include is no longer needed.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84967 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 20:54:25 +00:00
Ryan Bloom
de3a77dc01 Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages
on Linux, but probably breaks somewhere.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84963 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 15:59:20 +00:00
Jeff Trawick
e58d3176f1 Change the declaration of ap_scoreboard_image to match
the one in scoreboard.h (API_VAR_EXPORT instead of static).


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84932 13f79535-47bb-0310-9956-ffa450edef68
2000-04-06 02:10:05 +00:00
Jeff Trawick
92cafef56b stop relying on a macro to map signal() to ap_signal(); call
ap_signal() directly


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84914 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 01:23:51 +00:00
Ryan Bloom
7d1ca34535 The Unix MPM's now use the other_child logic from APR.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84913 13f79535-47bb-0310-9956-ffa450edef68
2000-04-04 22:37:00 +00:00
Roy T. Fielding
2bee4ad19d Update to Apache Software License version 1.1
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84879 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:05:25 +00:00
Ryan Bloom
0685390645 A very first shot at implementing the status API for the prefork mpm.
This is without a doubt a bad implementation, but it works, and the
server compiles with mod_status enabled.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84865 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 20:51:23 +00:00
Ryan Bloom
3fa139e050 Put the pre_config hook back into the table. This solves the problem of
the pre-config hook only being valid for MPM's.  This patch also
distinguishes between STANDARD modules and MPM's.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84862 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 15:30:36 +00:00
Ryan Bloom
e2bd68acb6 Update the prefork mpm with the new ap_shm_init prototype.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84789 13f79535-47bb-0310-9956-ffa450edef68
2000-03-17 21:58:30 +00:00
Ryan Bloom
b1c26f031a Fix all the License issues. Including:
s/Apache Group/Apache Software Foundation/
s/1999/2000/
s/Sascha's license/ASF license


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84725 13f79535-47bb-0310-9956-ffa450edef68
2000-03-10 00:07:37 +00:00
dgaudet
7dd8a75266 clean up a bunch of -Wall/etc warnings
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84698 13f79535-47bb-0310-9956-ffa450edef68
2000-03-02 11:05:17 +00:00
Ryan Bloom
c6d6c8438f Make the prefork MPM use APR shared memory for it's scoreboard.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84609 13f79535-47bb-0310-9956-ffa450edef68
2000-02-10 23:46:33 +00:00
Ryan Bloom
f8a7fce423 Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is
defined correctly in all C files.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84531 13f79535-47bb-0310-9956-ffa450edef68
2000-01-28 18:02:29 +00:00
Ryan Bloom
a8ce196da5 Finish the commits for the change in the header files. Basically, this hides
all of the Apache macros that modules don't need access to.  This should
have been committed with the modules, but I wasn't paying attention to the
directory I was in when I ran the commit.
Submitted by:	Manoj Kasichainula and Ryan Bloom


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84493 13f79535-47bb-0310-9956-ffa450edef68
2000-01-19 01:16:31 +00:00
Sascha Schumann
bbe1a3601e These changes are committed together, because they depend on each other.
-   shared modules can be built in the tree
    -   added support for --with-layout, uses APACI's config.layout
    -   working 'make install'
    -   working 'make depend'
    -   working Pthreads checks
    -   buildconf replaced


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84423 13f79535-47bb-0310-9956-ffa450edef68
2000-01-11 13:11:13 +00:00
Ryan Bloom
528afcc4d6 Initialize all ap_file_t's to NULL. This allows ap_open and ap_stat to
work together without causing memory leaks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84393 13f79535-47bb-0310-9956-ffa450edef68
2000-01-04 19:01:04 +00:00
Ryan Bloom
7cb6de58a7 A few more tweaks to finish the modules work. Now, all of the modules
compile correctly with Apache 2.0. This does run, but it hasn't been tested
any more than simply compiling and running the server.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84386 13f79535-47bb-0310-9956-ffa450edef68
1999-12-31 20:32:36 +00:00
Sascha Schumann
c434846940 Fall back to save values for SHM_R and SHM_W, if the system does not
define them.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84375 13f79535-47bb-0310-9956-ffa450edef68
1999-12-29 23:57:53 +00:00
Ryan Bloom
ecf9bb296b Getting rid of more warnings in the prefork mpm.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84297 13f79535-47bb-0310-9956-ffa450edef68
1999-12-15 21:39:09 +00:00
Ryan Bloom
e0f0562f26 Make prefork compile.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84292 13f79535-47bb-0310-9956-ffa450edef68
1999-12-14 20:02:50 +00:00
Manoj Kasichainula
1ab6b7b233 The Unix MPMs were depending on APR for signal.h, and broke. Add an
explicit #include for it back in.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84217 13f79535-47bb-0310-9956-ffa450edef68
1999-12-03 22:11:31 +00:00
Manoj Kasichainula
1582947dd5 Get rid of ap_check_signals() in all but the prefork MPM, and #define it
away there. It's a TPF-specific piece that will likely go into a TPF
MPM.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84199 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 00:45:02 +00:00
Manoj Kasichainula
3cfe8158af Deal with times() properly in autoconf. This also changes NO_TIMES to
!HAVE_TIMES.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84193 13f79535-47bb-0310-9956-ffa450edef68
1999-11-30 03:52:57 +00:00
Manoj Kasichainula
a7a251cb29 The first part of the big autoconf patch. This replaces a bunch of
NEED_* macros with HAVE_* macros to be more consistent with autoconf.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84186 13f79535-47bb-0310-9956-ffa450edef68
1999-11-29 23:33:24 +00:00
Ryan Bloom
409d49d2f2 Remove the ap_thread_mutex code from all MPM's. This code isn't actually
being called anywhere, and I have compiled dexter, mpmt_pthread, and
prefork without it.  Away it goes.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84138 13f79535-47bb-0310-9956-ffa450edef68
1999-11-19 20:27:32 +00:00
Ryan Bloom
e0ff64c186 Finish the conversion from fprintf(stderr -> ap_log_err.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84135 13f79535-47bb-0310-9956-ffa450edef68
1999-11-19 18:49:20 +00:00
Ryan Bloom
370fc31b00 Cleanup the ZZZ comments. Basically these used to mark places where APR
is needed.  It is much easier to do this conversion by hand than by
searching for old comments, so they are going away now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84128 13f79535-47bb-0310-9956-ffa450edef68
1999-11-16 18:32:05 +00:00
Ryan Bloom
1901b23ef9 Moving Unix socket IOL's to use APR. Also fixed a small bug in ap_recv.
We should NEVER return a status of APR_EAGAIN and say -1 bytes read.  This
can cause some strange bugs.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84120 13f79535-47bb-0310-9956-ffa450edef68
1999-11-15 19:50:25 +00:00
Ben Laurie
326753c5bd Fix error logging calls (kinda).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84113 13f79535-47bb-0310-9956-ffa450edef68
1999-11-09 09:33:52 +00:00
Brian Havard
df37d04f04 Add a context parameter to ap_accept() for the connection socket to be
allocated from. This is needed because the lifetime of a connection is
ususally much shorter than that of the listen socket. Only tested on
OS/2.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84031 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 13:08:30 +00:00
Brian Havard
5b14910b2d Fix an ap_log_error() call.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84030 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 07:43:45 +00:00
Brian Havard
243005861c Enhancements for APR network_io. Adds separate local/remote access methods for
a socket's port, IP address and sockaddr_in.

Updates for Apache code to use these, allowing the correct IP address of
clients to be logged.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84029 13f79535-47bb-0310-9956-ffa450edef68
1999-10-24 05:59:22 +00:00
Ryan Bloom
482dcf3495 Add a status value to ap_log_error and ap_log_rerror. This allows us to use
apr_status codes in our error logs.  The main advantage of this, is portable
error codes.  Now, Windows will finally be able to use errno!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84007 13f79535-47bb-0310-9956-ffa450edef68
1999-10-20 12:50:12 +00:00
Ryan Bloom
234823c5c5 I missed one function when swapping paramters. This fixes it. I think I
have caught them all this time.  I really hope this is the final time I have
to swap parameters.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83996 13f79535-47bb-0310-9956-ffa450edef68
1999-10-14 14:36:49 +00:00
Ben Hyde
2cf21a348f Redundent and out of synch global.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83988 13f79535-47bb-0310-9956-ffa450edef68
1999-10-13 20:36:32 +00:00
Manoj Kasichainula
8dfd787359 My connection status patch broke all the MPMs that didn't have
connection status support yet. For now, throw in stub functions so that
the server compiles.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83985 13f79535-47bb-0310-9956-ffa450edef68
1999-10-13 18:16:50 +00:00
Martin Kraemer
8c18eee13a Remove most of the annoying "re ap_context_t mplement" mis-replacements
by what I think is their real meaning. Guys, I didn't verify all of this,
please have a close look at my "fixes". Thanks.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83970 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 22:40:18 +00:00
Ryan Bloom
644262a3ac Bring network code to the parameter order spec. This means contexts go last,
and result parameters go first.  Also fixed a small bug in the Makefile.  We
should be removing the libs dir when we do a distclean, we are now.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83956 13f79535-47bb-0310-9956-ffa450edef68
1999-10-10 20:35:06 +00:00
Manoj Kasichainula
1c73c43a49 Make prefork's setup_listeners looks like the others'.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83948 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 22:23:54 +00:00
Ben Hyde
cd06de1ce3 Well this was thought provoking.
Drive out the use of malloc in two places.

In listen.c, using the global process pool instead.  That changes the
API into listen so that a process is passed in rather than the config
pool.  That's all was easy.

The pain is propogating a change into all N of the mpm, they
are all similar but different in their use of listen.c  There
is a lot to dislike about similar but code scattered code.

I changed the N setup_listener routines, they now take only
the server since they can dig the config and global pool
out of there.

Free today: ap_setup_prelinked_modules now takes the process so it
can allocate it's table in the process's pool rathern than use
malloc.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83943 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 20:48:26 +00:00
Ryan Bloom
e75cbac28c Bring file_io up to the new parameter order for APR. I have decided to do
these on a directory by directory basis for the rest of APR.  I hope to
cause fewer problems for other developers by doing it this way.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83937 13f79535-47bb-0310-9956-ffa450edef68
1999-10-06 23:04:16 +00:00
Ben Laurie
1c3fd58a7f Use new parameter orders.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83934 13f79535-47bb-0310-9956-ffa450edef68
1999-10-05 11:57:41 +00:00
Ryan Bloom
2b361ec557 First patch to re-order function parameters. This one gets the low hanging
fruit, and moves most of the result parameters to the first argument.
Future patches in this series will move the rest of the result parameters
to the beginning of the list, and will move the context's to the end of the
list


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83927 13f79535-47bb-0310-9956-ffa450edef68
1999-10-04 16:38:16 +00:00
Ryan Bloom
e4e32bb59e A change to how APR uses user data. Now, user data is a linked list that
is retreivable using a char string.  Basically, you provide a string that
will be used as a key when you store the data.  If the key was used before,
we will overwrite the old data.  When you want to retreive your data, pass
in the same key, and we will find the data you care about.  This also makes
it harder to put user data in when creating a context, so that option has
disappeared.  It is also impossible to inherit user data from parent contexts.
This option may be added in later.  I will be documenting this VERY soon.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83901 13f79535-47bb-0310-9956-ffa450edef68
1999-09-14 13:37:45 +00:00
Ben Laurie
e07f7c55b8 Make prefork compile on FreeBSD.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83890 13f79535-47bb-0310-9956-ffa450edef68
1999-09-11 10:25:59 +00:00
Ryan Bloom
69adf379b4 Remove all of the calls to functions like "ap_popenf". These functions were
moved down to APR, but they are being removed.  They are not portable, and
were only moved down for backwards compatability.  With this change, they can
be safely removed, which is the next commit on it's way.
Submitted by:  Ryan Bloom and Paul Reder


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83879 13f79535-47bb-0310-9956-ffa450edef68
1999-09-08 14:15:55 +00:00
Ryan Bloom
c37f14ddf3 Changed pools to contexts. Tested with prefork and pthread mpm's. I'll
check this out tomorrow and make sure everything was checked in correctly.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83852 13f79535-47bb-0310-9956-ffa450edef68
1999-08-31 05:35:52 +00:00
Jim Jagielski
3b4a4499c2 Remove some shadowing
warnings. Avoid some possible confusion as well :)


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83840 13f79535-47bb-0310-9956-ffa450edef68
1999-08-28 13:31:36 +00:00
Ben Laurie
78847f9190 Child initializer hook.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83680 13f79535-47bb-0310-9956-ffa450edef68
1999-08-15 00:11:18 +00:00