Commit 55f090ff authored by dpi's avatar dpi
Browse files

Issue #3003716 by dpi, jibran, marcoscano: Coerce bubbled max-age to a floor or ceiling

parent 7c877a59
Loading
Loading
Loading
Loading
+20 −0
Original line number Diff line number Diff line
<?php

/**
 * @file
 * Module install file.
 */

use Drupal\Core\Cache\Cache;

/**
 * Add 'cache_control_override.settings'.
 */
function cache_control_override_update_8101() {
  \Drupal::configFactory()
    ->getEditable('cache_control_override.settings')
    // These values effectively disable max age coercion.
    ->set('max_age.minimum', 0)
    ->set('max_age.maximum', Cache::PERMANENT)
    ->save(TRUE);
}
+18 −0
Original line number Diff line number Diff line
<?php

/**
 * @file
 * Post updates for Cache Control Override.
 */

use Drupal\Core\Cache\Cache;

/**
 * Clear the entity type cache.
 *
 * New arguments added to service
 * 'cache_control_override.cache_control_override_subscriber'.
 */
function cache_control_override_post_update_service_arguments() {
  // Empty post_update hook.
}
+1 −0
Original line number Diff line number Diff line
services:
  cache_control_override.cache_control_override_subscriber:
    class: Drupal\cache_control_override\EventSubscriber\CacheControlOverrideSubscriber
    arguments: ['@config.factory']
    tags:
      - { name: event_subscriber }
  cache_control_override.page_cache_response_policy.deny_on_cache_override:
+3 −0
Original line number Diff line number Diff line
max_age:
  minimum: 0
  maximum: -1
+13 −0
Original line number Diff line number Diff line
cache_control_override.settings:
  type: config_object
  label: 'Cache control override settings'
  mapping:
    max_age:
      type: mapping
      mapping:
        minimum:
          type: integer
          label: 'Minimum max age, if max age is greater than 0. Leave empty to disable.'
        maximum:
          type: integer
          label: 'Maximum max age, if max age is greater than 0. Set to -1 to disable.'
Loading