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.
Nasty backwards compatibility breaking 'fix' to get rid of
ErrorDocument 201 "Some string without a closing quote
case which is just pure ugly. I am _NOT_ going to be offended
if anyone rolls back this patch OR if anyone suggests to have
an ErrorDocument2 which the proper syntax/semantics.
But I thought lets take my chance whilst everyone is still
recovering from the apachecon.
Take my chance and try to sneak in a very nasty change which
will break some backward compatibility but get rid of half a
dozen nasty if-then special cases in any config file parser
or gui. I am _NOT_ going to be offended if anyone rolls this
patch back; or hack's it with a RAW_ARG as to also take the
old config as well.
Just make 'buildconf' run on BSD (there is a space after the hash-bang) and
added bogus INSTALL file plus some blurp in readme.mpm to point out that
you really need libtool and autoconf (which need m4).
On some platform's I found that I really HAD to use 'gmake' as the normal
make would not grok it. So I am wondering if adding something like
# Work out a correct 'make'. The issue is that we should use
# 'gmake' which is called 'make' on some platforms, and 'gmake'
# on some others.
#
GUESS=${MAKE:-make}
if `(${GUESS} -v | grep "GNU Make") > /dev/null 2>&1 `; then
# Looks like gmake.
else
GUESS=gmake
if `${GUESS} -v | grep "GNU Make" > /dev/null 2>&1`; then
echo Warning: Using 'gmake' instead of 'make'.
else
echo No 'gmake' found. Please set the MAKE environment
echo variable first.
exit 1
fi
fi
MAKE=${GUESS}
export MAKE
to 'buildconf' would be appropriate to detect this ??
Ryan Bloom [Wed, 8 Mar 2000 21:36:39 +0000 (21:36 +0000)]
This is all we have said we need for an alpha release. The rest of the
showstoppers are only showstoppers for an actual release. I'm working
hard to get the alpha out this week now.
Part of a fix for not being able to reset the --prefix. This will
allow the installation prefix to be reset after a "make clean". To do
this really properly, all the code that depends on the prefix should
have a dependency in the makefile. This is coming RSN.
Brian Havard [Fri, 3 Mar 2000 14:41:00 +0000 (14:41 +0000)]
"libtool" gets generated to the current directory and gets picked up by
PrintPath on subsequent buildconf's so look for libtoolize instead to find the
libtool source directory.
Ryan Bloom [Wed, 1 Mar 2000 16:21:21 +0000 (16:21 +0000)]
Add a test program for pipes. Add support for non-buffered CGI's to mod_cgi.
This still doesn't terminate CGI's after a time limit, that's the next step.
Ken Coar [Mon, 28 Feb 2000 13:42:23 +0000 (13:42 +0000)]
Some Apache users are nervous about the version number (e.g.,
"Apache/1.3.11") in the Server: version string -- so add a
new ServerTokens keyword that displays just the product name
with no version (i.e., "Apache").
Bill Stoddard [Wed, 23 Feb 2000 15:37:37 +0000 (15:37 +0000)]
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>
Bill Stoddard [Mon, 21 Feb 2000 16:41:41 +0000 (16:41 +0000)]
Make file I/O and network I/O writev/sendv APIs consistent.
Eliminate use of ap_iovec_t and use Posix struct iovec. I never
did hear a case (much less a strong case) supporting the need
for ap_iovec_t, so out it goes.
Documentation fixes do not harm anyone, so I feel free to commit this
English cleanup to the mod_rewrite documentation although we're in code
freeze state. But we should now really kick out the 1.3.12 baby. We're
already behind the proposed dates...
Submitted by: G.W. Haywood <ged@jubileegroup.co.uk>
Reviewed by: Ralf S. Engelschall
Bill Stoddard [Fri, 18 Feb 2000 02:53:12 +0000 (02:53 +0000)]
Have seperate variable on ap_writev to set the number of iovecs passed in
and pass back the number of bytes written. Use ap_iovec_t on the call rather
than struct iovec (I may reverse this tomorrow :-). Whatever we do, the network_io
and file_io calls need to use iovecs consistently, which isn't the case now.
Bill Stoddard [Thu, 17 Feb 2000 19:03:52 +0000 (19:03 +0000)]
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)
Bill Stoddard [Wed, 16 Feb 2000 21:21:51 +0000 (21:21 +0000)]
Make sure mod_mime always has a chance to run before mod_mime_magic.
Submitted by: Paul Reder <rederpj@raleigh.ibm.com>
Reviewed by: Bill Stoddard <stoddard@raleigh.ibm.com>
Ryan Bloom [Wed, 16 Feb 2000 00:55:51 +0000 (00:55 +0000)]
Fix the make clean rules. We must delete *.slo files or we are leaving stale
libraries in the modules/standard directory when configured for dynamic
modules.
Bill Stoddard [Tue, 15 Feb 2000 22:51:23 +0000 (22:51 +0000)]
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.
Bill Stoddard [Tue, 15 Feb 2000 21:20:39 +0000 (21:20 +0000)]
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.
Bill Stoddard [Tue, 15 Feb 2000 00:54:06 +0000 (00:54 +0000)]
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.
Bill Stoddard [Mon, 14 Feb 2000 22:01:08 +0000 (22:01 +0000)]
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.
Make sure we don't receive another PR where a user tried to take the
solutions exactly as written down without noticing that they usually
always have to be adjusted for local contexts.
Ryan Bloom [Wed, 9 Feb 2000 01:33:24 +0000 (01:33 +0000)]
Fix prefix handling. Before this patch, when using --prefix on the
configure line, the binary ignored it when setting HTTPD_ROOT. This
patch fixes that problem.
David Reid [Mon, 7 Feb 2000 12:05:22 +0000 (12:05 +0000)]
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.
Jim Jagielski [Sat, 5 Feb 2000 00:33:18 +0000 (00:33 +0000)]
Try to reduce confusion over multiple and possible "conflicting"
versions of the term "default" by changing AddDefaultCharset to
be of the mode Off | On | charset
PR:
Obtained from:
Submitted by:
Reviewed by:
Ryan Bloom [Thu, 3 Feb 2000 19:38:08 +0000 (19:38 +0000)]
APR requires that ap_initialize is called as one of the first functions.
It sets up the rest of the APR types. This was causing lockups whenever
we tried to us an APR lock.
Jim Jagielski [Thu, 3 Feb 2000 14:22:26 +0000 (14:22 +0000)]
Streamline the AddDefaultCharset directive. Now this one directive
controls the entire 'charset' specification setup. If there is
heartburn, I have no trouble with backing this out, but it makes
live easier for those not using the "default" charset, and reduces
directive bloat a bit :)
PR:
Obtained from:
Submitted by:
Reviewed by: Martin
projects / apache / log