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

Revert "Don't call RewriteDriver::SetUserAgent as the user-agent is already in the request-headers"

Browse Source 
This reverts commit 6ccc1c513b.
This commit is contained in:
Joshua Marantz
2015-10-22 14:13:01 -04:00
parent 6ccc1c513b
commit 90c8ac8a12
1 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_pagespeed.cc
+11
View File
@@ -1903,6 +1903,11 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
custom_options.release(), ctx->base_fetch->request_context()); custom_options.release(), ctx->base_fetch->request_context());
} }
StringPiece user_agent = ctx->base_fetch->request_headers()->Lookup1(
HttpAttributes::kUserAgent);
if (!user_agent.empty()) {
driver->SetUserAgent(user_agent);
}
driver->SetRequestHeaders(*ctx->base_fetch->request_headers()); driver->SetRequestHeaders(*ctx->base_fetch->request_headers());
driver->set_pagespeed_query_params(pagespeed_query_params); driver->set_pagespeed_query_params(pagespeed_query_params);
driver->set_pagespeed_option_cookies(pagespeed_option_cookies); driver->set_pagespeed_option_cookies(pagespeed_option_cookies);
@@ -1943,7 +1948,13 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
custom_options.release(), ctx->base_fetch->request_context()); custom_options.release(), ctx->base_fetch->request_context());
} }
StringPiece user_agent = ctx->base_fetch->request_headers()->Lookup1(
HttpAttributes::kUserAgent);
if (!user_agent.empty()) {
driver->SetUserAgent(user_agent);
}
driver->SetRequestHeaders(*ctx->base_fetch->request_headers()); driver->SetRequestHeaders(*ctx->base_fetch->request_headers());
ctx->driver = driver; ctx->driver = driver;
cfg_s->server_context->message_handler()->Message( cfg_s->server_context->message_handler()->Message(