aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge pull request #30367 from ptoomey3/consistent-cache-control-headersAaron Patterson2017-09-052-8/+13
|\ \ | | | | | | Normalize/process Cache-Control headers consistently
| * | Don't touch an unused headerPatrick Toomey2017-08-231-1/+0
| | | | | | | | | | | | | | | | | | The prior logic explictly set `Cache-Control` to `nil`. But, we would only reach that logic if the header was not set to begin with. So, rather than give it any value at all, just leave it alone.
| * | Decouple the merge/normalization and conditional cache control logicPatrick Toomey2017-08-232-5/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The prior logic was trying to do too many things at once. For all responses, we want to perform two distinct steps: * Merge/normalize the `Cache-Control` values found in HTTP headers and those found in the `@cache_control` hash. * Conditionally set a default `Cache-Control` header value when we have an ETag This change separates these concerns since the merge/normalize step should occur for all responses, but the second should only occur when we have already set an ETag/last modified value. Normally ETag middleware will set a default `Cache-Control`, but only if an existing ETag is not already set. So, in the cases where an ETag is set, we need to set the default `Cache-Control` value ourselves.
| * | This constant is no longer usedPatrick Toomey2017-08-221-1/+0
| | |
| * | Let middleware handle default cache behaviorPatrick Toomey2017-08-221-1/+2
| | |
| * | Normalize/process Cach-Control headers consistentlyPatrick Toomey2017-08-221-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the existing logic, the `Cache-Control` header may or may not get normalized by additional logic depending on whether `response.cache_conrol` has been modified. This leads to inconsistent behavior, since sometimes `Cache-Control` can contain whatever a user sets and sometimes it gets normalized, based on the logic inside of `set_conditional_cache_control!`. It seems like this normalization process should happen regardless to ensure consistent behavior.
* | | This commit adds:Assain2017-09-041-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | * Documentation for Duration support added to signed/encrypted cookies * Changelog entries for the duration support and expiry metadata added to cookies [ci skip]
* | | Clarify intentions around method redefinitionsMatthew Draper2017-09-011-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | Don't use remove_method or remove_possible_method just before a new definition: at best the purpose is unclear, and at worst it creates a race condition. Instead, prefer redefine_method when practical, and silence_redefinition_of_method otherwise.
* | | Merge pull request #30433 from ↵Ryuta Kamizono2017-08-291-7/+7
|\ \ \ | | | | | | | | | | | | | | | | y-yagi/fix_cant_modify_forzen_string_error_in_debug_locks Fix `can't modify frozen String` error in `DebugLocks`
| * | | Fix `warning: shadowing outer local variable`yuuji.yaginuma2017-08-281-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes following warnings: ``` actionpack/lib/action_dispatch/middleware/debug_locks.rb:46: warning: shadowing outer local variable - threads ```
| * | | Fix `can't modify frozen String` error in `DebugLocks`yuuji.yaginuma2017-08-281-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `DebugLocks` middleware raises an error as follwing: ``` Puma caught this error: can't modify frozen String (RuntimeError) actionpack/lib/action_dispatch/middleware/debug_locks.rb:97:in `block in render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `each' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `map' actionpack/lib/action_dispatch/middleware/debug_locks.rb:64:in `render_details' actionpack/lib/action_dispatch/middleware/debug_locks.rb:37:in `call' railties/lib/rails/engine.rb:524:in `call' ```
* | | | Merge pull request #30421 from y-yagi/fix_30405Eileen M. Uchitelle2017-08-271-5/+9
|\ \ \ \ | | | | | | | | | | Retrive screenshot in relative path of current directory
| * | | | Retrive screenshot in relative path of current directoryyuuji.yaginuma2017-08-271-5/+9
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In Rails engine `Rails.root `returns the path of the dummy application. Therefore, there is no `tmp` directly where the test is running, so can not get the screenshot. For this reason, instead of directly specifying tmp, retrive screenshot by relative path from the current directory. Fixes #30405
* | | | Merge branch 'master' of github.com:rails/docrailsVijay Dev2017-08-261-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | [ci skip] Fix a typoyui-knk2017-08-181-1/+1
| | | | | | | | | | | | | | | | We always plural form for `resources` method.
* | | | Merge pull request #30418 from yhirano55/use_tt_in_doc_for_actionpackRyuta Kamizono2017-08-266-13/+13
|\ \ \ \ | | | | | | | | | | Use tt in doc for action_pack [ci skip]
| * | | | Use tt in doc for ActionPack [ci skip]Yoshiyuki Hirano2017-08-266-13/+13
| | |/ / | |/| |
* / | | Fix `can't modify frozen String` error in `display_image`yuuji.yaginuma2017-08-261-1/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | Without this, `display_image` raises an error as follwing: ``` RuntimeError: can't modify frozen String rails/actionpack/lib/action_dispatch/system_testing/test_helpers/screenshot_helper.rb:72:in `display_image' rails/actionpack/test/dispatch/system_testing/screenshot_helper_test.rb:40:in `block (2 levels) in <class:ScreenshotHelperTest>' ```
* | | Update links to use https link instead of http [ci skip]Yoshiyuki Hirano2017-08-226-15/+15
| | |
* | | Merge pull request #30121 from assain/add_expires_in_and_expires_at_to_cookiesKasper Timm Hansen2017-08-201-3/+15
|\ \ \ | | | | | | | | Add expiry metadata to Cookies and freshen expires option to support duration
| * | | freshen :expires option with duration support and add expiry metadata to cookiesAssain2017-08-201-3/+15
| |/ /
* | | fix typo in ambiguous route definition error messageZoran Pesic2017-08-181-1/+1
| | |
* | | Use ssl in guide and comment [ci skip]Yoshiyuki Hirano2017-08-191-1/+1
|/ /
* | Deprecate ActionDispatch::TestResponse response aliasesTrevor Wistaff2017-08-071-3/+21
| | | | | | | | https://github.com/rails/rails/issues/30072
* | Merge pull request #29777 from yui-knk/set_content_typeMatthew Draper2017-08-021-3/+2
|\ \ | | | | | | Refactoring `Response#charset=`
| * | Brush up local variables assignmentyui-knk2017-07-131-3/+2
| | |
| * | Use `#set_content_type` instead of `#set_header`yui-knk2017-07-131-1/+1
| | | | | | | | | | | | | | | | | | By this commit, `#set_header` is called only via `#set_content_type`. This commit makes the role of `#charset=` more clear.
* | | Path parameters should default to UTF8eileencodes2017-08-013-10/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit changes the behavior such the path_params now default to UTF8 just like regular parameters. This also changes the behavior such that if a path parameter contains invalid UTF8 it returns a 400 bad request. Previously the behavior was to encode the path params as binary but that's not the same as query params. So this commit makes path params behave the same as query params. It's important to test with a path that's encoded as binary because that's how paths are encoded from the socket. The test that was altered was changed to make the behavior for bad encoding the same as query params. We want to treat path params the same as query params. The params in the test are invalid UTF8 so they should return a bad request. Fixes #29669 *Eileen M. Uchitelle, Aaron Patterson, & Tsukuru Tanimichi*
* | | Use frozen string literal in actionpack/Kir Shatrov2017-07-2968-1/+137
| | |
* | | Fix search input's type & placeholder conflict in Routing Error pageKaan Kölköy2017-07-261-0/+4
| | |
* | | Merge pull request #29919 from kirs/actionpack-frozen-friendlyRafael França2017-07-241-1/+1
|\ \ \ | | | | | | | | Make actionpack frozen string friendly
| * | | Make actionpack frozen string friendlyKir Shatrov2017-07-241-1/+1
| | | |
* | | | Fix regression from multiple mountpoint supportDavid Rodríguez2017-07-242-1/+27
|/ / /
* | | Scrub the invalid paramter value before using it in the errorArthur Neves2017-07-171-1/+1
| | | | | | | | | | | | | | | | | | | | | You should be able to safely use the String error message. So when finding the paramter has an invalid encoding we need to remove the invalid bytes before using it in the error. Otherwise the caller might get another Encoding error if they use the message.
* | | `Response#charset=` uses `default_charset` when `nil` is passedyui-knk2017-07-131-1/+1
|/ /
* | normalize_path used to be nil tolerantAkira Matsuda2017-07-121-0/+1
| | | | | | | | fixes a regression introduced at 8607c25ba7810573733d9b37d0015154ba059f5e
* | [Action Pack] `rubocop -a --only Layout/EmptyLineAfterMagicComment`Koichi ITO2017-07-1110-0/+10
| |
* | Merge pull request #29655 from kirs/frozen-friendly-ap-arMatthew Draper2017-07-109-10/+19
|\ \ | | | | | | Prepare AP and AR to be frozen string friendly
| * | Prepare AP and AR to be frozen string friendlyKir Shatrov2017-07-069-10/+19
| | |
* | | Don't call register on custom driverseileencodes2017-07-081-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's possible for developers toadd a custom driver and then call it using `driven_by`. Because we were only skipping `register` for `:rack_test` that meant any custom driver would attempt to be registered as well. The three listed here are special because Rails registers them with special options. If you're registering your own custom driver then you don't want to separately register that driver. Fixes #29688
* | | Allow mounting same engine under several locationsDavid Rodríguez2017-07-053-10/+20
|/ /
* | Merge branch 'master' into require_relative_2017Xavier Noria2017-07-026-23/+42
|\ \
| * \ Merge pull request #29622 from yalab/warning_system_tesing_http_verbEileen M. Uchitelle2017-07-012-0/+26
| |\ \ | | | | | | | | Warning http verb method call in SystemTestCase
| | * | SystemTestCase undef some IntegrationTest methods because it's confused to use.yalab2017-07-012-0/+26
| | | |
| * | | Revert "Merge pull request #29540 from kirs/rubocop-frozen-string"Matthew Draper2017-07-0276-76/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 3420a14590c0e6915d8b6c242887f74adb4120f9, reversing changes made to afb66a5a598ce4ac74ad84b125a5abf046dcf5aa.
| * | | Merge pull request #29540 from kirs/rubocop-frozen-stringMatthew Draper2017-07-0276-0/+76
| |\ \ \ | | | | | | | | | | | | | | | Enforce frozen string in Rubocop
| | * | | Enforce frozen string in RubocopKir Shatrov2017-07-0176-0/+76
| | |/ /
| * | | Merge pull request #29506 from pat/frozen-string-literalsMatthew Draper2017-07-023-5/+5
| |\ \ \ | | | | | | | | | | | | | | | Make ActiveSupport frozen-string-literal friendly.
| | * | | Make ActionView frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | | | | | | | | | | | | | | | | | | | Plus a couple of related ActionPack patches.
| | * | | Make ActionMailer frozen string literal friendly.Pat Allan2017-06-202-2/+2
| | | | |
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-01 08:45:47 +0000