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

Port to handlers.h removal (r3816)

Browse Source
This commit is contained in:
Maks Orlovich
2014-02-28 13:55:12 -05:00
committed by Maks Orlovich
parent 16d40c2430
commit cdbe0eb97d
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_pagespeed.cc
+13 -11
View File
@@ -50,11 +50,11 @@
#include "net/instaweb/rewriter/public/rewrite_options.h" #include "net/instaweb/rewriter/public/rewrite_options.h"
#include "net/instaweb/rewriter/public/rewrite_stats.h" #include "net/instaweb/rewriter/public/rewrite_stats.h"
#include "net/instaweb/rewriter/public/static_asset_manager.h" #include "net/instaweb/rewriter/public/static_asset_manager.h"
#include "net/instaweb/system/public/handlers.h"
#include "net/instaweb/system/public/in_place_resource_recorder.h" #include "net/instaweb/system/public/in_place_resource_recorder.h"
#include "net/instaweb/system/public/system_caches.h" #include "net/instaweb/system/public/system_caches.h"
#include "net/instaweb/system/public/system_request_context.h" #include "net/instaweb/system/public/system_request_context.h"
#include "net/instaweb/system/public/system_rewrite_options.h" #include "net/instaweb/system/public/system_rewrite_options.h"
#include "net/instaweb/system/public/system_server_context.h"
#include "net/instaweb/system/public/system_thread_system.h" #include "net/instaweb/system/public/system_thread_system.h"
#include "net/instaweb/util/public/fallback_property_page.h" #include "net/instaweb/util/public/fallback_property_page.h"
#include "net/instaweb/util/public/google_message_handler.h" #include "net/instaweb/util/public/google_message_handler.h"
@@ -2286,21 +2286,23 @@ ngx_int_t ps_simple_handler(ngx_http_request_t* r,
file_contents.CopyToString(&output); file_contents.CopyToString(&output);
break; break;
} }
case RequestRouting::kStatistics: case RequestRouting::kStatistics: {
error_message = StatisticsHandler( bool is_global_request =
factory, !factory->use_per_vhost_statistics() ||
server_context, StringCaseStartsWith(
request_uri_path, "/ngx_pagespeed_global_statistics");
error_message = server_context->StatisticsHandler(
factory->caches(),
is_global_request ?
factory->statistics() : server_context->statistics(),
NULL, // No SPDY-specific config in ngx_pagespeed. NULL, // No SPDY-specific config in ngx_pagespeed.
!factory->use_per_vhost_statistics() || StringCaseStartsWith(
request_uri_path, "/ngx_pagespeed_global_statistics"),
StringPiece(reinterpret_cast<char*>(r->args.data), r->args.len), StringPiece(reinterpret_cast<char*>(r->args.data), r->args.len),
&content_type, &content_type,
&writer, &writer);
message_handler);
break; break;
}
case RequestRouting::kConsole: case RequestRouting::kConsole:
ConsoleHandler( server_context->ConsoleHandler(server_context->config(), &writer);
server_context, server_context->config(), &writer, message_handler);
break; break;
case RequestRouting::kMessages: { case RequestRouting::kMessages: {
GoogleString log; GoogleString log;