Concat string at compile time when possible. Doing so, sometimes also give the opportunity to turn a 'ap_fputstrs' into a 'ap_fputs'. PR 53741

Skip DirectoryIndex execution unless method is GET or POST, restoring 2.2 behavior when using mod_dav. PR 54914. Otherwise, variable behavior results: if no DirectoryIndex file is found, mod_dav's r->handler runs as expected. But if an index file is found, r->handler will be changed by ap_internal_fast_redirect() to something other than mod_dav's r->handler, while r->method is left unchanged, usually leading to a 405 response.

followups to r1557641 suggested by nd -- add prefix to both the macro and the handler name itself.

don't search for directory indexes/directoryslashes if a URL is in the middle of being rewritten [in per-dir context]. PR53929

restore http://svn.apache.org/viewvc?view=revision&revision=233369 under a configurable option: don't run mod_dir if r->handler is already set. PR53794

mod_dir: rename the on/off/unset enum so it doesn't look so funny if used by other flags.

'ap_getword_conf' can not return NULL

FallbackResource : Support for the 'disabled' argument

PR52845: "DirectoryIndex disabled" should blow away the DirectoryIndex settings in the current config section, not just override previous config sections.

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

improve (but preserve searchable parts of) the error message when Options -Indexes is about to trigger a 403 in mod_autoindex, with a pointer to mod_dir about how the DirectoryIndex might have been the real culprit.

Add a mod_dir option to allow the used DirectoryIndex to be externally redirected.

gratuitous style change

save some memory by using cmd->temp_pool instead of cmd->pool in some places

Merge mod_dir fixups to avoid possible ordering issues noted by trawick

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

Change Fallback to FallbackResource after extensive discussion with wrowe and DrBacchus.

Change "DefaultHandler" to "Fallback" as discussed on list and today on IRC, in the hope that everyone will be satisfied. PR: 47184 + subsequent veto of original directive name

mod_dir: Change DefaultHandler to DefaultMapping, and document it

Fix bug in r785425 (dereference null pointer when not configured) and add a couple of comments.

Add DefaultHandler directive to mod_dir. PR 47184

* The nitpicker of the space police. No functional change.

temporary dbg message and unnecessary continue, per rpluem review

change short-lived behavior of "DirectoryIndex None" based on feedback from wrowe: Doesn't search for anything: DirectoryIndex disabled Does search for literal "disabled": DirectoryIndex disabled foo. DirectoryIndex foo disabled DirectoryIndex disabled disabled Does search: DirectoryIndex disabled.html

*) mod_dir: Support "DirectoryIndex None" Suggested By André Warnier <aw ice-sa.com> [Eric Covener]

Sub-requests are created and used with two purposes; sometimes simply to 'see' what a request would do; as to fill out an SSI, validate access or similar - and is then discarded. And sometimes as the precursor to becoming the actual request; e.g. when mod_dir checks if an /index.html can be served for a '/'. In the latter case it is important to preserve the output filters 'for real'; whereas in the first case they have to be reset to purely the minimal proto filters (if at all). This patch instates the output filters in 3 cases where sub-requests are/may in fact be used as the real request later on. This is a relatively risky change (which should not be back-ported without further discussion) and may break caches in combination with internal redirects/vary/negotiation in subtle ways. See the thread starting at [1] and in particular the general concerns of rpluem at [2] with respect to sub requests and (fast_)internal redirects possibly needing a more thorough overhaul. 1: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/ajax/%3c335D1A4B-25E2-4FF1-8CDF-5010A7FBD293@webweaving.org%3e 2: http://mail-archives.apache.org/mod_mbox/httpd-dev/200802.mbox/%3c47ACE1D4.4060702@apache.org%3e

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

Explain why we have the regular file typecheck. No functional changes.

Do not check the value of r->handler. This allows the use of SetHandler for an entire directory, and since we already check via the stat structure if this is a directory, there is no reason for this extra check, which causes a regression since 1.3. PR: 25435

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

make trailing-slash-behaviour configurable

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

allow proxying of directoryindex'd resources

update license to 2004.

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

Only style fixes (tabs, blocks, spelling).

Fix some formatting

Update our copyright for this year.

fix redirects for directories. fixup_dir was munging the URI before other fixup hooks (such as fixup_redir in mod_alias) had a chance to redirect the original directory URI.

get rid of an unused variable

Once again, if mod_dir will perform an internal redirect into a RESPONSE BODY (as opposed to 'something else' of it's own generation) it needs to make the caller aware of the results (e.g. an included subrequest) so the caller can decide if the result is suited (e.g. including text/html only, but refusing to include other binary results.) Since we can know everything about the results of the mod_dir processing by the fixups phase, let it perform all resolutions before the caller of ap_process_request_internal makes it's decisions.

Resolve the mod_dir overaggressive redirection problem seen with non-GET requests for WebFolders. Reviewed by: Greg Stein

Two cases we are certain of canonical correctness

Kill some deadwood

Under certain circumstances, Apache did not supply the right response headers when requiring authentication. [Gertjan van Wingerde <Gertjan.van.Wingerde@cmg.nl>] PR#7114 (This is a port of the change that went into Apache 1.3.19.)

do the redirection for GET requests only Submitted by: Ryan Bloom and Greg Stein

Split the mod_dir fixup into two parts. The first determines if this is a MOVED_PERMANANTLY response, and is done from the fixup. The second is a handler that redirects to an index.html page.

Make mod_dir use a fixup for sending a redirect to the browser. Before this, we were using a handler, which doesn't make much sense, because the handler wasn't generating any data, it would either return a redirect error code, or DECLINED. This fits the current hooks better. Submitted by: Ryan Morgan <rmorgan@covalent.net>

Update copyright to 2001

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

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.

adjust remaining modules to use the new handler hook method (Alan Edwards) bring back the old handler prototype by reusing r->handler (dougm) PR: Obtained from: Submitted by: Reviewed by:

Make handlers use hooks.

add the "next filter" parameter to the rest of the ap_sub_req_* calls.

Allow modules to specify the first module for a sub-request. This allows modules to not have to muck with the output_filter after it creates the sub-request. Without this change, modules that create a sub-request have to manually edit the output_filters, and therefore skip the sub-request output_filter. If they skip the sub-request output_filter, then we end up sending multiple EOS buckets to the core_output_filter.

Renamed all MODULE_EXPORT symbols to AP_MODULE_DECLARE and all symbols for CORE_EXPORT to AP_CORE_DECLARE (namespace protecting the wrapper) and retitled API_EXPORT as AP_DECLARE and APR_EXPORT as APR_DECLARE. All _VAR_ flavors changes to _DATA to be absolutely clear. Thank you Greg, for the most obvious suggestion.

Remaining cleanup of ap_ -> apr_ and AP_ -> APR_ transformation... see src/lib/apr/apr_compat.h for most details. Also a few minor nits to get Win32 to build. PR: Obtained from: Submitted by: Reviewed by:

prefix libapr functions and types with apr_

- fix POOL_DEBUG ... restored the ap_pool_joins that dreid removed. - removed the apr_abort foo since every caller was passing it NULL anyway; and this is debugging code, so i don't have any qualms about using stderr or abort().

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.

Fix warnings (we really need typesafe arrays, y'know).

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?).

ap_pool_join is a debugging function so remove it.

PR: Obtained from: Submitted by: Reviewed by: Reverse out all _EXPORT_VAR changes back to their original _VAR_EXPORT names for linkage (API_, CORE_, and MODULE_).

This patch corrects the issues from the AP_EXPORT and linkage specification arguments to the ap_hooks.h declarations. As with the APR_ and AP_ patches, API_VAR_EXPORT becomes API_EXPORT_VAR, and MODULE_VAR_EXPORT becomes MODULE_EXPORT_VAR. I will be happy to revert the inclusion of ap_config.h from httpd.h if this bothers anyone. More individual modules need to be patched if we do so. The API_EXPORTs all moved into central storage in the ap_config.h header. Without WIN32 or API_STATIC compile time declarations, these macros remain no-ops. This patch also moves the following data from http_main to http_config: const char *ap_server_argv0; const char *ap_server_root; ap_array_header_t *ap_server_pre_read_config; ap_array_header_t *ap_server_post_read_config; ap_array_header_t *ap_server_config_defines; And the following variables had already moved into ap_hooks.c: ap_pool_t *g_pHookPool; (initialized now in http_config) int g_bDebugHooks; (out of http_config) const char *g_szCurrentHookName; (out of http_config) The changes to http_main.c are in preparation for that module to move out to a seperate .exe for win32. Other platforms will be unaffected, outside of these changes.

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

Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is defined correctly in all C files.

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

Rework ap_finfo_t to split the file type out of the protection field. I've taken a stab at the unix implementation but tested only on OS/2.

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