69ad445e8b
Fix the warnings associated with the pre_config patch.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84864 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 18:39:46 +00:00
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
3d43419b03
Tweaked APR initialization and termination so that the lifetime
...
of memory management mutexes is longer than the lifetime of
managed memory. APR apps must now call ap_terminate().
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84846 13f79535-47bb-0310-9956-ffa450edef68
2000-03-28 22:59:05 +00:00
7205dc823f
Remove the last piece of the layered I/O code. I don't know why this didn't
...
get removed with the rest of it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84845 13f79535-47bb-0310-9956-ffa450edef68
2000-03-28 18:36:34 +00:00
6a4d775449
Enabled layered I/O. Docs are forthcoming.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84837 13f79535-47bb-0310-9956-ffa450edef68
2000-03-25 15:00:10 +00:00
6805222021
Do a bit of Win32 specific garbage collecting. Most of os.h (of not all
...
of it) should go away eventually, merged into APR. Seems useful to delete
the obvious garbage first.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84832 13f79535-47bb-0310-9956-ffa450edef68
2000-03-24 05:03:22 +00:00
ba62a0e0a9
Eliminate os.c and ApacheOS.dsp, ApacheOS.mak, et. al. Update the winnt
...
MPM to use native thread control calls rather than the deprecated stuff
in os.c. Even though I don't use APR in the MPM yet, this is forward
progress.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84831 13f79535-47bb-0310-9956-ffa450edef68
2000-03-24 04:45:27 +00:00
789a32d2f1
Clear hook registrations between reads of the config file.
...
When DSOs are unloaded and re-loaded the old hook pointers may
no longer be valid. This fix eliminates potential segfaults.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84828 13f79535-47bb-0310-9956-ffa450edef68
2000-03-23 14:48:45 +00:00
914b0b7077
axe some deprecated MULTITHREAD code
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84825 13f79535-47bb-0310-9956-ffa450edef68
2000-03-22 11:36:52 +00:00
5d99c6e043
change the error message logged for a bind() failure so that
...
it shows the interface and port number; it is now very similar
to the error message used in 1.3
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84823 13f79535-47bb-0310-9956-ffa450edef68
2000-03-22 10:37:28 +00:00
b2af7ce137
axe code to print "-D MULTITHREAD" for apache -V; MULTITHREAD
...
is a 1.3 hangover;
exit with a log message if ap_create_context() fails when
creating the initial context; otherwise, we SIGSEGV later
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84822 13f79535-47bb-0310-9956-ffa450edef68
2000-03-22 10:26:44 +00:00
0183bf2c02
Helps if you have the include files correct!
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84812 13f79535-47bb-0310-9956-ffa450edef68
2000-03-21 14:13:16 +00:00
4df995a57c
Update the BeOS mpm to use ap_lock_t's. First of a few changes to come.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84811 13f79535-47bb-0310-9956-ffa450edef68
2000-03-21 10:52:45 +00:00
797eb4b036
Bring forward my recent 1.3 patches.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84802 13f79535-47bb-0310-9956-ffa450edef68
2000-03-20 02:42:20 +00:00
247292fbd0
Ignore generated files.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84796 13f79535-47bb-0310-9956-ffa450edef68
2000-03-19 13:52:16 +00:00
ebcf9fddd8
Add missing pool parameter.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84790 13f79535-47bb-0310-9956-ffa450edef68
2000-03-18 10:38:45 +00:00
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
ad3cb55128
Eliminate implicit usage of access.conf and srm.conf.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84771 13f79535-47bb-0310-9956-ffa450edef68
2000-03-15 23:18:32 +00:00
ee839f0042
Minor nit: use top_srcdir instead of topsrcdir, to be more consistent
...
with autoconf.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84770 13f79535-47bb-0310-9956-ffa450edef68
2000-03-15 22:46:33 +00:00
f982c85388
This gets the server working again after Ryan's order change for
...
ap_getopt.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84768 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 22:06:47 +00:00
99a9d6e3e0
Another one in the department of fairly useless patches which
...
are best described as feature creep. Allows ${ENV} constructs
in the config file. This avoids the need for mod_perl or
m4 cleverness whilst mainting some of the usefullness. It
does not do (of course) multiline things or anything that clever.
Feel free to flame me.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84765 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 14:09:52 +00:00
a5b741fa27
even more distclean goodness (there's still more... time for zzz though)
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84762 13f79535-47bb-0310-9956-ffa450edef68
2000-03-14 08:04:50 +00:00
70ef1e69d5
Backport the CSS security fixes to Apache 2.0a. Or is that forward
...
port? My sense of direction is all confused.
PR:
Obtained from:
Submitted by:
Reviewed by:
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84751 13f79535-47bb-0310-9956-ffa450edef68
2000-03-13 20:27:29 +00:00
28b878572c
Update the version string to reflect that we are currently working on
...
Apache/2.0a2-dev.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84750 13f79535-47bb-0310-9956-ffa450edef68
2000-03-13 18:53:22 +00:00
09223ab290
This fixes a bug on a development version of BeOS. Not sure why but
...
when this is called it closes the original socket, not the accepted
one.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84740 13f79535-47bb-0310-9956-ffa450edef68
2000-03-11 15:43:27 +00:00
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
e1802b36e6
Fix include file order.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84705 13f79535-47bb-0310-9956-ffa450edef68
2000-03-03 14:24:40 +00:00
2d76464c8e
Default to spmt_os2 on OS/2
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84704 13f79535-47bb-0310-9956-ffa450edef68
2000-03-03 14:21:12 +00:00
a5e0a28b79
Look for crypt() in ufc.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84703 13f79535-47bb-0310-9956-ffa450edef68
2000-03-03 14:19:26 +00:00
1a47df7dd3
Fix the logic for ap_signal, so it is exposed in external header files in APR.
...
Also change the header file included in http_log.c.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84700 13f79535-47bb-0310-9956-ffa450edef68
2000-03-02 20:36:46 +00:00
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
09b79af890
.cvsignore goodness
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84695 13f79535-47bb-0310-9956-ffa450edef68
2000-03-02 08:26:23 +00:00
69f23ae4f0
Remove second ap_initialize left over from previous patch.
...
Submitted by: Jeff Trawick
Reviewed by: Ryan Bloom
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84677 13f79535-47bb-0310-9956-ffa450edef68
2000-02-28 03:13:47 +00:00
151d004b7d
2.0 builds, but dumps core on FreeBSD 3.3 (ap_lock).
...
Basically, ap_initialize() needs to get called before create_process(),
since create_process() passes op_on structure to semop() to get a lock, but
op_on isn't initialized until ap_initialize() calls setup_lock(). Here is
a slight rearrangement to main() which calls ap_initialize() earlier...
Submitted by: Jeff Trawick <trawick@us.ibm.com >
Reviewed by: Bill Stoddard <stoddard@us.ibm.com >
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84661 13f79535-47bb-0310-9956-ffa450edef68
2000-02-23 15:37:37 +00:00
daa015381e
Sort hooks after dynamically loaded modules have registered.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84658 13f79535-47bb-0310-9956-ffa450edef68
2000-02-22 16:02:29 +00:00
2a1ed8bb9f
Ahh, found ap_flush()!
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84643 13f79535-47bb-0310-9956-ffa450edef68
2000-02-18 14:18:11 +00:00
7e977c5c9e
Update Windows ap_filedup() call to recognise when it is asked to dup2
...
a standard i/o handle. Return error if the dup2 handle is not one of the
standard i/o handles (because Windows does not support a dup2 style function
to operate on native file handles)
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84638 13f79535-47bb-0310-9956-ffa450edef68
2000-02-17 19:03:52 +00:00
05723f4bbc
Logs have already been opened by http_main.c. Don't need to do it here again.
...
--------------------------------------------------------
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84627 13f79535-47bb-0310-9956-ffa450edef68
2000-02-16 16:30:36 +00:00
bdad3347fb
ap_dupfile (specifically dup2) is not available in a general form under Windows.
...
So use SetStdHandle directly. A single call to ap_dup2stderr() (or similar) could
replace the entire chunk of code in the #ifdef #else #endif block. Ryan didn't
want to put this speciality function into APR, but we could put it into os.c
if folks are interested.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84624 13f79535-47bb-0310-9956-ffa450edef68
2000-02-15 22:51:23 +00:00
4da04aa7ad
Don't close the duplicated AcceptEx completion port handle in the parent.
...
Check the return code when duplicating the acceptex completion port.
Get rid of the event routine wrappers.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84623 13f79535-47bb-0310-9956-ffa450edef68
2000-02-15 21:20:39 +00:00
b99c3eec37
First step to get piped logs working on Windows (and Unix as well).
...
There are still all kinds of problems in http_log.c. This patch just
barely scratches the surface.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84622 13f79535-47bb-0310-9956-ffa450edef68
2000-02-15 00:54:06 +00:00
4791cb1bf7
Port the scoreboard from the mpmt_pthread MPM to use APR's shared memory.
...
Tested on Linux, but it could use testing on other platforms.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84621 13f79535-47bb-0310-9956-ffa450edef68
2000-02-14 22:20:34 +00:00
aab3db57fd
Rework the code to handle apache -k shutdown|restart. The fundamental problem
...
being solved here is determining the best way to discover the Apache
parent process PID (stored in the location specified by the PidFile directive).
This patch attempts to read the config file directly to determine the
pidfile and avoids going through the motions of calling all the module initialization
routines.
This patch will not work if the pidfile directive is in a file pointed to by
an include directive. Not sure is this is a common case or not on Windows.
If it is, it is easy enough to add a bit more code to follow include
directives. An interesting modification would be to detect the presence of a \
-C directive containing a pointer to the pidfile: E.g.,
apache -k restart -C "pidfile d:/mypidfile". Let's keep it simple for now and
see what happens.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84620 13f79535-47bb-0310-9956-ffa450edef68
2000-02-14 22:01:08 +00:00
20b80ac4d2
Enable Windows MPM to run in single process mode
...
Submitted by: Allan Edwards
Reviewed by: Bill Stoddard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84619 13f79535-47bb-0310-9956-ffa450edef68
2000-02-14 14:28:16 +00:00
d33f994daf
Fix compile breaks on Windows. Projects need to know where to find os.h.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84612 13f79535-47bb-0310-9956-ffa450edef68
2000-02-11 18:52:30 +00:00
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
4c589013b9
Small changes to remove some compiler complaints.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84598 13f79535-47bb-0310-9956-ffa450edef68
2000-02-10 13:24:13 +00:00
fd1b6ab48a
Fix some bugs with running Apache as a service
...
Submitted by: Allan Edwards <ake@raleigh.ibm.com >
Reviewed by: Bill Stoddard <stoddard@raleigh.ibm.com >
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84596 13f79535-47bb-0310-9956-ffa450edef68
2000-02-09 22:16:17 +00:00
97474d1a84
These changes allow the MPM to be selected based on platform. At present it
...
works for BeOS but adding others shouldn't be hard. Also added the OS2
MPM to the list.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84589 13f79535-47bb-0310-9956-ffa450edef68
2000-02-07 12:05:22 +00:00
da9a9695d2
These changes allow BeOS to use the new buildconf configuration.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84588 13f79535-47bb-0310-9956-ffa450edef68
2000-02-07 12:02:59 +00:00
