Deprecate ModPagespeedInheritVHostConfig.

This commit is contained in:
Steve Hill
2016-09-29 15:12:39 -04:00
parent f6bc6c5472
commit 4c30b08ad9
2 changed files with 11 additions and 4 deletions
+3 -3
View File
@@ -3,9 +3,9 @@
# can set this to "off".
ModPagespeed on
# We want VHosts to inherit global configuration.
# If this is not included, they'll be independent (except for inherently
# global options), at least for backwards compatibility.
# VHosts should inherit global configuration.
# This option is only for backwards compatibility and will be removed
# in the next major mod_pagespeed release.
ModPagespeedInheritVHostConfig on
# Direct Apache to send all HTML output to the mod_pagespeed
+8 -1
View File
@@ -1490,10 +1490,17 @@ static const char* ParseDirective(cmd_parms* cmd, void* data, const char* arg) {
arg);
} else if (StringCaseEqual(directive, kModPagespeedInheritVHostConfig)) {
ret = CheckGlobalOption(cmd, kErrorInVHost, handler);
if (ret == NULL) {
if (ret == nullptr) {
ret = ParseOption<bool>(
factory, cmd,
&ApacheRewriteDriverFactory::set_inherit_vhost_config, arg);
if (ret == nullptr && !factory->inherit_vhost_config()) {
handler->Message(kWarning,
"%s has been deprecated and will be forced to \"on\" "
"in the next major mod_pagespeed release. You should "
"update your config",
kModPagespeedInheritVHostConfig);
}
}
} else if (StringCaseEqual(directive,
kModPagespeedCollectRefererStatistics) ||