diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2018-01-12 15:03:32 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-12 15:03:32 -0700 |
| commit | f8afb5168aed810a061d081d3941c9dc9bd633c3 (patch) | |
| tree | 029539470990dd29e272dea53ff6fe1ed8bc1705 /railties/lib | |
| parent | aa0541e686d5e275315670b374b6c379cc67bc33 (diff) | |
| parent | d034f488f9c2d694bcad9950df0310ca869956e0 (diff) | |
| download | rails-f8afb5168aed810a061d081d3941c9dc9bd633c3.tar.gz rails-f8afb5168aed810a061d081d3941c9dc9bd633c3.tar.bz2 rails-f8afb5168aed810a061d081d3941c9dc9bd633c3.zip | |
Merge pull request #31651 from eugeneius/use_sha1_digests
Use SHA-1 for non-sensitive digests by default
Diffstat (limited to 'railties/lib')
| -rw-r--r-- | railties/lib/rails/application/configuration.rb | 1 | ||||
| -rw-r--r-- | railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/railties/lib/rails/application/configuration.rb b/railties/lib/rails/application/configuration.rb index 5d8d6740c8..f02aef94e0 100644 --- a/railties/lib/rails/application/configuration.rb +++ b/railties/lib/rails/application/configuration.rb @@ -102,6 +102,7 @@ module Rails if respond_to?(:active_support) active_support.use_authenticated_message_encryption = true + active_support.use_sha1_digests = true end if respond_to?(:action_controller) diff --git a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt index ae665b960a..b4ef455802 100644 --- a/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt +++ b/railties/lib/rails/generators/rails/app/templates/config/initializers/new_framework_defaults_5_2.rb.tt @@ -25,3 +25,6 @@ # Store boolean values are in sqlite3 databases as 1 and 0 instead of 't' and # 'f' after migrating old data. # Rails.application.config.active_record.sqlite3.represent_boolean_as_integer = true + +# Use SHA-1 instead of MD5 to generate non-sensitive digests, such as the ETag header. +# Rails.application.config.active_support.use_sha1_digests = true |