-*- coding: utf-8 -*-
Changes with Apache 2.5.0
+ *) core: merge AllowEncodedSlashes from the base configuration into
+ (non-default) name-based virtual hosts. [Eric Covener]
+
*) mod_headers: Add 'setifempty' command to Header and RequestHeader.
[Eric Covener]
* ap_condition_if_range()
* 20121222.13 (2.5.0-dev) Add ap_proxy_clear_connection()
* 20121222.14 (2.5.0-dev) Add ap_map_http_request_error()
+ * 20121222.15 (2.5.0-dev) Add allow/decode_encoded_slashes_set to core_dir_config
*/
#define MODULE_MAGIC_COOKIE 0x41503235UL /* "AP25" */
#ifndef MODULE_MAGIC_NUMBER_MAJOR
#define MODULE_MAGIC_NUMBER_MAJOR 20121222
#endif
-#define MODULE_MAGIC_NUMBER_MINOR 14 /* 0...n */
+#define MODULE_MAGIC_NUMBER_MINOR 15 /* 0...n */
/**
* Determine if the server's current MODULE_MAGIC_NUMBER is at least a
/** Max number of Range reversals (eg: 200-300, 100-125) allowed **/
int max_reversals;
+ unsigned int allow_encoded_slashes_set : 1;
+ unsigned int decode_encoded_slashes_set : 1;
} core_dir_config;
/* macro to implement off by default behaviour */
conf->enable_sendfile = new->enable_sendfile;
}
- conf->allow_encoded_slashes = new->allow_encoded_slashes;
- conf->decode_encoded_slashes = new->decode_encoded_slashes;
+ if (new->allow_encoded_slashes_set) {
+ conf->allow_encoded_slashes = new->allow_encoded_slashes;
+ }
+ if (new->decode_encoded_slashes_set) {
+ conf->decode_encoded_slashes = new->decode_encoded_slashes;
+ }
if (new->log) {
if (!conf->log) {
cmd->cmd->name, " must be On, Off, or NoDecode",
NULL);
}
+
+ d->allow_encoded_slashes_set = 1;
+ d->decode_encoded_slashes_set = 1;
+
return NULL;
}