Skip to content
This repository was archived by the owner on Apr 10, 2025. It is now read-only.

Commit 2af2035

Browse files
jeffkaufmancrowell
authored andcommitted
rewrite-options: don't turn on CoreFilters just because of query params (#1228)
Fixes #1190
1 parent 61f36e0 commit 2af2035

File tree

3 files changed

+20
-1
lines changed

3 files changed

+20
-1
lines changed

src/ngx_rewrite_driver_factory.cc

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,10 +147,19 @@ NamedLockManager* NgxRewriteDriverFactory::DefaultLockManager() {
147147

148148
RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptions() {
149149
NgxRewriteOptions* options = new NgxRewriteOptions(thread_system());
150+
// TODO(jefftk): figure out why using SetDefaultRewriteLevel like
151+
// mod_pagespeed does in mod_instaweb.cc:create_dir_config() isn't enough here
152+
// -- if you use that instead then ngx_pagespeed doesn't actually end up
153+
// defaulting CoreFilters.
154+
// See: https://github.com/pagespeed/ngx_pagespeed/issues/1190
150155
options->SetRewriteLevel(RewriteOptions::kCoreFilters);
151156
return options;
152157
}
153158

159+
RewriteOptions* NgxRewriteDriverFactory::NewRewriteOptionsForQuery() {
160+
return new NgxRewriteOptions(thread_system());
161+
}
162+
154163
bool NgxRewriteDriverFactory::CheckResolver() {
155164
if (use_native_fetcher_ && resolver_ == NULL) {
156165
return false;

src/ngx_rewrite_driver_factory.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,9 @@ class NgxRewriteDriverFactory : public SystemRewriteDriverFactory {
6363
virtual Timer* DefaultTimer();
6464
virtual NamedLockManager* DefaultLockManager();
6565
// Create a new RewriteOptions. In this implementation it will be an
66-
// NgxRewriteOptions.
66+
// NgxRewriteOptions, and it will have CoreFilters explicitly set.
6767
virtual RewriteOptions* NewRewriteOptions();
68+
virtual RewriteOptions* NewRewriteOptionsForQuery();
6869
virtual ServerContext* NewDecodingServerContext();
6970
// Check resolver configured or not.
7071
bool CheckResolver();

test/pagespeed_test.conf.template

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1559,6 +1559,15 @@ http {
15591559
pagespeed FileCachePath "@@FILE_CACHE@@";
15601560
}
15611561

1562+
server {
1563+
pagespeed on;
1564+
listen @@SECONDARY_PORT@@;
1565+
listen [::]:@@SECONDARY_PORT@@;
1566+
server_name debug-filters.example.com;
1567+
pagespeed FileCachePath "@@FILE_CACHE@@";
1568+
pagespeed RewriteLevel PassThrough;
1569+
pagespeed EnableFilters debug;
1570+
}
15621571
server {
15631572
listen @@PRIMARY_PORT@@;
15641573
listen [::]:@@PRIMARY_PORT@@;

0 commit comments

Comments
 (0)