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

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

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

fix copyright dates according to the first check in

apply Apache License, Version 2.0

update license to 2004.

oof. Strip all non-public stuff from mod_rewrite.h and reorder the code in mod_rewrite.c in order to get a rid of the forward declaration. Cleaned up the comments as well. No real code change, but a quite big diff ...

optimization/cleanup. The generic flagparser (read: lexer) for RewriteRules and RewriteConds does the same except for one function call. Collapse these to functions to one and make the result more readable.

optimization; rewrite the do_expand function in order to: + give it a better interface + get a rid of most of the fixed stack buffers and then + no longer limit rewritten uris, expanded variables etc to 2k + make it better readable and understandable at all. This is a two-tiered commit for better diffs.

optimization: no need to use the pool here. This is obviously a static value.

optimization: no need to search linear for headers. apr_table_get should be more efficient nearly always.

Prevent endless loops of internal redirects in mod_rewrite by aborting after exceeding a limit of internal redirects. The limit defaults to 10 and can be changed using the RewriteOptions directive with the new MaxRedirects=n argument. (The latter required some restructuring of the RewriteOptions evaluation code). (Documentation patch follows asap) PR: 17462

Fix mod_rewrite's abs_URI handling. - uris were partially not correctly escaped (in particular: ldap, news, mailto) - not all uri schemes contain an authority component (//) - add nntp:// scheme - don't add a query string (and drop r->args) if it's not http or mailto scheme - be more efficient (think so)

This is part two. It fixes the prefix_stat function. (which does a stat call on the first path segment). This function was still tailored for unix systems only. It should work on other systems as well now.

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

add the ability to specify the dbm type (e.g., gdbm, ndbm) for dbm rewrite maps use dbm:filename for the default type use dbm=TYPE:filename for a non-default type

remove some remaining NO_DBM_REWRITEMAP cruft from mod_rewrite which broke the build on Win32 mod_rewrite.h didn't spit out the decl of lookup_map_dbmfile if NO_DBM_REWRITEMAP was still defined, and mod_rewrite.dsp continued to define NO_DBM_REWRITEMAP Reported by: Jerry Baker <jerrybaker@attbi.com>

Change mod_rewrite to use apr-util's dbm support for dbm rewrite maps. For now, the SDBM dbm flavor is always used. It won't be compatible with dbm rewrite maps built for Apache 1.3 until apr-util supports ndbm and mod_rewrite is changed to prefer ndbm over the built-in sdbm. PR: 10644

Fix a problem whereby RewriteMap prg:'s would get out of sync due to the inappropriate use of nonblocking reads. Also get rid of the stderr altogether since mod_rewrite never uses it. PR: 9534

new configuration option for mod_rewrite to set cookies. configuration is like the following RewriteRule (.*) - [CO=<cookiename>:$1:<domain>:<expiry in minutes>] Submitted by: Brian Degenhardt <bmd@mp3.com> Reviewed by: Ian Holsman

Tokenize the arguments for rewrite programs during config parsing, and just use that information later. I was having a problem with prg directives with arguments failing the configuration. The problem was a call to stat, which was being passed the program name and the arguments. Obviously, the arguments were messing up the call to stat. This gets the test suite working for me again.

Error out a bit more nicely if the RewriteMap prg: is not found. We can't just apr_stat in the first init round because we haven't run apr_tokenize_to_argv() yet, and it would be a relatively ugly hack to run it twice just for that. Well, I suppose we could store the argv in the rewritemap structure, but ... nah. With this, we shutdown (cleanly, as opposed to the old exit(1) method) if we go to execute a rewritemap and discover it doesn't exist, and log a nice descriptive message at the end of the error_log.

Fix mod_rewrite hang when APR uses SysV Semaphores. Before we were silently failing when locking/unlocking the mutex, since httpd child processes didn't have permissions to access the root-created semaphore. PR: 8143

Added an optional function (ap_register_rewrite_mapfunc) which allows third-party modules to extend mod_rewrite's "int:" internal RewriteMap functionality. Concept by: Tahiry Ramanamampanoharana <nomentsoa@hotmail.com>

Update mod_rewrite to use the new APR global mutex type.

Update our copyright for this year.

Modify post_config hook so that it can return a error, causing the server not to start. previous method was to call exit(1) which would not fail gracefully PR: Obtained from: Submitted by: Reviewed by: (Idea only Jeff Trawick)

Convert mod_rewrite's INTRAPROCESS lock to the newly supported apr_thread_mutex_t type lock. Passes all rewrite.t tests.

Thread saftey lock for mod_rewrite's cache... I'm sure others will have some 'better ideas' but this will work for now. Submitted by: Brian Pane <bpane@pacbell.net>

Bring forward the NOESCAPE flag from 1.3..

Fix some APR-ization issues: 1) we're using an apr_time_t file mtime, but trying to fit it in a time_t entry in the cache and in parameters to the cache access routines; use apr_time_t everywhere 2) we need to use apr_fileperms_t instead of mode_t for APR file permissions PR: 6980

Update copyright to 2001

Clean up some of the includes: - explicitly include apr_lib.h since ap_config.h doesn't - use apr_want.h where possible - use APR_HAVE_ where possible - remove some unneeded includes

http_conf_globals.h is gone

Bring forward from 1.3: I broke mod_rewrite by modifying strings in place when expanding them, because variable lookups can cause subrequests which cause mod_rewrite to do its stuff again including an expansion on the same string, which is then syntactically invalid. So copy the lookup keys somewhere else before using them in such a way that may cause recursion. In addition to this, my parser could also be confused by complicated nested rewrite map expansions like ${map1:${map2:key|dflt}|dflt} so fix that too by keeping track of {} when looking for |. PR: 7087

Restore functionality broken by the mod_rewrite security fix: rewrite map lookup keys and default values are now expanded so that the lookup can depend on the requested URI etc. Because the new code is recursive you can now write configurations like the following (with nested map lookups) which wasn't directly possible before -- you had to use a RewriteCond and a %N backref instead, as in http://www.apache.org/docs/vhosts/mass.html#xtra-conf RewriteMap tolower int:tolower RewriteMap host2user txt:/home/www/conf/virtusertbl RewriteRule /(.*) /home/${host2user:${tolower:%{HTTP_HOST}}|www}/public_html PR: 6671

Fix a security problem that affects certain configurations of mod_rewrite. If the result of a RewriteRule is a filename that contains expansion specifiers, especially regexp backreferences $0..$9 and %0..%9, then it may be possible for an attacker to access any file on the web server. The fix replaces a multi-pass string expander with a one-pass expander, and includes the code quality improvements that were committed separately to 1.3. Message-Id: <E13OQB5-0004Xs-00@hand.dotat.at>

Fix some bad calls to ap_log_rerror() in mod_rewrite. In some places, errno was passed as the APR error code. In other places, 0 was passed.

Clean up maintainer-mode compiles of mod_rewrite (use AP_INIT_xx macros and clean up resulting warnings).

prefix libapr functions and types with apr_

Apache doesn't actually check for stdarg.h, but APR does. Just use the APR defined APR_HAVE_STDARG_H to check for the existance of stdarg.h

Protect system header files with the appropriate macros.

Clean up a big chunk of ap_config.h. This basically stops ap_config.h from including any files. Because of this change, other files must include their own headers. I also cleaned up a couple of other bugs in some modules because I had to compile them all. I expect this to break multiple platforms, but this will be fixed over time. The massive configure cleanup is almost done. I will go through the files one more time after this commit.

Missed one sys/stat.h in mod_rewrite.h. Removing it now.

back out APR_ prefix for TRUE,FALSE

prefix TRUE,FALSE with APR_

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

Get mod_rewrite working with APR locks This has been tested on Linux and works (with the caveats: must use --disable-hsregex, must define NO_DBM_REWRITEMAP, must remove Dirks March 14 patch from util.c and httpd_config.c). Submitted by: Paul Reder Reviewed by: Bill Stoddard

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

merge 1.3 changes to rewrite forward onto 2.0 Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com>

port mod_rewrite to 2.0 Submitted by: Paul J. Reder <rederpj@raleigh.ibm.com>

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.

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