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

224 Commits

Author SHA1 Message Date
Bill Stoddard
ec1cc5b5ce Handle -k restart|shutdown command line option from http_main.c
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84341 13f79535-47bb-0310-9956-ffa450edef68
1999-12-20 19:07:33 +00:00
Manoj Kasichainula
04c494c2b5 Eliminate ap_config.h's checks when using autoconf. Now, ap_ac_config.h
is used instead, and autoconf's configure script will check for
everything else.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84200 13f79535-47bb-0310-9956-ffa450edef68
1999-12-01 01:16:23 +00:00
Ryan Bloom
444531b691 Clean up the getopt stuff a bit. Basically, I am removing the #define's,
and changing the names in the getopt.c file so that we are sure there is
no namespace collision between regular getopt's, and APR's getopt.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84143 13f79535-47bb-0310-9956-ffa450edef68
1999-11-22 14:52:17 +00:00
Martin Kraemer
7b7373e940 Use APR's getopt
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84142 13f79535-47bb-0310-9956-ffa450edef68
1999-11-21 22:10:22 +00:00
Ryan Bloom
975ea85ea2 First step in removing the fprintf(stderr problem from Apache. Basically,
I defined APLOG_STARTUP, which refrains from printing the date string
and the log level information in log_error_core.  I then changed all the
fprintf(stderr calls to ap_log_error, and used APLOG_STARTUP.
log_error_core on Unix takes care of creating a log file and directing
it to stderr if a log file isn't already active.  I will continue to
make these changes tomorrow.  Currently, the main code and the dexter
mpm have been modified.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84134 13f79535-47bb-0310-9956-ffa450edef68
1999-11-18 23:07:53 +00:00
Bill Stoddard
3fb176b8aa Get rid of dependency on os/win32/getopt.c & .h
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84110 13f79535-47bb-0310-9956-ffa450edef68
1999-11-08 18:54:12 +00:00
Brian Havard
db0dd36aef Use APR's getopt.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84006 13f79535-47bb-0310-9956-ffa450edef68
1999-10-19 15:54:52 +00:00
Ben Hyde
ec15673a2a Remove all but one WIN32 from http_main. Other minor changes.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83987 13f79535-47bb-0310-9956-ffa450edef68
1999-10-13 20:27:55 +00:00
Martin Kraemer
0c7673561b Fix typos
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83969 13f79535-47bb-0310-9956-ffa450edef68
1999-10-11 22:07:29 +00:00
Martin Kraemer
db9bd13ea1 ap_server_argv0 was undefined. Use a simple default (basename(argv[0]))
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83945 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 21:48:30 +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
Ben Hyde
2921356fcf Add process_rec to the top of {server,connection,request}_rec
hierarchy of structs that abstract server activities.  Store some
stuff in process_rec (finally a place to have nearly guiltless
globals) for example the global and configuration pools.  Put some
operations on process_rec in http_main, in particular the
destroy_and_exit operation, and the use it to do all the exit calls.
Change ap_read_config to operation on this "object" rather than on the
configuration pool.  Modify server_rec to point to the process, so you
can get at it most all the time which should finally allow most of the
server's malloc calls to be eliminated.

There are no locks in the process struct as yet, put them in as needed.
Some of the hooks should take this rather than conf. pool.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83942 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 18:13:17 +00:00
Ben Hyde
622311151d Duh.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83941 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 15:36:40 +00:00
Ben Hyde
7298ff9b6a Changed my mind, ptemp maybe "systolic" but since it is empty
during the entire time the server is serving it's best to destroy it.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83940 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 15:33:06 +00:00
Ben Hyde
9bbc5288b2 Man! This file vastly improved. Thanks Dean!
Use the abstraction API_EXPORT_NONSTD for exporting main (aka
apache_main).  Use clear rather than destroy on ptemp as other
'systolic' pools do.  That also fixing a leak of the first ptemp
created.  Let the destroy of pglobal to all the cleanup.  Meanwhile,
all exit paths should destroy pglobal so the cleanup/unwind gets run
and this routine sets a bad example by having many exits that don't -
another day.
PR:
Obtained from:
Submitted by:
Reviewed by:


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83939 13f79535-47bb-0310-9956-ffa450edef68
1999-10-07 14:32:06 +00:00
Ben Hyde
e852186ad6 Remove obsolete ap_util_init function.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83936 13f79535-47bb-0310-9956-ffa450edef68
1999-10-06 21:26:53 +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
ef225bdff0 Really get rid of unused options.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83892 13f79535-47bb-0310-9956-ffa450edef68
1999-09-11 19:52:27 +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
Ralf S. Engelschall
895541ebc1 Make ``configure --with-option=devel'' under
GCC 2.95.1 happy by avoiding various warnings...


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83836 13f79535-47bb-0310-9956-ffa450edef68
1999-08-28 12:22:10 +00:00
Bill Stoddard
cb7f073d26 A bunch of changes to get the server compiling on WIN32. mod_cgi, mod_include,
mod_isapi and mod_so don't work so I am not making them. Moved a lot of code out
of multithread.*  and into os.* (didn't want to add multithread to the new repository).
Much of this can be cleaned up when APR is stable.

And Dean's gonna but me for sure for the http_main hit. It's may be
possible to name a DLL entry point 'main()'. Just havent tried it yet.

Enjoy!


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83822 13f79535-47bb-0310-9956-ffa450edef68
1999-08-27 22:57:27 +00:00
Roy T. Fielding
bab4dcb050 Rearchitect the mess in http_main.c, http_core.c and buff.c.
Basic restructuring to introduce the MPM concept; includes various
changes to the module API... better described by docs/initial_blurb.txt.

Created multiple process model (MPM) concept by ripping out the process
guts from http_main.c and http_core.c and moving them to separate files
under src/modules/mpm/

Moved socket creation stuff to listen.c.
Moved connection open, maintenance and close to http_connection.c.

I/O layering and BUFF revamp.  Much of buff.c moved to ap_iol,
iol_socket, and iol_file.  See docs/buff.txt.

Moved user and auth fields from connection_rec to request_rec.
Removed RLIMIT stuff, supposedly to be implemented later in mod_cgi.
Disabled suexec, supposedly to be reimplemented later.

Submitted by:	Dean Gaudet


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83763 13f79535-47bb-0310-9956-ffa450edef68
1999-08-26 10:45:57 +00:00
Roy T. Fielding
6f96ad5227 Apache 1.3.9 baseline for the Apache 2.0 repository.
Obtained from: Apache 1.3.9 (minus unused files), tag APACHE_1_3_9
Submitted by: Apache Group


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@83750 13f79535-47bb-0310-9956-ffa450edef68
1999-08-24 06:46:03 +00:00