* Fix null pointer dereference in case SetEnvif and SetEnvIfExpr are used together. PR: 54881

Compile the regex used by is_header_regex() only once during startup This should save some memory, especially with .htaccess

Further clarify the naming of the entity that originates the request by calling that entity a useragent instead of a client.

Add lots of unique tags to error log messages

Introduce a per connection "peer_ip" and a per request "client_ip" to distinguish between the raw IP address of the connection and the effective IP address of the request.

Introduce a per request version of the remote IP address, which can be optionally modified by a module when the effective IP of the client is not the same as the real IP of the client (such as a load balancer).

More ap_pregsub error checking/logging

Remove OID match which was never in a GA releas and is obsoleted by SetEnvIfExpr with PeerExtList()

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

fix some dead assignments found by the clang analyzer

Fix segfault for loglevel >= trace2

Rename ap_expr's typedef names: ap_expr -> ap_expr_t ap_expr_parse_ctx -> ap_expr_parse_ctx_t ap_expr_eval_ctx -> ap_expr_eval_ctx_t ap_expr_lookup_fn -> ap_expr_lookup_fn_t ap_expr_node_op -> ap_expr_node_op_e

Fix SetEnvIfExpr to work with expressions that do not set the regexp reference data. Add some trace logging.

Fix segfault on parse error

More ap_expr updates: - minor bump for ap_expr_exec_re() introduced in r1037504 - actually commit the changes to allow using backreferences in SetEnvIfExpr - automatically add the correct entries to the Vary-header if the result of an expression evaluation depends on a request header (can be turned off by setting the AP_EXPR_FLAGS_DONT_VARY flag) - set AP_EXPR_FLAGS_DONT_VARY in mod_log_config's conditional logging - fix various off-by-one errors in req_table_func

Add SetEnvIfExpr directive to set env var depending on expression.

use temp_pool for some temporary regexps

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

odd assortment of spelling fixes

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.

C++ comments are not supported by some compilers (ReliantUnix).

Catch up with the changes to mod_ssl and rename the function pointer to reflect the change. With this change this module now builds again.

* modules/metadata/mod_setenvif.c: Unconditionally include mod_ssl.h. (setenvif_post_config): Fix prototype fubar.

Allow extraction of the values of SSL certificate extensions into environment variables, so that their value can be used by any module that is aware of environment variables, as in: SetEnvIf OID("2.16.840.1.113730.1.13") "(.*) Generated (Certificate)" ca=$1 sets ca=TinyCA if the cert was issued by TinyCA. Similarly, SetenvIf OID("2.16.840.1.113730.1.13") "(.*)" NetscapeComment=$1 will set $NetscapeComment to the whole string. It is technically allowed to have multiple instances of an extension field, all with the same oid. In this case, the environment variable will be set to the list of all fields, separated by commas. The [PATCH] uses a cross-module call from mod_setenvif to mod_ssl (the latter may also be missing: in this case the variable will never be set). It calls a common function in the ssl module that is also used for the SSLRequire directive's test.

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.

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

remove support for Remote_User variable, which never worked at all. PR: 25725

fix name of The Apache Software Foundation

fix copyright dates according to the first check in

apply Apache License, Version 2.0

catch another edge case

update license to 2004.

fix optimizer to not throw away a regex if it stumbles over it. PR: 24219

Fold in the CAN-2003-0542 regex patch.

Extend the SetEnvIf directive to capture subexpressions of the matched value.

style issues. no code changes.

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

Fix for BrowserMatchNoCase, which was incorrectly treating non-regex patterns as case-sensitive Submitted by: Andr�� Malo Reviewed by: Brian Pane

Add a SERVER_ADDR keyword to match the CGI environment variable, to allow conditional setting according to the IP address on which the server received the request.

Detabbify

Fixed a segfault

fix a build failure with some non-gcc compilers... an example message: "The ":" operator is not allowed between "const char*" and "int"."

Performance fix: When a BrowserMatch or SetEnvIf pattern doesn't actually require regular expression parsing, use a fast string search instead.

Update our copyright for this year.

two performance improvements: - switch from using r->notes to r->request_config - avoid a strcmp() when checking if val eq '!' PR: Obtained from: Submitted by: Reviewed by:

This patch changes the apr_table_elts macro so that it provides access to the internals of an apr_table_t via a const pointer instead of the current non-const pointer. Submitted by: Brian Pane <BPane@pacbell.net> Reviewed by: Ian Holsman

Extend mod_setenvif to support specifying regular expressions on the SetEnvIf (and SetEnvIfNoCase) directive attribute field. Example: SetEnvIf ^TS* [a-z].* HAVE_TS will cause HAVE_TS to be set if any of the request headers begins with "TS" and has a value that begins with any character in the set [a-z]. [Bill Stoddard]

Enable SetEnvIf to handle taking a regex on the header name (SPECIAL_NOT case). For example: SetEnvIf ^TS* ^[a-z].* HAVE_TS will cause HAVE_TS to be set if a header beginning with TS appears in the request and the value of that header starts with [a-z]

icase is intialized as the result of an (a == b) expression, it makes no sense as an unsigned, and this eliminates all compiler emits from the module

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

toss ENUM_BITFIELD. used in one place (but didn't need to be used), and it certainly wasn't namespace protected.

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.

Make handlers use hooks.

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.

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_

Move all APR functions related to strings to their own directory, and create a new header for those functions. This is the first step to removing the apr/lib directory completely, and moving those files/functions to descriptive directories.

Include strings.h for strcasecmp(), strncasecmp(), and bzero(). Include time.h for time(). This removes a bunch of compiler warnings with gcc -Wall on AIX. Submitted by: Jeff Trawick, Victor Orlikowski

Use the new command-handler initializer macros in a few more modules, cleaning up the resulting warnings.

Bring forward a change from 1.3 (the ability to use SetEnvIf* and BrowserMatch* in .htaccess files).

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

Include ap_config.h before httpd.h, this ensures that AP_USE_HSREGEX is defined correctly in all C files.

Fix compile breaks on Windows.

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.

Start to implement module-defined hooks that are a) fast and b) typesafe. Replace pre_connection module call with a register_hook call and implement pre_connection as a hook. The intent is that these hooks will be extended to allow Apache to be multi-protocol, and also to allow the calling order to be specified on a per-hook/per-module basis. [Ben Laurie] Port a bunch of modules to the new module structure. ["Michael H. Voase" <mvoase@midcoast.com.au>] Submitted by: Ben Laurie

user and ap_auth_type fields were moved from connection_rec to request_rec Submitted by: Ryan Bloom

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