Save a few bytes of memory. This can be done in temp_pool.

Various code cleanup to avoid compiler, cppcheck, or clang warnings: modules/debugging/mod_firehose.c: Make some internal functions static (to do: logs_cleanup() is unused) modules/filters/mod_charset_lite.c: Remove dead assignments modules/filters/mod_include.c: likewise modules/metadata/mod_usertrack.c: likewise modules/proxy/mod_proxy_ftp.c: likewise modules/ssl/ssl_engine_pphrase.c: likewise modules/proxy/mod_proxy_balancer.c: likewise; Remove NULL check that can never happen modules/proxy/proxy_util.c: Axe NULL-check that can never happen and if it would, it would just mask another bug os/unix/unixd.c: likewise modules/http/http_filters.c: Remove sub-condition that is always true modules/lua/mod_lua.c: Add default cases to switch statements modules/generators/mod_autoindex.c: Unsigned value can never be < 0 server/util_expr_eval.c: Fix compiler warnings with VC and on OS2

Add lots of unique tags to error log messages

Use random value instead of remote IP address in cookie value. This has the advantage that we don't leak internal IP addresses in reverse proxy setups. Also, use hex to make the cookie shorter.

More checks of ap_pregsub return values

PR29755: mod_usertrack gets skipped when modules return a status code from their fixup hook, and headers are also not sent on non-2xx responses. Submitted by: Sami J. Mäkinen Reviewed by: Eric Covener (modified to just run REALLY_FIRST)

more temp pool usage and remove some useless apr_pstrdup()s

remove some useless use of strlen()

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

update license header text

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

No functional change: remove "internal" tab spacing/formatting.

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

No functional change: simple detabbing of indented code.

Move the POSIX reg* implementations into the ap_* namespace; internalise the ap_reg*<->PCRE wrapper: * configure.in: Add srclib/pcre to the include path. * include/ap_regex.h: Renamed from include/pcreposix.h. Prefix all constants with AP_; prefix all functions and types with ap_. Define AP_DECLARE to nothing if necessary. Remove regcomp error codes. * include/httpd.h: Include ap_regex.h not pcreposix.h. (ap_pregcomp, ap_regexec, ap_regfree): s/regex_t/ap_regex_t/. (ap_regexec, ap_regerror): Prototypes moved to ap_regex.h. * server/util.c (regex_cleanup, ap_pregcomp, ap_pregsub, ap_pregfree): Adjust for ap_ prefixed types. (ap_regexec, ap_regerror): Removed. * server/Makefile.in: Build util_pcre.c. * server/util_pcre.c: Copied from srclib/pcre/pcreposix.c; remove use of PCRE-internals to do error mapping; rename types to add AP_/ap_ prefixes as above. Use APR includes. (ap_regerror): Use apr_snprintf. * srclib/pcre/Makefile.in: Don't build pcreposix.c into libpcre.la. * modules/*: Update to use new type and constant names. PR: 27750 (part one) Submitted by: Andres Salomon <dilinger voxel.net>, Joe Orton

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

Just a simple switch of mod_usertrack to run earlier in the fixup hook. PR: 29755

Fix a bunch of cases where the return code of the regex compiler was not checked properly. This affects: mod_setenvif, mod_usertrack, mod_proxy, mod_proxy_ftp and core. PR: 28218

escape the cookie_name before pasting into the regexp.

let's be more lenient, in what we accept. commas are allowed as separators and whitespaces are not a must.

Fix bug in mod_usertrack when no CookieName is set. PR: 24483 Submitted by: Manni Wood <manniwood planet-save.com> Reviewed by: Cliff Woolley, Jim Jagielski

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

according to RFC 2965, inspect only the Cookie header (vs. Cookie2) PR: 11475 Submitted by: chrisd pearsoncmg.com (Chris Darroch)

don't overwrite other cookies PR: 26002 Submitted by: apache nopdesign.com (Scott Moore)

update license to 2004.

The problem that this patch solves is one where cookie names are mis-identified by mod_usertrack. This is because of the use of strstr() in spot_cookie() the original mod_usertrack.c to find the name of the cookie. strstr(), by virtue of looking for a substring instead of an exact match, can mis-identify the cookie "MyID" as the cookie "ID" or "My". So, if you were looking for the value of the cookie "ID", but only the cookie "MyID" was returned by the browser, mod_usertrack.c would return the value of the "MyID" cookie in place of the "ID" you were looking for. Even more seriously, because strstr is invoked before the cookie name is separated from its cookie value, a cookie and value like "myCookie=thisisnotIDeal" will be a false positive if you told mod_usertrack the cookie name was ID. Furthermore, using this example, "eal" will get logged as the value of the cookie; now that strstr has incorrectly identified the substring "ID" as the cookie name, the following "e" (assumed to be the "=" sign) gets discarded, and the remaining content used as the value of the cookie. Replacing the strstr() with a more robust regex match fixes this problem. PR: 16661 Submitted by: Manni Wood <manniwood@planet-save.com>

mod_usertrack: don't set the cookie in subrequests. This works around the problem that cookies were set twice during fast internal redirects. PR: 13211

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

use APR_TIME_T_FMT when formatting apr_time_t

Replaced APR_USEC_PER_SEC division with the new apr_time_sec() macro

Update callers of apr_explode_gmt to apr_time_exp_gmt. The function was renamed in apr. Submitted by: Thom May <thom@planetarytramp.net>

Update our copyright for this year.

apr-utils rename apr_ansi_time_to_apr_time and apr_exploded_time_t. PR: Obtained from: Submitted by: Thom May <thom@planetarytramp.net> Reviewed by: Ian Holsman

Kill off some expensive, unnecessary effort when we use max-age for the usertrack cookie (and kill a warning in the process.)

From Mark Cox: I've had a couple of emails from users using mod_usertrack for authentication. Add the equivalent of a "warning: coffee may be hot" label, and fix a broken email address at the same time. Submitted by: Mark Cox

can't pass const char * to ap_strchr() (note that when AP_DEBUG is on, strchr() maps to ap_strchr() so we find abuses of the broken strchr() interface)

Add CookieDomain directive to allow setting of the Domain= cookie attribute; add CookieStyle to allow specification of cookie syntax: Netscape (default), Cookie or RFC2109, or Cookie2 or RFC2965. We have historically supported only the obsolete Netscape syntax. PR: several against 1.3 Obtained from: brought forward from 1.3

tweak ap_get_remote_host() so that the caller can find out if she got back an IP address mod_access needed to know this, but the old code didn't handle IPv6

Update copyright to 2001

Fix more module breakage from header reorg

*) 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:

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:

include <strings.h> for the strcasecmp() and strncasecmp() prototypes; AIX doesn't have prototypes for these in string.h

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.

Use AP_INIT_* macros for command_rec [] in a few more modules.

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_

Missing apr_strings.h - hope this wasn't destined for some global header. PR: Obtained from: Submitted by: Reviewed by:

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.

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

time overhaul: - ap_time_t is a 64-bit scalar, microseconds since epoch - ap_exploded_time_t corresponds to struct tm with a few extras probably broken on anything except linux.

Move some modules over to using ap_time_t instead of struct tm.

Next pass at the time functions. This defines an ap_ansi_time_t which has a specific format (seconds since 0:00:00 Jan 1, 1970). I also renamed the (get|set)_curtime functions to (get|set)ansitime. This should make more sense, and be a bit more intuitive.

A few more tweaks to finish the modules work. Now, all of the modules compile correctly with Apache 2.0. This does run, but it hasn't been tested any more than simply compiling and running the server.

Make mod_usertrack compile cleanly. Not tested yet.

Deal with times() properly in autoconf. This also changes NO_TIMES to !HAVE_TIMES.

The first part of the big autoconf patch. This replaces a bunch of NEED_* macros with HAVE_* macros to be more consistent with autoconf.

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.

Port a few more modules to use the new hooks style.

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