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

mod_include: Move the request_rec within mod_include to be exposed within include_ctx_t.

Move the accessenable variable into the private ssi_internal_ctx structure instead of the public include_ctx_t structure.

mod_include: Add an "if" directive syntax to test whether an URL is accessible, and if so, conditionally display content. This allows a webmaster to hide a link to a private page when the user has no access to that page.

update license header text

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

Doxygen fixup / cleanup submited by: Neale Ranns neale ranns.org reviewed by: Ian Holsman

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

fix name of The Apache Software Foundation

apply Apache License, Version 2.0

update license to 2004.

drop superfluous argument from ap_ssi_parse_string. The new API should now be stable.

these should be const.

bump mod_include's external API. The API is now more simple and expected to be better extensible without breaking binary compatibility, since an opaque pointer to internal structures is part of the public context. (We can easily add APi functions that operate on this internal struct). I've tried to keep this change as small as possible - sorry for the big diff though, but the commit should be atomic. mod_cgi and mod_cgid won't compile until the next commit, anyway.

major overhaul of mod_include's filter parser. Note that the new code contains a thin wrapper to ensure binary compatibility. (needed for 2.0 backport). This is a two-tiered commit for better diffs. This one inserts the new code (old code #if'd out).

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

Need to grok optional fns.

BUCKET FREELISTS Add an allocator-passing mechanism throughout the bucket brigades API. From Apache's standpoint, the apr_bucket_alloc_t* used throughout a given connection is stored in the conn_rec by the create_connection hook. That means it's the MPM's job to optimize recycling of apr_bucket_alloc_t's -- the MPM must ensure that no two threads can ever use the same one at the same time, for instance.

Update our copyright for this year.

Paren-protect macro arguments when used. (This will be needed later when the bucket api gets changed.) Submitted by: Brian Pane

make it work with flushes make the false alarm not as generic PR: Obtained from: Submitted by: Reviewed by: Ian, Brian, Justin

Eliminated various large (8KB) string buffers from the stack in mod_include by adding support for a power-of-two pool-based allocator in ap_ssi_parse_string(). (The default operation of this function is backward-compatible, to support the other modules that call it.) This change should help reduce memory usage for servers delivering shtml pages.

Ever tried to extract some value of QUERY_STRING from within SSI? Now you can :) Provides $0..$9 results for any regex evaluation, and strengthens the expr parser for regex expressions.

allow mod_include to handle different start/end tags instead of the default <!-- --> ones. PR: Obtained from: Submitted by: Reviewed by:

Fix a file descriptor leak in mod_include. When we include a file, we use a sub-request, but we didn't destroy the sub-request immediately, instead we waited until the original request was done. This patch closes the sub-request as soon as the data is done being generated. This passes all tests in the test suite. Submitted by: Brian Pane <bpane@pacbell.net> Reviewed by: Ryan Bloom and Cliff Woolley

Remove the returned-length "w" parameter from apr_bucket_heap_create() and apr_bucket_heap_make(). It was useless, since the length is invariant from the length passed in and from the resulting bucket's b->length. This takes care of a long-standing issue first brought up in February and discussed on the dev@apr list. (Issue #2 from the "Bucket API Cleanup Issues" thread.) See http://marc.theaimsgroup.com/?l=apr-dev&m=98324983126666&w=2 Reviewed by: Ryan Bloom (concept)

This patch zero-fills just the integer and pointer fields in the structure, plus the first byte of each of the string buffers. This updated version of the patch doesn't allocate space for the error_str and time_str buffers in the mod_include filter context until/unless they're actually needed. --Brian Submitted by: Brian Pane <bpane@pacbell.net> Reviewed by: Ian Holsman

Make mod_include check for BYTE_COUNT_THRESHOLD on a per-bucket basis rather than on a per-character basis. A significant amount of time was spent checking the limit. A better place to check for the threshold is when we read the bucket in not as we read each character in the bucket. If a bucket manages to be 200MB, it is not this code's problem as it is a mere filter. I ran this with the mod_include stuff in httpd-test and it looks good from here. Submitted by: Brian Pane <bpane@pacbell.net> Reviewed by: Justin Erenkrantz, Ryan Bloom, Greg Stein, Cliff Woolley, Paul Reder, etc, etc, etc...

Moved split_and_pass_pretag_buckets back to being a macro at Ryans's request. Removed the return from it by setting and returning a return code instead. Updated the code to check the return code from teh macro and do the right thing.

Fix for mod_include. Ryan's patch to check error codes put a return in the wrong place. Also, the include handler return code wasn't being checked. I don't like macros with returns, so I converted SPLIT_AND_PASS_PRETAG_BUCKETS into a function.

Handle the ap_pass_brigade inside the SPLIT_BRIGADE... macro.

Fix a reference to "ctx" in mod_include's CREATE_ERROR_BUCKET macro to "cntx", which is the actual name of the argument to that macro. It accidentally worked before because all of the callers of the macro happen to be passing in a variable named "ctx". If one of them were to ever try to pass in a context named something else, bad things would happen.

change include_handler to include_handler_fn_t, and clean up a nasty explicit cast that could float from the include_handler_fn_t declaration.

We seem to use fn_t *fn throughout the rest of apache, so normalize this syntax for mod_include's include_handler(_t)

Modify mod_include to send blocks of data no larger than 9k. Without this, mod_include will wait until the whole file is parsed, or the first tag is found to send any data to the client. Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com>

Remove a semicolon from a macro. This makes things a bit more readable, and it makes this macro look like the rest of our macros.

Rename the module structures so that the exported symbol matches the file name, and it is easier to automate the installation process (generating LoadModule directives from the module filenames). Next step is to remove the 4th argument to the APACHE_MODULE macro completely and require people to use the matching names, and to reduce the LoadModule directive to 1 argument.... Objections?

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:

move the instantiation of includes_module out of mod_include.h

Move the logic for creating CGI processes from mod_include to mod_cgi(d). This removes a good deal of duplicate logic for creating CGI scripts.

Remove ap_chdir_file. This function is not thread-safe, and nobody is currently using it. The proper way to do this, is to use the apr_create_process API.

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.

Switch to the APR-provided APR_CHARSET_EBCDIC feature test macro.

Force all Apache functions to be linked into the executable, whether they are used or not. This uses the same mechanism that is used for APR and APR-util. This may not be the correct solution, but it works, and that is what I really care about. This also renames CHARSET_EBCDIC to AP_CHARSET_EBCDIC. This is for namespace correctness, but it also makes the exports script a bit easier.

Make mod_include use a hash table to associate directive tags with functions. This allows modules to implement their own SSI tags easily. The idea is simple enough, a module can insert it's own tag and function combination into a hash table provided by mod_include. While mod_include parses an SSI file, when it encounters a tag in the file, it does a hash lookup to find the function that implements that tag, and passes all of the relevant data to the function. That function is then responsible for processing the tag and handing the remaining data back to mod_include for further processing. Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com> Reviewed by: Ryan Bloom

Change some apr_ssize_t uses to apr_size_t. Submitted by: Victor J. Orlikowski Reviewed by: Jeff Trawick

fix a bunch of apr_ssize_t/apr_size_t discrepancies

A complete re-write of mod_include. This has served the entire manual now. This makes mod_include a filter that uses buckets directly. Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com> Reviewed by: Ryan Bloom