diff options
author | Stefan Fritsch <sf@apache.org> | 2011-07-02 09:45:00 +0200 |
---|---|---|
committer | Stefan Fritsch <sf@apache.org> | 2011-07-02 09:45:00 +0200 |
commit | 46d4791a5dffee2ea94a136a7febd04b76a05013 (patch) | |
tree | 7d5057b6a15a7a63dc66844a7f283df800985a7d /server/core.c | |
parent | Add REQUEST_STATUS variable to ap_expr (diff) | |
download | apache2-46d4791a5dffee2ea94a136a7febd04b76a05013.tar.xz apache2-46d4791a5dffee2ea94a136a7febd04b76a05013.zip |
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
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1142164 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'server/core.c')
-rw-r--r-- | server/core.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/server/core.c b/server/core.c index d416266304..c2b646408a 100644 --- a/server/core.c +++ b/server/core.c @@ -2285,11 +2285,10 @@ static const char *ifsection(cmd_parms *cmd, void *mconfig, const char *arg) if (!arg[0]) return missing_container_arg(cmd); condition = ap_getword_conf(cmd->pool, &arg); - conf->condition = ap_expr_parse_cmd(cmd, condition, &expr_err, NULL); + conf->condition = ap_expr_parse_cmd(cmd, condition, 0, &expr_err, NULL); if (expr_err) return apr_psprintf(cmd->pool, "Cannot parse condition clause: %s", expr_err); - conf->condition->module_index = APLOG_MODULE_INDEX; } errmsg = ap_walk_config(cmd->directive->first_child, cmd, new_if_conf); |