f5b782f5b8
Use ap_canonical_error() where appropriate.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@85000 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 15:20:33 +00:00
cf313109f0
OS/2: Clean up spmt_os2 mpm to get shutdowns working cleanly.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84999 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 14:56:36 +00:00
cc6e027c47
[EBCDIC] Port Paul Gilmartin's CRLF patch from 1.3. This replaces most
...
of the \015, \012, and \015\012 constants with macros.
Submitted by: Greg Ames
Reviewed by: Jeff Trawick
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84998 13f79535-47bb-0310-9956-ffa450edef68
2000-04-20 14:36:01 +00:00
acec159ebf
Win32: More winnt MPM cleanup. Moved code to queue acceptex completion
...
contexts to after the worker thread pool is created. Sometime over that
last month or so, we checked something in that tanked performance about 15%.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84997 13f79535-47bb-0310-9956-ffa450edef68
2000-04-19 22:35:45 +00:00
b026efefaf
Win32: Change message type to INFO
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84989 13f79535-47bb-0310-9956-ffa450edef68
2000-04-18 13:20:37 +00:00
5f10349437
Watching for tornadoes tonite
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84988 13f79535-47bb-0310-9956-ffa450edef68
2000-04-18 03:37:20 +00:00
04effbc31b
Begin some long overdue clean-up fo winnt.c
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84987 13f79535-47bb-0310-9956-ffa450edef68
2000-04-18 03:21:23 +00:00
860eb11705
Add a pool to dupfile. There is no reason that when we duplicate a file, we would want to use the same pool for the duplicated file as we used for
...
the original file. This should solve a problem we were having with
dieing quietly on startup, because we are no longer closing stderr in the
original process and then opening the config file as file descriptor 2.
The original problem report can be found in the message
<20000311232812.A1066@sanguine.linuxcare.com.au >
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84985 13f79535-47bb-0310-9956-ffa450edef68
2000-04-17 19:57:30 +00:00
a27e83a881
Add back in logic to put the ending container directive in the tree. This
...
needs to be there until we have a validating tree. Without this, it is
possible for a config file to read:
<Ifmodule mod_foo.c>
some directive
</Limit>
and still be read correctly. When the tree building functions can validate
for us, this should be removed, and there is a comment that says so.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84979 13f79535-47bb-0310-9956-ffa450edef68
2000-04-16 23:28:52 +00:00
a572f9206b
Win32:
...
1. Move the space stripping of physical service names
fix up from Apache 1.3.
2. #include'ing "ap_mpm.h" fixes up an unresolved symbol.
3. Add dependency checking to the CreateService call to ensure TCPIP and
AFP (winsock) is started before Apache.
Submitted by: William Rowe
Reviewed by: Bill Stoddard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84973 13f79535-47bb-0310-9956-ffa450edef68
2000-04-15 17:48:16 +00:00
369722dc56
cleaned up a comment
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84971 13f79535-47bb-0310-9956-ffa450edef68
2000-04-15 01:16:44 +00:00
442861a840
Somebody needs to check the labels on their medicine.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84970 13f79535-47bb-0310-9956-ffa450edef68
2000-04-15 01:09:32 +00:00
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
0aa29af58e
Win32: Protect another chunk of code unique to Windows NT with an
...
ap_oslevel check.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84964 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 16:48:45 +00:00
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
59864841f2
more namespace cleanup
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84961 13f79535-47bb-0310-9956-ffa450edef68
2000-04-14 02:39:08 +00:00
07fa5ccd17
Get lingering_close() working again.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84951 13f79535-47bb-0310-9956-ffa450edef68
2000-04-13 00:37:55 +00:00
6b4f8cc572
Fix a small bug in ap_add_node. We need to set the child's parent pointer
...
correctly.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84950 13f79535-47bb-0310-9956-ffa450edef68
2000-04-12 23:17:51 +00:00
ad33e9ead2
First step to getting configuration modules working. This step creates
...
a tree, but does not use the tree for anything.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84949 13f79535-47bb-0310-9956-ffa450edef68
2000-04-12 21:57:48 +00:00
db9d037c36
Make the server work without asking for buffered file I/O. This removes
...
all APR_BUFFERED flags from the server, and it fixes a minor bug in the
ungetchar patch (I forgot a file when comitting).
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84933 13f79535-47bb-0310-9956-ffa450edef68
2000-04-06 23:53:59 +00:00
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
d6fa489cff
In mpmt_pthread.c, include <netinet/tcp.h> only if
...
the system actually has it.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84930 13f79535-47bb-0310-9956-ffa450edef68
2000-04-06 02:00:52 +00:00
006237b7c3
Start to clean up winnt.c a bit. Consolidate several calls to
...
CreateIoComplationPort into one and isolate it from the Win95/98
code path. Still much to do...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84929 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 21:37:59 +00:00
4360cc7435
Get mod_rewrite building and running, and mod_status building for Win NT
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84928 13f79535-47bb-0310-9956-ffa450edef68
2000-04-05 21:01:07 +00:00
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
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
dfde7669c3
Tidy up the beos mpm files.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84900 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 21:36:28 +00:00
1d5997a5a6
Eliminate a warning related to the struct socket_t vs ap_socket_t change.
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84899 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 21:11:55 +00:00
0b0be5337c
Eliminate apr_win.h and apr_winconfig.h (and the ugly #ifdefs they cause).
...
Now, apr.h and apr_config.h are generated from apr.hw and apr_config.hw
at build time. At this point, the server will not compile on Windows because
of the recent DSO commits. Fixing those next.
Submitted by: Bill Rowe & Bill Stoddard
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84896 13f79535-47bb-0310-9956-ffa450edef68
2000-04-03 18:40:44 +00:00
aa4e2578a1
And then there was 2.0a3-dev, and Ryan said "Doh!"
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84888 13f79535-47bb-0310-9956-ffa450edef68
2000-04-01 01:14:23 +00:00
ff544b0605
Update the version name in the tree for 2.0a2
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84883 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 19:52:18 +00:00
1be5367573
Update to Apache Software License version 1.1
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84880 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 09:17:18 +00:00
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
057b29f829
Update to Apache Software License version 1.1
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84878 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 08:44:21 +00:00
88479e5ce3
Update to Apache Software License version 1.1
...
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84876 13f79535-47bb-0310-9956-ffa450edef68
2000-03-31 07:02:32 +00:00
b17ff9b586
An initial implementation for the mpmt_pthread mod_status API. Again,
...
this is a working implementation, but it is almost definately not a
complete implementation.
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84869 13f79535-47bb-0310-9956-ffa450edef68
2000-03-30 22:16:37 +00:00
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
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
