diff options
| author | Jim Jagielski <jim@apache.org> | 2016-02-11 19:06:16 +0000 |
|---|---|---|
| committer | Jim Jagielski <jim@apache.org> | 2016-02-11 19:06:16 +0000 |
| commit | e739a90d8ef41445880449439aeedb5767fce5f0 (patch) | |
| tree | bed350116cb73d06f9947a3ce65b06c3823935d6 /include | |
| parent | 89db7906e4a88e3ec8183f94cb54c77c66037007 (diff) | |
| download | httpd-e739a90d8ef41445880449439aeedb5767fce5f0.tar.gz | |
Merge r1725149, r1726233, r1729374, r1729374 from trunk:
allow expressions to be used in SetHandler. Opt-in with expr= prefix.
from feedback, assume all parameters to SetHandler are expressions.
I couldnt come up with a plausible handler name that was an
invalid expression.
1726233 temporarily broke UDS r->handler case sensitivity
1726233 temporarily broke UDS r->handler case sensitivity
Submitted by: covener
Reviewed/backported by: jim
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1729876 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_mmn.h | 3 | ||||
| -rw-r--r-- | include/http_core.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/ap_mmn.h b/include/ap_mmn.h index 3233ef8027..aa6dfd080d 100644 --- a/include/ap_mmn.h +++ b/include/ap_mmn.h @@ -457,6 +457,7 @@ * ap_get_protocol(). Add HTTP_MISDIRECTED_REQUEST. * Added ap_parse_token_list_strict() to httpd.h * 20120211.52 (2.4.17-dev) Add master conn_rec* member in conn_rec. + * 20120211.53 (2.4.17-dev) Add epxr_hander to core_dir_config. */ #define MODULE_MAGIC_COOKIE 0x41503234UL /* "AP24" */ @@ -464,7 +465,7 @@ #ifndef MODULE_MAGIC_NUMBER_MAJOR #define MODULE_MAGIC_NUMBER_MAJOR 20120211 #endif -#define MODULE_MAGIC_NUMBER_MINOR 52 /* 0...n */ +#define MODULE_MAGIC_NUMBER_MINOR 53 /* 0...n */ /** * Determine if the server's current MODULE_MAGIC_NUMBER is at least a diff --git a/include/http_core.h b/include/http_core.h index 85354552c1..97cb864072 100644 --- a/include/http_core.h +++ b/include/http_core.h @@ -565,7 +565,7 @@ typedef struct { ap_regex_t *r; const char *mime_type; /* forced with ForceType */ - const char *handler; /* forced with SetHandler */ + const char *handler; /* forced by something other than SetHandler */ const char *output_filters; /* forced with SetOutputFilters */ const char *input_filters; /* forced with SetInputFilters */ int accept_path_info; /* forced with AcceptPathInfo */ @@ -642,7 +642,7 @@ typedef struct { */ unsigned int cgi_pass_auth : 2; unsigned int qualify_redirect_url :2; - + ap_expr_info_t *expr_handler; /* forced with SetHandler */ } core_dir_config; /* macro to implement off by default behaviour */ |