mod_expires: don't add Expires header to error responses (4xx/5xx), be they generated or forwarded. PR 55669.

Ease logic around 'ap_getword_conf' and drop useless line of code.

Add lots of unique tags to error log messages

fix some dead assignments found by the clang analyzer

Intel's compiler warns about assigning the non-enum value 0 to the enumeration apr_finfo_t.filetype, which is done when forgetting the previously-derived file type use the appropriate enum value APR_NOFILE instead Also change comparisons of the field with 0 to use APR_NOFILE instead, as is the practice of some existing code.

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

Avoid time traveling :)

mod_expires - don't segfault on bad configuration. PR 43213: Julien Perez

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.

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

In order for mod_expires to work with mod_cache, mod_expires has to go first. Otherwise, mod_cache has no clue that the response has a limited lifetime.

fix segfault, which occurs if no CT is set and wildcards are used. PR: 28047

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.

*) Add a hook (insert_error_filter) to allow filters to re-insert themselves during processing of error responses. Enable mod_expires to use the new hook to include Expires headers in valid error responses. This addresses an RFC violation. It fixes PRs 19794, 24884, and 25123. [Paul J. Reder]

A better solution than my previous commit as pointed out by Andre Malo. mod_expires: Initialize ExpiresDefault to NULL instead of "" to avoid reporting an Internal Server error if it is used without having been set in the httpd.conf file. PR: 23748, 24459 Submitted: Andre Malo, Liam Quinn <liam htmlhelp.com> Reviewed: Andre Malo, Paul J. Reder

mod_expires: Don't report an Internal Server error if ExpiresDefault is used and has not been set in the httpd.conf file. PR: 23748, 24459 Submitted: Liam Quinn <liam htmlhelp.com> Reviewed: Paul J. Reder

preserve const-ness while searching for a char in a string

Allow ExpiresByType to accept and understand minor-type wildcards (e.g., text/*). They'll be used if an exact type match isn't found; if there's no wildcard match, the expiry falls back to any ExpiresDefault setting as usual. PR: 7991

More mod_expires tuning. Replace the fixup hook with an insert filter hook.

Use apr_table_overlap. Add note about additional brokeness of fast-redirect fooness

Namespace protect the mod_expires filter

if there are any ExpiresByType directives for the current scope, defer the setting of the expiration header fields to an output filter, which can then apply any ExpiresByType or ExpiresDefault settings -- including to dynamic documents.

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

stop using APLOG_NOERRNO in calls to ap_log_[pr]error()

Update our copyright for this year.

Fix a typo for documentation consistency.

Fix a bug in mod_expires. Previous to this patch, if you told mod_expires to add 604800 seconds to the last-modified time, it actually added 604800 usec's to the last-modified time, so that when looking at the response it looked like nothing had been done. The root of the problem was that we always compute time in usec's, but we ask users to input sec's. This means we need to convert to usec's before using those values. CS: Obtained from:

Remove many redundant semicolons.

Merging was bollocks.

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:

Eliminate all assumptions that finfo.protection reflects the existance or absense of a file. finfo.filetype is defined as 0 if APR_NOFILE, or a non-zero value if the file could be apr_stat()'ed.

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:

blast the old names for the status codes

Bring forward a fix from 1.3.

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

Backport the CSS security fixes to Apache 2.0a. Or is that forward port? My sense of direction is all confused. PR: Obtained from: Submitted by: Reviewed by:

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.

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.

Fix the rest of the modules to work with the new APR stat structure.

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.

I am not claiming that the modules work now, but at least the parameter lists are prepared for the updated ap_log_rerror() format. BTW: What is APLOG_NOERROR for now that we have an explicit error code? This is still WIP!

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