Expression parser: Optimize another concatenation case by using iteration instead of recursion. We have a relatively small recursion limit of about 10 operations. This is a compilation limit (a define). It can be hit if many expr vars or function calls are concatenated. The new optimization is very similar to the existing one, which optimizes consecutive concatenations in node2 of the tree. The new one optimizes consecutive concatenations in node 1.

looks like debug left in r1642154

* Correctly indent

ap_expr: Add filemod function for checking file modification times.

* ap_expr: Fix replace() func when length of "from" != length of "to".

* ap_exr: Add replace(string, from, to) function.

tab vs space

Silent some cppcheck warnings.

Do not use deprecated define. No change in generated code because MODULE_MAGIC_NUMBER is defined as: #define MODULE_MAGIC_NUMBER MODULE_MAGIC_NUMBER_MAJOR

Tweak a AP_DEBUG_ASSERT condition. Valid index to use 'req_header_var_names' are 0...6

Only include the ldap escaping if present within APR.

Add the ldap function to the expression API, allowing LDAP filters and distinguished names based on expressions to be escaped correctly to guard against LDAP injection. Note: this requires at least APR v1.6.0 or above for the apr_escape API.

Move two variable assignments off the fast path.

add md5 function, too

simplify code by using ap_bin2hex()

Expression parser: use hex encoding for the sha1 hash.

Remove the comment, this is done.

Expression parser: Add the ability to apply a SHA1 hash to strings within the parser.

Expression parser: Add the ability to base64 encode and base64 decode strings within the parser.

Add SERVER_PROTOCOL_VERSION, SERVER_PROTOCOL_VERSION_MAJOR, SERVER_PROTOCOL_VERSION_MINOR ap_expr variables.

ap_expr: Add req_novary function that allows HTTP header lookups without adding the name to the Vary header

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

Further clarify the naming of the entity that directly connects to us by calling that entity a client instead of a peer.

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

Explicitly cast function pointer, to remove 'const'. Hopefully this makes the NetWare compiler happy.

Fix names of unary operators like '-s' being compared case insensitively. Improve error message if op or function is not found. Document '-s' operator.

Fix a few compiler warning reported by Steffen: - some signed/unsigned mismatches - const for a function does not make sense

Add some more log message tags Remove some log message tags from ap_log_* calls that log lots of different error messages, in particular the config parsing errors. Not sure how we should handle those. ssl_util.c: Downgrade some dynamic locking messages from level DEBUG to TRACE1-3

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.

Hello. Let's compile again.

Add the ability to access the connection level remote IP address from the expression parser.

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).

clarify comment remove broken recursion counting bits

Limit recursion in ap_expr evaluation to avoid unbounded stack usage * evaluate chains of ||, &&, and string concatenation non-recursively * limit other types of recursion to 20 levels * avoid some string copies if concatenating more than 2 strings

regex related cleanups: - use AP_MAX_REG_MATCH where appropriate - in mod_proxy_ftp, compile the "ls -s1" regex only once instead of once per request - add some coments

More cleanup: Expand tabs and some more indentation fixes No functional change

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

Do proper length checks in the expression scanner. This allows to remove the 8K length limit for expressions. Strings/Regexs in an expression are still limited to 8K, though.

Use ap_unescape_url_keep2f() in ap_expr unescape func. ap_unescape_url() forbidding encoded slashes is not useful here. Log failures. Improve docs.

Make the SERVER_NAME variable include [ ] for literal IPv6 addresses, as mandated by RFC 3875 PR: 26005

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

Add REQUEST_STATUS variable to ap_expr

We already have ap_str_tolower(), so also add ap_str_toupper() function and use it where possible.

Introduce ap_(get|set)_core_module_config() functions/macros and use them everywhere. We know that the core module has module_index 0. Therefore we can save some pointer operations in ap_get_module_config(cv, &core_module) and ap_set_module_config(cv, &core_module, val). As these are called rather often, this may actually have some (small) measurable effect.

- Introduce concept of context prefix (which is an URL prefix) and context document root (which is the file system directory that this URL prefix is mapped to). This generalization of the document root makes it easier for scripts to create self-referential URLs and to find their files. - Expose CONTEXT_DOCUMENT_ROOT and CONTEXT_PREFIX as envvars, in mod_rewrite, and in ap_expr. - Make mod_alias and mod_userdir set the context information. - Allow to override the document root on a per-request basis. This allows mass vhosting modules to set DOCUMENT_ROOT correctly. - Make mod_vhost_alias set the per-request document root PR: 26052, 46198, 49705 Remaining tasks: - Use the context document root & prefix in mod_rewrite to make RewriteBase unneccessary in many cases. Do this without breaking compatibility. - Write docs.

Fix wrong condition that may lead to NULL being set as 'Vary' header

Add some features to ap_expr for use by mod_include: * a restricted mode that does not allow to bypass request access restrictions * new variables DOCUMENT_URI (alias for REQUEST_URI), LAST_MODIFIED * -A as an alias for -U * an additional data entry in ap_expr_eval_ctx_t for use by the consumer * an extensible ap_expr_exec_ctx() API that allows to use that data entry

Also add the -U and -F operators for doing subrequest lookups to ap_expr.

Add various file existance test operators to ap_expr

* server/util_expr_eval.c (req_table_func): Try r->err_headers_out for response headers if given header is not found in r->headers_out (e.g. as with non-standard headers from CGI scripts).

Add mod_rewrite's SCRIPT_USER/SCRIPT_GROUP vars to ap_expr

Add -T operator to allow easy evaluation of on/off, 1/0, ... variables

indentation + coding style fixes

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

- add -ipmatch, -str(c)match, -fnmatch, -R operators to ap_expr - allow lookup function to pre-parse string constant arguments (used for subnet masks so far) - various bug fixes for binary operators - do strdup() for error messages created on the stack to avoid corruption

Fix another Windows build issue: Add a wrapper around ap_run_expr_lookup with the correct calling convention.

Fix for picky compilers.

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

ap_expr related fixes/enhancements: - implement regex backreferences and make them available for setting envvars in SetEnvIfExpr - implement nested function calls in %-syntax: %{func1:%{func2:arg}} - actually implement evaluation of concatenation operator (oops...) - Fix <If ... > treating an internal error as success

Don't compile expr_dump_tree() by default

Check input lenght to avoid potential overflows

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

support error log id as variables

Support %{HANDLER} in ap_expr (required for mod_filter) Update mod_filter docs

Implement "reqenv", "note", "-z", "-n" in ap_expr. Make "env" ssl_expr compatible

Port "file" function from ssl_expr

More fixes for picky compilers

Implement "HTTPS" and "IPV6" vars in ap_expr

Netware build fixes Submitted by: NormW <normw gknw net>

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