Cleanup effort in prep for GA push: Trim trailing whitespace... no func change

- Introduce concept of context prefix (which is an URL prefix) and context document root (which is the file system directory that this URL prefix is mapped to). This generalization of the document root makes it easier for scripts to create self-referential URLs and to find their files. - Expose CONTEXT_DOCUMENT_ROOT and CONTEXT_PREFIX as envvars, in mod_rewrite, and in ap_expr. - Make mod_alias and mod_userdir set the context information. - Allow to override the document root on a per-request basis. This allows mass vhosting modules to set DOCUMENT_ROOT correctly. - Make mod_vhost_alias set the per-request document root PR: 26052, 46198, 49705 Remaining tasks: - Use the context document root & prefix in mod_rewrite to make RewriteBase unneccessary in many cases. Do this without breaking compatibility. - Write docs.

readability improvements: rename w -> user, x -> prefix break some very long lines

PR44076: allow "userdir disabled" or "userdir public_html" in global scope to be merged with lists of enabled users in virtual host context as one would expect.

remove some useless use of strlen()

Use the new APLOG_USE_MODULE/AP_DECLARE_MODULE macros everywhere to take advantage of per-module loglevels

Bring back OS/2 support. Reverses r758929 with a little bit of conflict resolution.

remove OS/2 platform support

remove BeOS OS support

update license header text

Update the copyright year in all .c, .h and .xml files

No functional Change: Removing trailing whitespace. This also means that "blank" lines consisting of just spaces or tabs are now really blank lines

* modules/mappers/mod_userdir.c (get_suexec_id_doer): Fix allocation size. PR: 34588

Merged the simple-conf branch changes r159781:160695 into the trunk.

Update copyright year to 2005 and standardize on current copyright owner line.

* modules/mappers/mod_userdir.c (register_hooks): Move suexec_identity hook to APR_HOOK_FIRST to ensure it runs before the mod_suexec hook. PR: 18156 Submitted by: Joshua Slive

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

update license to 2004.

switch to APR 1.0 API (which is still in flux) because of the changes to the argument lists of apr_mmap_dup and apr_socket_create, 2.1-dev won't build with apr and apr-util's 0.9 branch anymore

finished that boring job: update license to 2003. Happy New Year! ;-))

Allow the UserDir directive to accept a list of directories. This matches what Apache 1.3 does. Also add documentation for this feature. PR: 9299 Submitted by: Jay Ball <jay@veggiespam.com>

Fix some hook ordering problems. mod_vhost_alias should, perhaps, be HOOK_LAST. It redefines the document root, so it should only be used if no other mapper wants the request. I haven't made that change here; I've simply put explict ordering to make sure we get mod_alias -> mod_userdir -> mod_vhost_alias I can't compile apache at the moment for other reasons, so this is untested, but it looks right to me. PR: 8853

We must set the MIME-type for .shtml files to text/html if we want them to be parsed for SSI tags. Add the config for that to the default config file so that it is easier to enable .shtml parsing. PR: 9787 Submitted by: Dave Dyer <ddyer@real-me.net>

Fix segfault when x hasn't been initialized and tighten its scope.

Fix http redirecting for UserDir. Before this patch, the directive: UserDir http://www.foo.com/~*/ The code would ignore the http:// and instead use the user's home directory

Reverse the hook ordering for mod_userdir and mod_alias so that Alias/ScriptAlias will override Userdir. PR: 8841 Reviewed by: Justin Erenkrantz

Short-circuit out of mod_userdir's translation handler faster on non "/~*" requests

Fix suexec invocations from userdir - the ~ was not being prepended to the uid per our convention. Therefore, bad things would happen (like we wouldn't cd to the right directory). Add a flag to the ap_unix_identity_t structure to indicate if we are in a userdir - if so, prefix the ~. (Modified by Justin, but Colm's patch pointed me in the right direction.) PR: 7810 Submitted by: Colm <colmmacc@redbrick.dcu.ie> Reviewed by: Justin Erenkrantz

Since UserDir is a raw argument, our config system allows it to be blank. To save us all the hassle, just flat out reject this silliness. We could treat blank as ".", but let the user shoot themselves in the foot explicitly (and don't give them any ideas on how to do it). PR: 8472

Update our copyright for this year.

Need to check if the userdir is absolute before it gets split apart by ap_getword() Also fixed up the !HAVE_DRIVE_LETTERS case (such as NetWare) where the volume delimiter ( colon ) is not in an absolute position.

Fix a handful of AP_MODULE_DECLARE_DATA exports for .so modules.

Added NetWare to a Win32 #ifdef

New ap_os_is_path_absolute() semantics

Fix a seg fault in mod_userdir.c. We used to use the pw structure without ever filling it out. PR: 7271 Submitted by: Taketo Kabe <kabe@sra-tohoku.co.jp> and Cliff Woolley <cliffwoolley@yahoo.com>]

*) Introduce "ap_conf_vector_t" type to assist with legibility and provide some type safety. (unfortunately, our old "void*" is type-safe with the new one, but over time we should be better) *) Propagate the new type to all appropriate functions. *) Random cleaning, whitespace, stylistic nits.

Update copyright to 2001

*) continued header revamping *) torch some headers (and some libs) from the autoconf stuff

renaming various functions for consistency sake see: http://apr.apache.org/~dougm/apr_rename.pl PR: Obtained from: Submitted by: Reviewed by:

Fix the remaining APR_FINFO_NORM occurances. Again, followup is needed to actually test any field outside the scope of APR_FINFO_MIN.

Moved several CHANGES back to APR where they belonged in the first place, Adopt apr features for simplifing mod_userdir, and accept the new Win32/OS2 exceptions without hiccuping Also note a potentially serious flaw - others please review.

The changes required for the APR_FINFO_wanted argument to apr_stat/lstat/getfileinfo. These are -NOT- optimal, they are simply the required changes to get the server working. The size of the patch is a warning about how we need to really look at what we are trying to accomplish with all of these stat/lstat calls.

The big change. This is part 3 of the apr-util symbols rename, please see the first commit of srclib/apr-util/include (cvs apr-util/include) for the quick glance at symbols changed.

Provide apr_pool_t arg to register_hooks, since anything they do in that step -must- be done with a pool that will not outlive the cmd pool, from which they may have been dynamically loaded.

Make handlers use hooks.

add apr_get_home_directory(), teach mod_userdir to use that instead of calling getpwnam[_r] directly, back out mod_userdir's config check for getpwnam_r

Get mod_userdir compiling on FreeBSD when APR_HAS_THREADS. This doesn't account for the fact that getpwnam() isn't thread-safe on FreeBSD; it also doesn't account for systems where getpwnam_r lives outside of libc. See thread with subject "[?PATCH?] using getpwnam_r in mod_userdir" in Nov. 2000 new-httpd for some better long-term ideas for how to handle the problem.

Remove the comments that I accidentally left in from testing. Doh!

Remove a thread un-safe function when APR_HAS_THREADS

Make mod_cgi and mod_include work when compiled as DSO's again. This is accomplished by moving suexec out of it's own file and into unixd.[ch]. The problem was that suexec.c wasn't being linked into the server unless a module was actually using ap_os_create_process. This is still not clean, but it works now.

Fix a breakage due to Maoj's suexec patch of earlier today.

I didn't know that mod_userdir was even used on Windows. Oops. #ifdef out Unix-specific portions for now.

Remove an attempt to fix a race condition. The attempt is not successful, the race condition is not particularly important (people deleting users in the middle of a request), and the attempt introduces more thread-safeness problems. Oh, and I thought I had taken this out already. :)

Add back suexec support.

More docs of oddities.

prefix libapr functions and types with apr_

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.

Include strings.h for strcasecmp(), strncasecmp(), and bzero(). Include time.h for time(). This removes a bunch of compiler warnings with gcc -Wall on AIX. Submitted by: Jeff Trawick, Victor Orlikowski

blast the old names for the status codes

Fix warnings.

Use the new command-handler initializer macros in some more modules. Unfortunately, the resulting warnings are *not* all cleaned up. Ten or so warnings spill over to non-AP_DEBUG builds (but that just means that there is a bigger pool of folks to resolve them, right?).

add AP_ prefix to *HOOK* macros

Change ap_context_t to ap_pool_t. This compiles, runs, and serves pages on Linux, but probably breaks somewhere.

Update to Apache Software License version 1.1

Fix all the License issues. Including: s/Apache Group/Apache Software Foundation/ s/1999/2000/ s/Sascha's license/ASF license

Manoj has been pushing for this for a while, but I've been too dense to understand that he was right. :-) Basically, this makes the modules use ap_config to test for header file inclusion. This method is not to be used for larger modules that run autoconf theirselves. Including ap_config is only valid for modules which rely on Apache to do their configuration. Currently, this is only the core modules.

Fix Windows compile break. Gotta find a better way to fix this.

This is a huge change to the configure system. Basically, this name space protects most, if not all, of the Apache macros. This has been tested on Linux using all of the Unix MPM's. The biggest push was that Apache's httpd.h header file can no longer include the ap_config.h file. Most of the other files include this themselves now. Submitted by: Ryan Bloom and Manoj Kasichainula

Separate the stat structure from the file structure and use ap_stat and ap_getfileinfo in apache.

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.

Start to implement module-defined hooks that are a) fast and b) typesafe. Replace pre_connection module call with a register_hook call and implement pre_connection as a hook. The intent is that these hooks will be extended to allow Apache to be multi-protocol, and also to allow the calling order to be specified on a per-hook/per-module basis. [Ben Laurie] Port a bunch of modules to the new module structure. ["Michael H. Voase" <mvoase@midcoast.com.au>] Submitted by: Ben Laurie

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