This is annoying to see in a casual "LogLevel debug foo:traceX ..."

If the "value" argument is prefixed with expr=, parse it with ap_expr rather than mod_headers' built-in format strings.

Allow for format specifiers to be used in the base substitution string for Header edit

add "Header note" which was the solution for two users this week on IRC.

provide a simple (no <If>) way to set a header only if it's not already there.

Remove useless tests. Turn if (*x && apr_isspace(*x)) into if (apr_isspace(*x))

Might as well show 'em all

Allow for exposure of loadavg and server load via mod_headers

Add lots of unique tags to error log messages

Check return value of ap_pregsub()

Unify syntax of config directives taking an expression as optional contition argument

Replace literal constant with AP_MAX_REG_MATCH

Fix issues found by PVS-Studio static analyzer: mod_mime_magic: cut'n'paste error rsl_encoding vs. rsl_separator, also simplify code a bit mod_header: wrong string initialization (leading to segfault if format argument is missing) util_win32: duplicate sizeof (untested; Windows people, please review) PR: 51542 Submitted by: Andrey Karpov <karpov viva64 com>, Stefan Fritsch

Add string valued expressions to ap_expr, do some API cleanup - add possibility to have expressions that evaluate to a string and not to a boolean value - modify ap_expr_parse_cmd() interface to support this and make it more convenient to use in general - rename AP_EXPR_FLAGS_* to AP_EXPR_FLAG_* for consistency

revert r1031670: Change the default of the Header directive to apply to responses of all types instead of just 2xx successful responses. This turned out to be do more harm than good for anything other than "set", since "always" doesn't ever see/operate on existing r->headers_out headers -- just err_headers_out. I think onsuccess needs to remain the default and this needs to move into a doc revamp.

Log errors/infos during expression evaluation and associate the message with the module that is calling ap_expr_exec()

Replace ap_expr with a parser derived from mod_ssl's parser. Make mod_ssl use the new parser. Rework ap_expr's public interface and provide hooks for modules to add variables and functions. The Netware and Windows build files still need to be adjusted

Change the default of the Header directive to apply to responses of all types instead of just 2xx successful responses.

rename the mod_headers variables used to track onsuccess vs. always for clarity

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

Fix omission in r894036 noted by rpluem.

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

* modules/metadata/mod_headers.c: Add a function pointer type for the tag handler callback to regain some type-safety. (register_format_tag_handler, header_pre_config): Adjusted.

Correctly align the behavior of headers_in to be consistent with the treatment of headers_out, resolving PR 48359 by keeping subrequest scope changes out of the main request headers. This ensures that all requests-without-bodies behave as the requests-with-bodies code has. Mitre: CVE-2010-0434

mod_headers: Enable multi-match-and-replace edit option PR 47066

mod_headers: align Header Edit with Header Set on Content-Type PR 48422 Adapted patch from Cyril Bonté

* Ensure that the new table values are allocated from the pool of the main request as they might be added to the header tables of the main request. Otherwise these values might become invalid once the subrequest and its pool gets destroyed. PR: 48359 Submitted by: rpluem, niq Reviewed by: niq

mod_headers: generalise the envclause to support conditional header rules via ap_expr.

Change r->content_type when mod_headers sets the Content-Type header

* Prevent Header edit from processing only the first header it should edit and deleting the remaining ones by iterating over all headers with the same name. PR: 45333

Supress the warning for compilers which fold *end-*start into ssize_t.

add merge option to avoid duplicate values within the same header

* Fix a off-by-one error in parse_format_tag in the case that the last character of the string to which *sa points is a %. In this case the while loop in parse_format_string would call parse_format_tag with a pointer to a memory region that starts one byte after the string to which s in parse_format_string points to.

PR#36609 - permit % as the last character of a Header value

Support regexp-based manipulation of HTTP headers

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

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.

Implement "Early" mode in mod_headers, and document it.

Drop the ErrorHeader directive which turned out to be a misnomer. Instead there's a new optional flag for the Header directive ('always'), which keeps the former ErrorHeader functionality. The opposite flag to 'always' is 'onsuccess'. So the new directives are written as: Header set foo bar # which is the same as Header onsuccess set foo bar # and a subset of Header always set foo bar # which is what the ErrorHeader directive did. Reviewed by: Brad Nicholes

allow %% to represent a literal %.

allow env clauses also for 'echo' and 'unset'

Allow ErrorHeader echo

don't segfault, when setting an empty header value

simplifications There's no need for different server and dir configs.

remove unused parameters and minor memory leak

:retab

allow RequestHeader to be conditional PR: 27951 Basically submitted by: vincent gryzor.com (Vincent Deffontaines)

* modules/metadata/mod_headers.c (header_inout_cmd): Remove redundant conditional.

Add 's' format tag to mod_headers to allow access to mod_ssl variables without the overhead of SSLOptions +StdEnvVars/+ExportCertData; also ensure that any multi-line envvars are unwrapped onto a single line. * modules/metadata/mod_headers.c (header_request_ssl_var, unwrap_header, header_post_config): New functions. (header_pre_config): Register the 's' tag type. (register_hooks): Add the post_config hook. PR: 23223

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.

Pick up declaration for insert_error_filter hook

Allow retention of header fields on non-200 responses

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

Detabbify

use APR_TIME_T_FMT when formatting apr_time_t

Add a filter_init function to the filters so that a filter can execute arbitrary code before the handlers are invoked. This resolves an issue with incorrect 304s on If-Modified-Since mod_include requests since ap_meets_conditions() is not aware that this is a dynamic request and it is not possible to satisfy 304 for these requests (unless xbithack full is on, of course). When mod_include runs as a filter, it is too late to set any flag since the handler is responsible for calling ap_meets_conditions(), which it should do before generating any data. If a module doesn't need to run such arbitrary code, it can just pass NULL as the argument and all is well. PR: 9673 Reviewed by: Ryan Bloom and others

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

Update our copyright for this year.

As hinted on dev@httpd, change filter naming schemes to match our expectations of their usage. The reason that we should make this change now is that we have changed the implied meaning of AP_FTYPE_HTTP_HEADER - some users of this should be PROTOCOL while others should be CONTENT_SET. In order to clarify it, toss all of the bogus names and force the filter writers to make sure they understand what they are doing. CONTENT_SET is new (horrible name - change if you have better idea), but it indicates that it should run between RESOURCE and PROTOCOL. mod_deflate is the ideal CONTENT_SET filter. The changed type names are: CONTENT is now RESOURCE. HTTP_HEADER is now PROTOCOL. However, most filters that used HTTP_HEADER may want CONTENT_SET. (Only things like POP and HTTP belong as PROTOCOL.) MMN bump since all filters need to be recompiled due to filter reordering.

The pre_config hook now takes a return value. This allows modules to cause the server to bail out under error conditions.

Fix constness compiler warning

add a new option '%{note-name}e' to headers. This will output the value of the note (subprocess_env) into a header field

initialize local condition_var var to keep garbage out of struct header_entry->condition_var and avoid a segfault later (untested, but it looks good to me :) )

ap_getword_conf wants const char **, not char **

Extend mod_headers to support conditional driven Header add, append and set. Use SetEnvIf to set an envar and conditionally add/append/set headers based on this envar thusly: SetEnvIf TSMyHeader value HAVE_TSMyHeader Header add MyHeader "%t %D" env=HAVE_TSMyHeader If the request contains header "TSMyHeader: value" then header MyHeader: "t=xxxxxxxxxx D=yyyy" will be sent on the response. Update mod_headers.html.

void * isn't compatible with a function pointer; deal with retrieving a function pointer from apr_hash_get()

Function declaration must be a prototype.

Extend Header add|set|append support to accept format strings for the header values. Configure thusly: Header add MyHeader "%t %D yadda" %t is the time the request was received relative to CUT since the epoch measured in microseconds. %D is the time delta from the time the request was received to the time the headers are sent on the wire. To facilitate parsing the header response, %D results in the string D=xxx and %t results in the string t=xxx. Thus the config directive above will result in this header being included in the response: MyHeader: t=991424704447256 D=3775428 yadda

Return "1" to apr_table_do()

Add the 'echo' option to mod_headers Header directive. Use the new option like this: Header echo regex If a header received on a request matches regex, it is copied to the response headers.

Move the addition of default AP_HTTP_HTTP_HEADER filters to the insert_filter phase so that other filters are not bypassed by default. PR: Obtained from: Reviewed by:

Tru64 cc is bitchy about trailing commas in an enum list.

Change directive HeaderOut back to Header and HeaderIn to RequestHeader.

Reimplement mod_headers as an output filter. mod_headers can now add custom headers to inbound requests using the HeaderIn directive and to responses using the HeaderOut directive. The Header directive has been deprecated in favor of the HeaderOut directive. Submitted by: Graham Leggett Reviewed by: Bill Stoddard

*) Introduce "ap_conf_vector_t" type to assist with legibility and provide some type safety. (unfortunately, our old "void*" is type-safe with the new one, but over time we should be better) *) Propagate the new type to all appropriate functions. *) Random cleaning, whitespace, stylistic nits.

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:

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.

prefix libapr functions and types with apr_

Use the AP_INIT_TAKE23() macro to clean up a maintainer-mode warning, then fix the warnings resulting from AP_INIT_TAKE23() :)

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

Update Windows project and makefiles so dynamically loadable modules get built

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