artox/incubator-pagespeed-ngx
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

config: remove ModPagespeedInheritVHostConfig

Browse Source
This commit is contained in:
Jeff Kaufman
2016-10-05 13:35:14 -04:00
parent 11a6223a63
commit 833e586bdf
11 changed files with 78 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files
install/Makefile.tests
-15
View File
@@ -131,26 +131,11 @@ apache_debug_smoke_test : apache_install_conf apache_debug_install
sed -e "s/# ModPagespeedStatistics off/ModPagespeedStatistics off/" \
< $(APACHE_DEBUG_PAGESPEED_CONF).save \
> $(APACHE_DEBUG_PAGESPEED_CONF)
grep ModPagespeedStatistics $(APACHE_DEBUG_PAGESPEED_CONF)
grep ModPagespeedInheritVHostConfig $(APACHE_DEBUG_PAGESPEED_CONF)
$(MAKE) stop
$(MAKE) start
CACHE_FLUSH_TEST=on \
$(APACHE_SYSTEM_TEST) $(APACHE_SERVER) $(APACHE_HTTPS_SERVER)
#
# Now turn off ModPagespeedInheritVHostConfig, turn stats back on.
@echo '***' System-test without InheritVhostConfig, stats on.
sed -e "s/InheritVHostConfig on/InheritVHostConfig off/" \
< $(APACHE_DEBUG_PAGESPEED_CONF).save \
> $(APACHE_DEBUG_PAGESPEED_CONF)
grep ModPagespeedStatistics $(APACHE_DEBUG_PAGESPEED_CONF)
grep ModPagespeedInheritVHostConfig $(APACHE_DEBUG_PAGESPEED_CONF)
$(MAKE) stop
$(MAKE) start
CACHE_FLUSH_TEST=on \
NO_VHOST_MERGE=on \
$(APACHE_SYSTEM_TEST) $(APACHE_SERVER) $(APACHE_HTTPS_SERVER)
#
# Restore config
mv $(APACHE_DEBUG_PAGESPEED_CONF).save $(APACHE_DEBUG_PAGESPEED_CONF)
$(MAKE) apache_debug_stop
install/common/pagespeed.conf.template
-5
View File
@@ -3,11 +3,6 @@
# can set this to "off".
ModPagespeed on
# 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
# output handler.
AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
install/debug.conf.template
-2
View File
@@ -1578,8 +1578,6 @@ ModPagespeedMessagesDomains Allow localhost
#
# TODO(jmarantz): add a test-path where we set this in a VirtualHost and
# make sure the right error message comes out.
#LOADTEST # Don't want global slurp inheriting into :8080
#LOADTEST ModPagespeedInheritVHostConfig off
#LOADTEST ModPagespeedMessageBufferSize 100000
#LOADTEST
#LOADTEST # We want backtraces to be dumped during the load test, as
install/demo.conf
-5
View File
@@ -33,11 +33,6 @@ SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip
ModPagespeedEnableCachePurge 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.
ModPagespeedInheritVHostConfig on
# Direct Apache to send all HTML output to the mod_pagespeed
# output handler.
AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
install/modpagespeed.com-configuration-example.conf
-5
View File
@@ -33,11 +33,6 @@ SetEnvIfNoCase Request_URI \.(?:gif|jpe?g|png)$ no-gzip
ModPagespeedEnableCachePurge 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.
ModPagespeedInheritVHostConfig on
# Direct Apache to send all HTML output to the mod_pagespeed
# output handler.
AddOutputFilterByType MOD_PAGESPEED_OUTPUT_FILTER text/html
net/instaweb/genfiles/conf/pagespeed_libraries.conf
-6
View File
@@ -964,16 +964,10 @@
ModPagespeedLibrary 5592 urJHhxiOsmRp4do4Vw3Vj //ajax.googleapis.com/ajax/libs/incrementaldom/0.5.0/incremental-dom-min.js
# incrementaldom/0.5.0/incremental-dom.js:
ModPagespeedLibrary 11419 1F6rEe2Z4OMhAf9pnAx_- //ajax.googleapis.com/ajax/libs/incrementaldom/0.5.0/incremental-dom-min.js
# incrementaldom/0.5.1/incremental-dom-min.js:
ModPagespeedLibrary 5592 urJHhxiOsmRp4do4Vw3Vj //ajax.googleapis.com/ajax/libs/incrementaldom/0.5.1/incremental-dom-min.js
# incrementaldom/0.5.1/incremental-dom.js:
ModPagespeedLibrary 11419 1F6rEe2Z4OMhAf9pnAx_- //ajax.googleapis.com/ajax/libs/incrementaldom/0.5.1/incremental-dom-min.js
# incrementaldom/0.2.0/incremental-dom-cjs.js:
ModPagespeedLibrary 11354 S_LIf24KXb55Az7hAlAjc //ajax.googleapis.com/ajax/libs/incrementaldom/0.2.0/incremental-dom-cjs.js
# incrementaldom/0.5.0/incremental-dom-cjs.js:
ModPagespeedLibrary 14485 uKKrcEd5YzPV15XxeVSHS //ajax.googleapis.com/ajax/libs/incrementaldom/0.5.0/incremental-dom-cjs.js
# incrementaldom/0.5.1/incremental-dom-cjs.js:
ModPagespeedLibrary 14485 uKKrcEd5YzPV15XxeVSHS //ajax.googleapis.com/ajax/libs/incrementaldom/0.5.1/incremental-dom-cjs.js
# jquery/1.10.0/jquery.min.js:
ModPagespeedLibrary 92896 EP2UzSkIeDw4ly08GjZq9 //ajax.googleapis.com/ajax/libs/jquery/1.10.0/jquery.min.js
# jquery/1.10.0/jquery.js:
pagespeed/apache/apache_rewrite_driver_factory.cc
+1 -2
View File
@@ -63,8 +63,7 @@ ApacheRewriteDriverFactory::ApacheRewriteDriverFactory(
apache_message_handler_(new ApacheMessageHandler(
server_rec_, version_, timer(), thread_system()->NewMutex())),
apache_html_parse_message_handler_(new ApacheMessageHandler(
server_rec_, version_, timer(), thread_system()->NewMutex())),
inherit_vhost_config_(false) {
server_rec_, version_, timer(), thread_system()->NewMutex())) {
apr_pool_create(&pool_, NULL);
// Apache defaults UsePerVhostStatistics to false for historical reasons, but
pagespeed/apache/apache_rewrite_driver_factory.h
-12
View File
@@ -64,15 +64,6 @@ class ApacheRewriteDriverFactory : public SystemRewriteDriverFactory {
ApacheServerContext* MakeApacheServerContext(server_rec* server);
// If true, virtual hosts should inherit global configuration.
bool inherit_vhost_config() const {
return inherit_vhost_config_;
}
void set_inherit_vhost_config(bool x) {
inherit_vhost_config_ = x;
}
// Notification of apache tearing down a context (vhost or top-level)
// corresponding to given ApacheServerContext. Returns true if it was
// the last context.
@@ -149,9 +140,6 @@ class ApacheRewriteDriverFactory : public SystemRewriteDriverFactory {
// writes to the same shared memory which is owned by the factory.
ApacheMessageHandler* apache_html_parse_message_handler_;
// Inherit configuration from global context into vhosts.
bool inherit_vhost_config_;
DISALLOW_COPY_AND_ASSIGN(ApacheRewriteDriverFactory);
};
pagespeed/apache/mod_instaweb.cc
+19 -35
View File
@@ -199,8 +199,6 @@ const char kModPagespeedHashRefererStatistics[] =
const char kModPagespeedRefererStatisticsOutputLevel[] =
"ModPagespeedRefererStatisticsOutputLevel";
static bool warned_about_inherit_deprecation = false;
enum RewriteOperation {REWRITE, FLUSH, FINISH};
// TODO(sligocki): Move inside PSOL.
@@ -1491,18 +1489,12 @@ static const char* ParseDirective(cmd_parms* cmd, void* data, const char* arg) {
ret = ParseOption<RewriteOptions::EnabledEnum>(
static_cast<RewriteOptions*>(config), cmd, &RewriteOptions::set_enabled,
arg);
} else if (StringCaseEqual(directive, kModPagespeedInheritVHostConfig)) {
ret = CheckGlobalOption(cmd, kErrorInVHost, handler);
if (ret == nullptr) {
ret = ParseOption<bool>(
factory, cmd,
&ApacheRewriteDriverFactory::set_inherit_vhost_config, arg);
}
} else if (StringCaseEqual(directive,
kModPagespeedCollectRefererStatistics) ||
StringCaseEqual(directive, kModPagespeedDisableForBots) ||
StringCaseEqual(directive, kModPagespeedGeneratedFilePrefix) ||
StringCaseEqual(directive, kModPagespeedHashRefererStatistics) ||
StringCaseEqual(directive, kModPagespeedInheritVHostConfig) ||
StringCaseEqual(directive, kModPagespeedNumShards) ||
StringCaseEqual(directive, kModPagespeedStatisticsLoggingFile) ||
StringCaseEqual(directive,
@@ -1805,9 +1797,9 @@ static const command_rec mod_pagespeed_filter_cmds[] = {
APACHE_CONFIG_OPTION(kModPagespeedImgMaxRewritesAtOnce,
"DEPRECATED, use ModPagespeedImageMaxRewritesAtOnce."),
APACHE_CONFIG_OPTION(kModPagespeedInheritVHostConfig,
"Inherit global configuration into VHosts."),
"No longer used."),
APACHE_CONFIG_OPTION(kModPagespeedInstallCrashHandler,
"Try to dump backtrace on crashes. For developer use"),
"Try to dump backtrace on crashes. For developer use"),
APACHE_CONFIG_OPTION(kModPagespeedMessageBufferSize,
"Set the size of buffer used for /mod_pagespeed_message."),
APACHE_CONFIG_OPTION(kModPagespeedNumRewriteThreads,
@@ -1947,31 +1939,23 @@ void* merge_server_config(apr_pool_t* pool, void* base_conf, void* new_conf) {
static_cast<ApacheServerContext*>(base_conf);
ApacheServerContext* vhost_context =
static_cast<ApacheServerContext*>(new_conf);
if (global_context->apache_factory()->inherit_vhost_config()) {
scoped_ptr<ApacheConfig> merged_config(
global_context->global_config()->Clone());
merged_config->Merge(*vhost_context->global_config());
// Note that we don't need to do any special handling of cache paths here,
// since it's all related to actually creating the directories + giving
// permissions, so doing it at top-level is sufficient.
vhost_context->reset_global_options(merged_config.release());
// Merge the overlays, if any exist. (SPDY one no longer supported).
if (global_context->has_non_spdy_config_overlay() ||
vhost_context->has_non_spdy_config_overlay()) {
scoped_ptr<ApacheConfig> new_non_spdy_overlay(
global_context->NonSpdyConfigOverlay()->Clone());
new_non_spdy_overlay->Merge(*vhost_context->NonSpdyConfigOverlay());
vhost_context->set_non_spdy_config_overlay(
new_non_spdy_overlay.release());
}
} else if (!warned_about_inherit_deprecation) {
warned_about_inherit_deprecation = true;
global_context->apache_factory()->message_handler()->Message(
kWarning,
"%s will be forced to \"on\" in the next major mod_pagespeed release. "
"You should add this to your config.",
kModPagespeedInheritVHostConfig);
scoped_ptr<ApacheConfig> merged_config(
global_context->global_config()->Clone());
merged_config->Merge(*vhost_context->global_config());
// Note that we don't need to do any special handling of cache paths here,
// since it's all related to actually creating the directories + giving
// permissions, so doing it at top-level is sufficient.
vhost_context->reset_global_options(merged_config.release());
// Merge the overlays, if any exist. (SPDY one no longer supported).
if (global_context->has_non_spdy_config_overlay() ||
vhost_context->has_non_spdy_config_overlay()) {
scoped_ptr<ApacheConfig> new_non_spdy_overlay(
global_context->NonSpdyConfigOverlay()->Clone());
new_non_spdy_overlay->Merge(*vhost_context->NonSpdyConfigOverlay());
vhost_context->set_non_spdy_config_overlay(
new_non_spdy_overlay.release());
}
return new_conf;
pagespeed/apache/system_test.sh
+54 -74
View File
@@ -10,8 +10,6 @@
# APACHE_LOG to the log file.
#
# CACHE_FLUSH_TEST=on can be passed to test our cache.flush behavior
# NO_VHOST_MERGE=on can be passed to tell tests to assume
# that ModPagespeedInheritVHostConfig has been turned off.
if [ -z $APACHE_DEBUG_PAGESPEED_CONF ]; then
APACHE_DEBUG_PAGESPEED_CONF=/usr/local/apache2/conf/pagespeed.conf
@@ -33,7 +31,7 @@ MESSAGES_HANDLER="mod_pagespeed_message"
HEADERS_FINALIZED=false
CACHE_FLUSH_TEST=${CACHE_FLUSH_TEST:-off}
NO_VHOST_MERGE=${NO_VHOST_MERGE:-off}
SKIP_EXTERNAL_RESOURCE_TESTS=${SKIP_EXTERNAL_RESOURCE_TESTS:-false}
SUDO=${SUDO:-}
# TODO(jkarlin): Should we just use a vhost instead? If so, remember to update
# all scripts that use TEST_PROXY_ORIGIN.
@@ -261,30 +259,28 @@ check \
[ $(grep -ce "href=\"/mod_pagespeed_test/" $OUTDIR/redirect_php.html) = 2 ];
if [ "$SECONDARY_HOSTNAME" != "" ]; then
if [ "$NO_VHOST_MERGE" = "on" ]; then
start_test PageSpeed Unplugged and Off
SPROXY="http://localhost:$APACHE_SECONDARY_PORT"
VHOST_MPS_OFF="http://mpsoff.example.com"
VHOST_MPS_UNPLUGGED="http://mpsunplugged.example.com"
SITE="mod_pagespeed_example"
ORIGINAL="$SITE/styles/yellow.css"
FILTERED="$SITE/styles/A.yellow.css.pagespeed.cf.KM5K8SbHQL.css"
start_test PageSpeed Unplugged and Off
SPROXY="http://localhost:$APACHE_SECONDARY_PORT"
VHOST_MPS_OFF="http://mpsoff.example.com"
VHOST_MPS_UNPLUGGED="http://mpsunplugged.example.com"
SITE="mod_pagespeed_example"
ORIGINAL="$SITE/styles/yellow.css"
FILTERED="$SITE/styles/A.yellow.css.pagespeed.cf.KM5K8SbHQL.css"
# PageSpeed unplugged does not serve .pagespeed. resources.
http_proxy=$SPROXY check_not $WGET -O /dev/null \
$VHOST_MPS_UNPLUGGED/$FILTERED
# PageSpeed off does serve .pagespeed. resources.
http_proxy=$SPROXY check $WGET -O /dev/null $VHOST_MPS_OFF/$FILTERED
# PageSpeed unplugged does not serve .pagespeed. resources.
http_proxy=$SPROXY check_not $WGET -O /dev/null \
$VHOST_MPS_UNPLUGGED/$FILTERED
# PageSpeed off does serve .pagespeed. resources.
http_proxy=$SPROXY check $WGET -O /dev/null $VHOST_MPS_OFF/$FILTERED
# PageSpeed unplugged doesn't rewrite HTML, even when asked via query.
OUT=$(http_proxy=$SPROXY check $WGET -S -O - \
# PageSpeed unplugged doesn't rewrite HTML, even when asked via query.
OUT=$(http_proxy=$SPROXY check $WGET -S -O - \
$VHOST_MPS_UNPLUGGED/$SITE/?PageSpeed=on 2>&1)
check_not_from "$OUT" grep "X-Mod-Pagespeed:"
# PageSpeed off does rewrite HTML if asked.
OUT=$(http_proxy=$SPROXY check $WGET -S -O - \
check_not_from "$OUT" grep "X-Mod-Pagespeed:"
# PageSpeed off does rewrite HTML if asked.
OUT=$(http_proxy=$SPROXY check $WGET -S -O - \
$VHOST_MPS_OFF/$SITE/?PageSpeed=on 2>&1)
check_from "$OUT" grep "X-Mod-Pagespeed:"
fi
check_from "$OUT" grep "X-Mod-Pagespeed:"
start_test MapProxyDomain for CDN setup
# Test transitive ProxyMapDomain. In this mode we have three hosts: cdn,
@@ -355,14 +351,12 @@ if [ "$CACHE_FLUSH_TEST" = "on" ]; then
check [ $(grep -c "pagespeed.addInstrumentationInit('/$BEACON_HANDLER', 'beforeunload', '', '$SECONDARY_TEST_ROOT/add_instrumentation.html');" $WGET_OUTPUT) = 1 ]
check [ $(grep -c "pagespeed.addInstrumentationInit('/$BEACON_HANDLER', 'load', '', '$SECONDARY_TEST_ROOT/add_instrumentation.html');" $WGET_OUTPUT) = 1 ]
if [ "$NO_VHOST_MERGE" = "on" ]; then
start_test When ModPagespeedMaxHtmlParseBytes is not set, we do not insert \
a redirect.
OUT=$(http_proxy=$SECONDARY_HOSTNAME $WGET_DUMP \
$SECONDARY_TEST_ROOT/large_file.html?PageSpeedFilters=)
check_not_from "$OUT" fgrep -q "window.location="
check_from "$OUT" fgrep -q "Lorem ipsum dolor sit amet"
fi
start_test When ModPagespeedMaxHtmlParseBytes is not set, we do not insert \
a redirect.
OUT=$(http_proxy=$SECONDARY_HOSTNAME $WGET_DUMP \
$SECONDARY_TEST_ROOT/large_file.html?PageSpeedFilters=)
check_not_from "$OUT" fgrep -q "window.location="
check_from "$OUT" fgrep -q "Lorem ipsum dolor sit amet"
start_test Cache flushing works by touching cache.flush in cache directory.
@@ -486,10 +480,9 @@ if [ "$CACHE_FLUSH_TEST" = "on" ]; then
# on "ModPagespeedDomain modpagespeed.com:1023" in debug.conf.template. Also
# relies on running after a cache-flush to avoid bypassing the serf fetch,
# since mod_pagespeed remembers fetch-failures in its cache for 5 minutes.
# Because of the empty cache requirement, we conditionalize it on a single
# value of NO_VHOST_MERGE, so it runs only once per apache_debug_smoke_test
if [ \( $NO_VHOST_MERGE = "on" \) -a \( "${VIRTUALBOX_TEST:-}" = "" \) ]
then
if ! "$SKIP_EXTERNAL_RESOURCE_TESTS" && \
[ "${FIRST_RUN:-}" = "true" ] && [ "${VIRTUALBOX_TEST:-}" = "" ]; then
start_test Connection refused handling
# Monitor the Apache log starting now. tail -F will catch log rotations.
@@ -535,7 +528,7 @@ if [ "$CACHE_FLUSH_TEST" = "on" ]; then
$SERF_REFUSED_PATH
fi
if [ "$NO_VHOST_MERGE" = "on" ]; then
if [ "${FIRST_RUN:-}" = "true" ]; then
# Likewise, blocking rewrite tests are only run once.
start_test Blocking rewrite enabled.
# We assume that blocking_rewrite_test_dont_reuse_1.jpg will not be
@@ -714,34 +707,21 @@ HEADER="--header=PageSpeedFilters:"
HEADER="${HEADER}+remove_quotes,+remove_comments,+collapse_whitespace"
test_forbid_all_disabled "" $HEADER
# Now check stuff on secondary host. The results will depend on whether
# ModPagespeedInheritVHostConfig is on or off. We run this only for some tests,
# since we don't always have the secondary port number available here.
# Now check stuff on secondary host. We run this only for some tests, since we
# don't always have the secondary port number available here.
if [ "$SECONDARY_HOSTNAME" != "" ]; then
SECONDARY_STATS_URL=http://$SECONDARY_HOSTNAME/mod_pagespeed_statistics
SECONDARY_CONFIG_URL=$SECONDARY_STATS_URL?config
if [ "$NO_VHOST_MERGE" = "on" ]; then
start_test Config with VHost inheritance off
echo $WGET_DUMP $SECONDARY_CONFIG_URL
SECONDARY_CONFIG=$($WGET_DUMP $SECONDARY_CONFIG_URL)
check_from "$SECONDARY_CONFIG" fgrep -q "$config_title"
# No inherit, no sharding.
check_not_from "$SECONDARY_CONFIG" egrep -q "http://nonspdy.example.com/"
start_test vhost inheritance works
echo $WGET_DUMP $SECONDARY_CONFIG_URL
SECONDARY_CONFIG=$($WGET_DUMP $SECONDARY_CONFIG_URL)
check_from "$SECONDARY_CONFIG" fgrep -q "$config_title"
# Sharding is applied in this host, thanks to global inherit flag.
check_from "$SECONDARY_CONFIG" egrep -q "http://nonspdy.example.com/"
# Should not inherit the blocking rewrite key.
check_not_from "$SECONDARY_CONFIG" egrep -q "blrw"
else
start_test Config with VHost inheritance on
echo $WGET_DUMP $SECONDARY_CONFIG_URL
SECONDARY_CONFIG=$($WGET_DUMP $SECONDARY_CONFIG_URL)
check_from "$SECONDARY_CONFIG" fgrep -q "$config_title"
# Sharding is applied in this host, thanks to global inherit flag.
check_from "$SECONDARY_CONFIG" egrep -q "http://nonspdy.example.com/"
# We should also inherit the blocking rewrite key.
check_from "$SECONDARY_CONFIG" egrep -q "\(blrw\)[[:space:]]+psatest"
fi
# We should also inherit the blocking rewrite key.
check_from "$SECONDARY_CONFIG" egrep -q "\(blrw\)[[:space:]]+psatest"
if [ -n "$APACHE_LOG" ]; then
start_test Encoded absolute urls are not respected
@@ -804,21 +784,21 @@ if [ "$SECONDARY_HOSTNAME" != "" ]; then
OUT=$($WGET_DUMP "$HOSTNAME/pagespeed_admin/cache?purge=*")
check_from "$OUT" fgrep -q "ModPagespeedEnableCachePurge on"
start_test inline_google_font_css before move_to_head and move_above_scripts
URL="$TEST_ROOT/move_font_css_to_head.html"
URL+="?PageSpeedFilters=inline_google_font_css,"
URL+="move_css_to_head,move_css_above_scripts"
# Make sure the font CSS link tag is eliminated.
fetch_until -save $URL 'grep -c link' 0
# Check that we added fonts to the page.
check [ $(fgrep -c '@font-face' $FETCH_FILE) -gt 0 ]
# Make sure last style line is before first script line.
last_style=$(fgrep -n '<style>' $FETCH_FILE | tail -1 | grep -o '^[^:]*')
first_script=$(\
fgrep -n '<script>' $FETCH_FILE | tail -1 | grep -o '^[^:]*')
check [ "$last_style" -lt "$first_script" ]
if ! "$SKIP_EXTERNAL_RESOURCE_TESTS"; then
start_test inline_google_font_css before move_to_head and move_above_scripts
URL="$TEST_ROOT/move_font_css_to_head.html"
URL+="?PageSpeedFilters=inline_google_font_css,"
URL+="move_css_to_head,move_css_above_scripts"
# Make sure the font CSS link tag is eliminated.
fetch_until -save $URL 'grep -c link' 0
# Check that we added fonts to the page.
check [ $(fgrep -c '@font-face' $FETCH_FILE) -gt 0 ]
# Make sure last style line is before first script line.
last_style=$(fgrep -n '<style>' $FETCH_FILE | tail -1 | grep -o '^[^:]*')
first_script=$(\
fgrep -n '<script>' $FETCH_FILE | tail -1 | grep -o '^[^:]*')
check [ "$last_style" -lt "$first_script" ]
fi
fi
start_test Issue 609 -- proxying non-.pagespeed content, and caching it locally
pagespeed/system/system_test.sh
+4 -20
View File
@@ -53,11 +53,6 @@ function run_post_cache_flush() {
rm -rf $OUTDIR
mkdir -p $OUTDIR
# In Apache users can disable merging the global config into the vhost config.
# If we're running that way then apache_system_test will have set
# NO_VHOST_MERGE to "on".
NO_VHOST_MERGE="${NO_VHOST_MERGE:-off}"
SUDO=${SUDO:-}
start_test Check for correct default pagespeed header format.
@@ -1940,21 +1935,10 @@ if [ "$SECONDARY_HOSTNAME" != "" ]; then
expect_messages anything-c-wildcard deny
# VHost lists deny *
expect_messages nothing-allowed deny
if [ "$NO_VHOST_MERGE" = "on" ]; then
# In Apache the global config may or may not be inherited into the vhost
# config. This affects option merging here, so for some tests we need to
# sets of expectations. If NO_VHOST_MERGE is set, that's equivalent here to
# CLEAR_INHERITED.
# Not listed at any level.
expect_messages messages-not-allowed allow
else
# Not listed at any level.
expect_messages messages-not-allowed deny
# Listed at top level, VHost level lists CLEAR_INHERITED.
expect_messages cleared-inherited deny
fi
# Not listed at any level.
expect_messages messages-not-allowed deny
# Listed at top level, VHost level lists CLEAR_INHERITED.
expect_messages cleared-inherited deny
# No <Handler>Domains listings for these, default is allow.
expect_handler nothing-explicitly-allowed $STATISTICS_HANDLER allow