Commit efde8665 authored by webchick's avatar webchick

Issue #1831076 by ACF, Albert Volkman: Convert omit_vary_cookie() to cmi.

parent e200408f
...@@ -1391,7 +1391,7 @@ function drupal_serve_page_from_cache(stdClass $cache) { ...@@ -1391,7 +1391,7 @@ function drupal_serve_page_from_cache(stdClass $cache) {
// response to reply to a subsequent request for a given URL without // response to reply to a subsequent request for a given URL without
// revalidation. If a Vary header has been set in hook_boot(), it is assumed // revalidation. If a Vary header has been set in hook_boot(), it is assumed
// that the module knows how to cache the page. // that the module knows how to cache the page.
if (!isset($hook_boot_headers['vary']) && !variable_get('omit_vary_cookie')) { if (!isset($hook_boot_headers['vary']) && !config('system.performance')->get('cache.page.omit_vary_cookie')) {
header('Vary: Cookie'); header('Vary: Cookie');
} }
......
cache: cache:
page: page:
enabled: '0' enabled: '0'
omit_vary_cookie: ''
max_age: '0' max_age: '0'
css: css:
preprocess: '0' preprocess: '0'
......
...@@ -1872,6 +1872,7 @@ function system_update_8017() { ...@@ -1872,6 +1872,7 @@ function system_update_8017() {
'page_compression' => 'response.gzip', 'page_compression' => 'response.gzip',
'preprocess_css' => 'css.preprocess', 'preprocess_css' => 'css.preprocess',
'preprocess_js' => 'js.preprocess', 'preprocess_js' => 'js.preprocess',
'omit_vary_cookie' => 'omit_vary_cookie',
'stale_file_threshold' => 'stale_file_threshold', 'stale_file_threshold' => 'stale_file_threshold',
)); ));
} }
......
...@@ -444,7 +444,7 @@ ...@@ -444,7 +444,7 @@
* HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid * HTTP proxy, and bypass the reverse proxy if one is used) in order to avoid
* getting cached pages from the proxy. * getting cached pages from the proxy.
*/ */
# $conf['omit_vary_cookie'] = TRUE; # $conf['system.performance']['cache']['page']['omit_vary_cookie'] = TRUE;
/** /**
* CSS/JS aggregated file gzip compression: * CSS/JS aggregated file gzip compression:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment