aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #23532 from matthewd/live-interlockMatthew Draper2016-02-081-23/+28
|\ \ \ \ | | | | | | | | | | Hand off the interlock to the new thread in AC::Live
| * | | | Hand off the interlock to the new thread in AC::LiveMatthew Draper2016-02-071-23/+28
| |/ / / | | | | | | | | | | | | | | | | | | | | Most importantly, the original request thread must yield its share lock while waiting for the live thread to commit -- otherwise a request's base and live threads can deadlock against each other.
* / / / Add SVG as a default mime typeDavid Heinemeier Hansson2016-02-072-0/+5
|/ / /
* | | Avoid coupling Action Pack to Railties.Kasper Timm Hansen2016-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Referencing Rails.env without checking if it's defined couples us to Railties. Fix by avoiding the line breaks if we don't have an env check to rely on.
* | | add missing requireAaron Patterson2016-02-051-0/+1
| | |
* | | disable controller / view thread spawning in testsAaron Patterson2016-02-053-3/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests can (and do) access the database from the main thread. In this case they were starting a transaction, then making a request. The request would create a new thread, which would allocate a new database connection. Since the main thread started a transaction that contains data that the new thread wants to see, the new thread would not see it due to data visibility from transactions. Spawning the new thread in production is fine because middleware should not be doing database manipulation similar to the test harness. Before 603fe20c it was possible to set the database connection id based on a thread local, but 603fe20c changes the connection lookup code to never look at the "connection id" but only at the thread object itself. Without that indirection, we can't force threads to use the same connection pool as another thread. Fixes #23483
* | | Put some space for non-assets requests in development modePrathamesh Sonpatki2016-02-031-0/+2
| | | | | | | | | | | | - Fixes #23428.
* | | Sleep well, sweet princeSean Griffin2016-02-021-1/+1
| | | | | | | | | | | | | | | Prototype, you have served us well. But you are no longer how we make an XMLHttpRequest. RIP
* | | Merge pull request #23396 from pschambacher/pschambacher/fix_assert_generatesRafael França2016-02-021-0/+1
|\ \ \ | | | | | | | | Duplicate assert_generates options before modifying it
| * | | Duplicate assert_generates options before modifying itPierre Schambacher2016-02-011-0/+1
| | | |
* | | | Update CHANGELOG.mdKang-Kyu Lee2016-02-011-2/+2
| | | | | | | | | | | | fix indentation to show it as code
* | | | Add some Action Cable CHANGELOG entriesRafael Mendonça França2016-02-011-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | And improve changelongs. [ci skip]
* | | | Preparing for Rails 5.0.0.beta2Sean Griffin2016-02-012-2/+7
| | | |
* | | | Converge on filter.Kasper Timm Hansen2016-02-011-5/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Some places were saying filter, while others said filter_options, spare the ambiguity and use filter throughout. This inlines a needless local variable and clarifies a route filter consists of defaults and values to match against.
* | | | Simplify filter normalization.Kasper Timm Hansen2016-02-011-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Assume the filter is a string, if it wasn't a hash and isn't nil. Remove needless else and rely on Ruby's default nil return. Add spaces within hash braces.
* | | | Merge pull request #23225 from vipulnsward/20420-rake-routes-optionsKasper Timm Hansen2016-02-014-23/+58
|\ \ \ \ | | | | | | | | | | Add options for rake routes task
| * | | | Add options for rake routes taskVipul A M2016-02-024-23/+58
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add two options: `-c` and `-g`. `-g` option returns the urls name, verb and path fields that match the pattern. `-c` option returns the urls for specific controller. Fixes #18902, and Fixes #20420 [Anton Davydov & Vipul A M]
* / / / Add documentation for #17573Jon Moss2016-02-011-0/+8
|/ / / | | | | | | | | | | | | | | | Fixes some parts of #23148. [ci skip]
* | | Wrangle the asset build into something that sounds more generalMatthew Draper2016-02-011-0/+3
| | |
* | | Merge pull request #23342 from y-yagi/remove_unused_variableRafael França2016-01-301-1/+1
|\ \ \ | | | | | | | | remove unused variable from render test
| * | | remove unused variable from render testyuuji.yaginuma2016-01-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This removes the following warning. ``` rails/actionpack/test/controller/render_test.rb:278: warning: assigned but unused variable - response ```
* | | | Merge pull request #23343 from y-yagi/remove_unused_requireRafael França2016-01-301-1/+0
|\ \ \ \ | | | | | | | | | | remove unused require
| * | | | remove unused requireyuuji.yaginuma2016-01-301-1/+0
| |/ / / | | | | | | | | | | | | `with_indifferent_access` had been used in `assigns` method, but has been removed in ca83436.
* / / / Handle response_body= when body is nileileencodes2016-01-302-0/+17
|/ / / | | | | | | | | | | | | | | | | | | | | | | | | There are some cases when the `body` in `response_body=` can be set to nil. One of those cases is in `actionpack-action_caching` which I found while upgrading it for Rails 5. It's not possible to run `body.each` on a `nil` body so we have to return after we run `response.reset_body!`.
* | | Add additional documentation on Headers#[] [ci skip]Tawan Sierek2016-01-291-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #16519 covers confusion potentially caused by how HTTP headers, that contain underscores in their names, are retrieved through `ActionDispatch::Http::Headers#[]`. This confusion has its origin in how a CGI maps HTTP header names to variable names. Even though underscores in header names are rarely encountered, they are valid according to RFC822 [1]. Nonetheless CGI like variable names, as requested by the Rack specfication, will only contain underscores and therefore the original header name cannot be recovered after the Rack server passed on the environemnt hash. Please, see also the disscussion on StackOverflow [2], which also links to an explaination in the nginx documentation [3]. [1] http://www.ietf.org/rfc/rfc822.txt [2] http://stackoverflow.com/questions/22856136/why-underscores-are-forbidden-in-http-header-names [3] https://www.nginx.com/resources/wiki/start/topics/tutorials/config_pitfalls/#missing-disappearing-http-headers
* | | Merge pull request #22800 from dgynn/pr_cache_helper_optionsRafael Mendonça França2016-01-292-0/+15
|\ \ \ | | | | | | | | | | | | Restore ability to pass extra options to cache stores
| * | | restore ability to pass extra options to cache storesDave Gynn2015-12-262-0/+15
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | The `cache` helper methods should pass any extra options to the cache store. For example :expires_in would be a valid option if memcache was the cache store. The change in commit da16745 broke the ability to pass any options other than :skip_digest and :virtual_path. This PR restores that functionality and adds a test for it.
* | | speed up accept header parsing a bit.Aaron Patterson2016-01-281-8/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept header is taken from what Safari on El Capitan sends: ```ruby require 'benchmark/ips' require 'action_dispatch/http/mime_type' require 'active_support/all' accept = 'text/html,application/xhtml+xml,application/xml;q=0.9,*/*;q=0.8' Benchmark.ips do |x| x.report "omg" do Mime::Type.parse(accept) end end ``` Before: ``` [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.181k i/100ms ------------------------------------------------- omg 35.062k (±12.8%) i/s - 174.955k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.153k i/100ms ------------------------------------------------- omg 33.724k (±12.4%) i/s - 167.109k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.575k i/100ms ------------------------------------------------- omg 37.251k (±10.4%) i/s - 185.900k ``` After: ``` [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 3.365k i/100ms ------------------------------------------------- omg 40.069k (±16.1%) i/s - 198.535k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 4.168k i/100ms ------------------------------------------------- omg 47.596k (± 7.7%) i/s - 237.576k [aaron@TC actionpack (master)]$ be ruby ../x.rb Calculating ------------------------------------- omg 4.282k i/100ms ------------------------------------------------- omg 43.626k (±17.7%) i/s - 209.818k ```
* | | convert AcceptList to a regular classAaron Patterson2016-01-281-20/+19
| | | | | | | | | | | | | | | | | | | | | we never use this custom array outside the mime type `parse` method. We can reduce the interaction to just a regular array, so we should use that instead (IOW, there was nothing special about AcceptList so we should remove it).
* | | Run `file.close` before unlinking for traviseileencodes2016-01-281-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This works on OSX but for some reason travis is throwing a ``` 1) Error: ExpiresInRenderTest#test_dynamic_render_with_absolute_path: NoMethodError: undefined method `unlink' for nil:NilClass ``` Looking at other tests in Railties the file has a name and we close it before unlinking, so I'm going to try that.
* | | Regression test for rendering file from absolute patheileencodes2016-01-281-0/+11
| | | | | | | | | | | | | | | | | | Test that we are not allowing you to grab a file with an absolute path outside of your application directory. This is dangerous because it could be used to retrieve files from the server like `/etc/passwd`.
* | | remove == from AcceptItemAaron Patterson2016-01-271-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | Remove nonsense definition of == from `AcceptItem`. The definition only compared names and not `q` values or even object identity. The only use was in the `assort!` method that really just wanted the index of the item given the item's name. Instead we just change the caller to use `index` with the block form.
* | | remove useless private methodsAaron Patterson2016-01-271-13/+9
| | | | | | | | | | | | | | | This commit refactors the private methods that were just aliases to [] to just directly use [] and cache the return values on the stack.
* | | change `@app_xml_idx` to an lvar and cache it on the stackAaron Patterson2016-01-271-16/+10
| | | | | | | | | | | | | | | same strategy as `@text_xml_idx`: cache it on the stack to avoid ivar lookups and the `||=` call.
* | | change `@text_xml_idx` to an lvar and cache it on the stackAaron Patterson2016-01-271-13/+11
| | | | | | | | | | | | | | | this eliminates the ivar lookup and also eliminates the `||=` conditional that happens every time we called the `text_xml_idx` method.
* | | Fix typo in strong params hash deprecation messageMarek2016-01-271-2/+2
| | | | | | | | | and remove unecessary spaces in string interpolation.
* | | doc typoAkira Matsuda2016-01-271-2/+2
| | | | | | | | | | | | [ci skip]
* | | add a skip for failing testAaron Patterson2016-01-261-1/+2
| | |
* | | fix permitted? conditional for `render` callsAaron Patterson2016-01-262-3/+17
| | |
* | | Merge pull request #23242 from maclover7/fix-error-secAaron Patterson2016-01-261-6/+3
|\ \ \ | | | | | | | | Fix undefined error for `ActionController::Parameters`
| * | | Fix undefined error for `ActionController::Parameters`Jon Moss2016-01-261-6/+3
| | | |
* | | | clear view path cache between testsAaron Patterson2016-01-261-0/+5
|/ / / | | | | | | | | | | | | | | | | | | | | | The cache for `render file:` seems to also be used in the case of `render(string)`. If one is supposed to be a hit and the other is supposed to be a miss, and they both reference the same file, then the cache could return incorrect values. This commit clears the cache between runs so that we get non-cached behavior.
* | | Merge branch '5-0-beta-sec'Aaron Patterson2016-01-255-5/+61
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 5-0-beta-sec: bumping version fix version update task to deal with .beta1.1 Eliminate instance level writers for class accessors allow :file to be outside rails root, but anything else must be inside the rails view directory Don't short-circuit reject_if proc stop caching mime types globally use secure string comparisons for basic auth username / password
| * | | bumping versionAaron Patterson2016-01-251-1/+1
| | | |
| * | | allow :file to be outside rails root, but anything else must be inside the ↵Aaron Patterson2016-01-222-1/+38
| | | | | | | | | | | | | | | | | | | | | | | | rails view directory CVE-2016-0752
| * | | stop caching mime types globallyAaron Patterson2016-01-221-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Unknown mime types should not be cached globally. This global cache leads to a memory leak and a denial of service vulnerability. CVE-2016-0751
| * | | use secure string comparisons for basic auth username / passwordAaron Patterson2016-01-221-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | this will avoid timing attacks against applications that use basic auth. CVE-2015-7576
* | | | Fix nodoc to internal class error document some of themVipul A M2016-01-251-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | [ci skip] Fixes #20808 [Vipul A M & Julio Lopez]
* | | | rm changelog for unreleased changes fixesVipul A M2016-01-221-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | Based on https://github.com/rails/rails/pull/23167/files#r50507317 [ci skip]
* | | | Merge pull request #23167 from maclover7/fix-21032Rafael França2016-01-213-1/+15
|\ \ \ \ | | | | | | | | | | Fix `ActionController::Parameters#==` bug
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 02:32:04 +0000