Add APR_EOL_STR for a platform specific text delimiter, provided by
apr.h (defined in apr.h.in and apr.hw). This is needed -only- in APR
created files (true raw files) such as logs. It is not required in any
splat to screen (stderr/stdout) formatting, nor any html markup.
Some other modules slipped through in the prior apr_strings.h commit.
Sorry 'bout that.
Changes to get Win32 compiling again, including substituting
apr_string.h for apr_lib.h, fix some bad linkage declarations,
and some more comments on threadproc/win32/proc.c
Ryan Bloom [Mon, 24 Jul 2000 20:48:24 +0000 (20:48 +0000)]
Fix some issues with mod_mime_magic. Basically, we need to include
apr_strings.h, the command table needed to be fixed to use the new
format, and we had vestiges of stat left around.
The top two issues are simple, we include apr_strings and fix the command
recs.
The last issue required using APR enums instead of the stat.h macros. This
also allows us to remove some ugly #ifdefs. :-)
Submitted by: Shaun Savage <shaun@igel.de>
Reviewed by: Ryan Bloom
Clean up rules.mk and add support for building C++ source files.
If your module uses C++, you need to add APACHE_REQUIRE_CXX to your
module's config.m4.
Unfortunately, we cannot use any sophisticated pattern matching in make,
so instead of adding the C++ source files to LTLIBRARY_SOURCES, you need
to write for foo.cpp and bar.cpp:
Ryan Bloom [Sun, 23 Jul 2000 17:31:08 +0000 (17:31 +0000)]
Remove apr_strnatcmp.h. All of the functions prototyped in this file
have been moved to apr_strings.h. This also modifes Apache to include
apr_strings.h instead of apr_strnatcmp.h
Ryan Bloom [Fri, 21 Jul 2000 19:50:58 +0000 (19:50 +0000)]
Move all APR functions related to strings to their own directory, and
create a new header for those functions. This is the first step to
removing the apr/lib directory completely, and moving those files/functions
to descriptive directories.
Ryan Bloom [Thu, 20 Jul 2000 21:31:19 +0000 (21:31 +0000)]
Remove a filtering patch from the STATUS file. This was the second patch
I posted, and it was more or less a proof-of-concept for changing the
filter registration method. Everybody agrees the patch was a bad idea, but
it did prove that the filtering registration code could be completely
re-written in very little time.
Jeff Trawick [Wed, 19 Jul 2000 17:42:56 +0000 (17:42 +0000)]
Make ap_child_init_lock() work properly... It didn't
call ap_unix_child_init_lock() at the right time, so any
lock mechanism which had interesting work to do (only flock())
was broken.
Fix the flock() flavor of ap_unix_child_init_lock(). It expected
to create the lock file when it should in fact open the existing
one. It also neglected to return the new ap_lock_t structure to
the caller.
Improve logging of lock init errors in prefork (I know, prefork is
a lame duck, but I used the improved logging in prefork to help
debug the problem).
add ap_full_read() and ap_full_write(). they guarantee to read/write the
full buffer unless an error occurs.
use the new functions in SDBM and DAV. [and Subversion]
Win32 and OS/2 can directly include/use file_io/unix/fullrw.c since it is
written in terms of other APR functions.
ap_dso_init() isn't needed. if/when a platform needs it, then
ap_initialize() can be used to init DSO support. or set up a lazy
initialization for it.
solves the questions, "when do I call it? can I call it more than once?"
Submitted by: Ben Collins-Sussman <sussman@red-bean.com>
Replace this unknown hash function someone contributed with the classical DJB
times 33 hash (using XOR instead of ADD). This hash is better understood and
is faster. Also because in the old function the "& 0xff" was not necessary and
just slowed down processing.
Brian Havard [Fri, 14 Jul 2000 14:45:33 +0000 (14:45 +0000)]
Get smpt_os2 working again after recent reorganization.
- globalize & namespace protects server_conf as ap_server_conf
- puts setup_listeners back in under a more appropriate name
(setup_listen_poll()) as it's quite different to ap_setup_listeners in
mpm_common.c.
- fake a suitable parameter to ap_process_child_status() as it assumes a child
refers to a process when, in the context of spmt_os2, it's a thread.
Bill Stoddard [Wed, 12 Jul 2000 18:40:26 +0000 (18:40 +0000)]
Fix a nasty stack corruption. ap_proc_t should be allocated out of the same
pool passed to ap_create_process. A little further down the road to getting
reliable piped logs working on Win32.
Ryan Bloom [Tue, 11 Jul 2000 19:00:16 +0000 (19:00 +0000)]
Remove all pthreads calls from the mpmt MPM prefork emulation. This makes
the mpmt MPM look almost exactly like the original prefork MPM. Basically,
all that's left is re-naming the defined directives so they work with 1.3
config files. That will come later.
make sure this is defined, so that mpm_common.c compiles with the right
values, functions, whatever. specifically, ap_reclaim_child_processes()
was not getting compiled into mpm_common.
this appears to keep mpmt_pthread running properly. dunno whether a similar
issue exists for prefork or dexter. (until all are torched)
Advisory: This patch is still anywhere but complete. However, it
resolves most of the big bugs of the services to mpm relocation.
I apologize that it's taken this long to get back on this.
Brought across; Keep console open (needs a bit of cleanup and could
be done better now for 2.0), service error event logging, and some
other minor threading cleanup.
Big issues remain: logged errors (even APLOG_STARTUP) drop into the
logfile in spite of our interest in getting them to the user's console.
Some threading sequences may yet be out of sorts, and those will be
cleaned up by the end of the week.
Bill Stoddard [Mon, 10 Jul 2000 21:49:22 +0000 (21:49 +0000)]
Reimplement ap_send_fd. Eliminate ap_send_fd_length. If APR_HAS_SENDFILE is
defined but ap_sendfile fails with APR_ENOTIMPL, the BUFF implementation
of ap_send_fd will get a shot at serving the request. This fix is
required to get Apache working on 95/98 again and can also be useful on
Unix systems where sendfile is available via a servicepack/fixpack/PTF
on a particular level of the OS (e.g., AIX 4.3.2 base does not include
sendfile but is is available with a PTF).
This fix also reimplements the mod_file_cache sendfile_handler using
ap_send_fd and sets the connection aborted flag if the sendfile fails.
Future modification... Add code to ap_send_fd to hijack any data in the
client BUFF structure and send it along with the sendfile.
Ryan Bloom [Mon, 10 Jul 2000 21:37:23 +0000 (21:37 +0000)]
Move setup_listeners to listen.c. This renames it to ap_setup_listeners,
and removes the duplicated code from all effected MPMs. The only this
doesn't touch, is Windows. That MPM was using a different setup_listeners.
If one of the Windows guys would like to modify the WinNT MPM to use the
same setup_lsiteners, that would be VERY cool.
Ryan Bloom [Mon, 10 Jul 2000 18:21:24 +0000 (18:21 +0000)]
Move process_child_status to mpm_common.c. This requires re-naming it
to ap_process_child_status and opening up ap_coredump_dir. I have
modified all of the MPMs that I saw using this function to work with this
patch. Sorry if I broke anybody.
Ryan Bloom [Mon, 10 Jul 2000 15:07:40 +0000 (15:07 +0000)]
Stop doing the find for make clean. This was causing us to clean every
directory twice. We should still clean those directories that weren't
configured in the current configuration, but this wasn't the right
solution.
complete the removal of the old dav_dyn crap. dav plugins are now
implemented entirely through standard Apache modules, hooks, and some
additional registration.
new liveprop namespace registration and lookup. modules register each
namespace they will use, which then receives a process-wide index.
get rid of old dav_liveprop_uris global (and minor cleaning in dav_dyn);
encapsulate liveprop handling in liveprop.c.
do not build/use an ns_map; use dav_get_liveprop_ns_index().
Ryan Bloom [Sun, 9 Jul 2000 23:12:44 +0000 (23:12 +0000)]
Fix mpm_common for use with the real prefork MPM. This was broken when
mpmt was added. This change can be removed when the MPM stuff calms down
a bit and either mpmt or three separate MPMs are chosen.
Ryan Bloom [Sun, 9 Jul 2000 18:54:08 +0000 (18:54 +0000)]
Fix building the mpmt MPM. The problem was that IfModule uses the name of
the C file to determine if a module is present. mpmt emulates three
different MPMs though. If the default config file we have sane defaults
for each of the three MPMs that mpmt emulates.
To fix this, the build process creates a soft link to the original MPM name
during the configure process, and the build process actually compiles that
file, instead of the original mpmt.c. This allow the mpmt MPM to work
just as well as mpmt_pthread.
Ryan Bloom [Fri, 7 Jul 2000 17:35:41 +0000 (17:35 +0000)]
Initial version of the mpmt MPM. This MPM can emulate dexter, mpmt_pthread,
and prefork. This basically just combines a lot of common code. This
builds and serves pages in all three modes, but I don't think killing
the server works in any of them. The configuration system hasn't changed
at all, so using --with-mpm=(prefork|dexter|mpmt_pthread) all work.
My goal is to remove the three separate MPMs in a few days, and then work
on merging one of the BeOS and the OS/2 MPMs into this as well. :-)
do the "get resource" via a hook rather than through the repository hook
structure. once the resource is retrieved, then we have the relevant
repository hooks and can dispatch through those.
some additional tweaks to use lockdb->hooks rather than fetching them
Bill Stoddard [Fri, 7 Jul 2000 02:39:00 +0000 (02:39 +0000)]
This patch fixes several problems with mod_file_cache
- Pool usage problem
- SIGSEGVs when both MMapFile and CacheFile directives are present. The fix combines
the cleanup routines and only cleans up resources when appropriate.
- Log sendfile errors.
Submitted by: Greg Ames
Reviewed by: Bill Stoddard
Jeff Trawick [Thu, 6 Jul 2000 21:25:19 +0000 (21:25 +0000)]
Fix the way that ap_rwrite() checks for an error from ap_bwrite().
A dropped connection could cause a loop in ap_send_mmap() (and probably
a few other places) because of this problem.
Bill Stoddard [Thu, 6 Jul 2000 17:48:41 +0000 (17:48 +0000)]
Temporarily disable lingerling close until I can get the sendfile path right.
This avoids a seg fault when we try to shutdown then close a socket that has
been reset by the client.
Ryan Bloom [Thu, 6 Jul 2000 00:09:48 +0000 (00:09 +0000)]
Fix make distclean and make clean. Before this commit, we only cleaned
directories that have been configured by the last call to ./configure.
This means that if somebody does ./configure --with-mpm=dexter;make and
then ./configure --with-mpm=prefork;make and then make distclean, dexter
doesn't get cleaned up. Same thing goes for clean.
All this does is with distclean and clean, after we have recursively
gone through the tree to clean everything, we do a quick find to get all
of the left-over Makefiles. Then we just do the same operation on those
directories.
Bill Stoddard [Wed, 5 Jul 2000 19:40:39 +0000 (19:40 +0000)]
Allocate iols out of the ptrans pool rather than mallocing them out
of the heap. The extra malloc/free is a significant performance
hit on some platforms and repeatedly alloc/freeing small chunks of storage
can fragment the heap.
Jeff Trawick [Wed, 5 Jul 2000 18:52:57 +0000 (18:52 +0000)]
Get rid of some warnings in mod_file_cache by moving to the
new command-handler initialization macros.
Submitted by: Greg Ames
Reviewed by: Jeff Trawick
Jeff Trawick [Wed, 5 Jul 2000 18:44:37 +0000 (18:44 +0000)]
struct a_file needs field mm to compile at all when
APR_HAS_MMAP is defined
check for APR_HAS_SENDFILE around the declaration of
file; most of the other sendfile logic does this already
Submitted by: Greg Ames
Reviewed by: Jeff Trawick
Ryan Bloom [Wed, 5 Jul 2000 18:01:52 +0000 (18:01 +0000)]
Remove some warnings from the latest compile. I don't know why these
haven't turned up before. We were using the wrong types in our printf
calls for times.
This updates mod_dav for the util_xml changes posted previously:
* dav_xml -> ap_xml, and dav_text -> ap_text renaming
* Add 'dav_elem_private' to hook mod_dav-specific info up to the
parsed XML tree. Initialize this in several places, I think I got
all necessary? [gjs: yes, you did]
* Removal of the old "gross_hack", and all the XML code that was
moved into util_xml
Submitted by: Joe Orton <joe@orton.demon.co.uk>
Reviewed by: Greg Stein
This patch is a first pass at making util_xml.c independent of mod_dav:
* Rename dav_* to ap_xml_* for exported interface
* Remove dav_* from private functions
* Move text_header handling in from dav/main/util.c
* Move XML tree -> text conversion in
* Add include/util_xml.h header from parts of mod_dav.h
Submitted by: Joe Orton <joe@orton.demon.co.uk>
Reviewed by: Greg Stein
re-enable the "move by rename" optimization (now that we have the
ap_finfo_t.device field)
re-enable the "executable" live property (now that we have a chmod()
equivalent in ap_setfileperms())
misc const cleanups and others issues found using maintainer-mode
(initial errors found by Ryan Bloom).
also switch to use new command table initializer macros.