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

Merge pull request #944 from pagespeed/morlovich-api-adjust-InitiatePropertyCacheLookup

Browse Source 
Adjust to API change to InitiatePropertyCacheLookup
This commit is contained in:
Maks Orlovich
2015-04-01 14:08:33 -04:00
parent ec2dea84fe 5658c20327
commit 6b2999dfd4
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ngx_pagespeed.cc
+4 -6
View File
@@ -344,7 +344,7 @@ ngx_int_t ps_base_fetch_handler(ngx_http_request_t* r) {
if (rc == NGX_ERROR) {
ps_set_buffered(r, false);
ps_release_base_fetch(ctx);
ps_release_base_fetch(ctx);
return NGX_HTTP_INTERNAL_SERVER_ERROR;
}
@@ -355,7 +355,7 @@ ngx_int_t ps_base_fetch_handler(ngx_http_request_t* r) {
if (rc == NGX_OK) {
ps_set_buffered(r, false);
ps_release_base_fetch(ctx);
ps_release_base_fetch(ctx);
}
return ps_base_fetch_filter(r, cl);
@@ -1709,7 +1709,7 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
ps_release_base_fetch(ctx);
return NGX_DECLINED;
}
CHECK(!(html_rewrite && (ctx == NULL || ctx->html_rewrite == false)));
if (!html_rewrite &&
@@ -1913,7 +1913,6 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
driver->set_pagespeed_option_cookies(pagespeed_option_cookies);
// TODO(jefftk): FlushEarlyFlow would go here.
bool page_callback_added = false;
ProxyFetchPropertyCallbackCollector* property_callback =
ProxyFetchFactory::InitiatePropertyCacheLookup(
!html_rewrite /* is_resource_fetch */,
@@ -1921,8 +1920,7 @@ ngx_int_t ps_resource_handler(ngx_http_request_t* r,
cfg_s->server_context,
options,
ctx->base_fetch,
false /* requires_blink_cohort (no longer unused) */,
&page_callback_added);
false /* requires_blink_cohort (no longer unused) */);
// Will call StartParse etc. The rewrite driver will take care of deleting
// itself if necessary.