Commit 8aad8c claimed to do this, but it checks for the 304 status too early, before handle_conditional_get! has overridden it.

[#958 state:resolved]
Signed-off-by: NJonathan del Strother <jon.delStrother@bestbefore.tv>
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Pools start out empty and grow as necessary to a maximum size (default is 5,
configure size with key 'pool' in your database configuration). If no
connections are available, a thread will wait up to a 'wait_timeout' time
(default is 5 seconds).

Connections are verified and reset when checked out from the pool (usually
upon first access to ActiveRecord::Base.connection), and returned back to the
pool after each request.

If you would like to use connection pools outside of ActionPack, there is an
ActiveRecord::Base.connection_pool method that gives you access to the pool,
and you can manually checkout/checkin connections, or supply a block to
ActiveRecord::Base.connection_pool.with_connection which takes care of the
checkout/checkin for you.

[#936 state:resolved]

Addresses the security issue documented at:
* http://www.ruby-lang.org/en/news/2008/08/23/dos-vulnerability-in-rexml/

Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Get rid of 'Object#send!'. It was originally added because it's in Ruby 1.9, but it has since been removed from 1.9.
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Conflicts:

	actionpack/test/controller/layout_test.rb

Mailer layouts behaves just like controller layouts, except layout names need to
have '_mailer' postfix for them to be automatically picked up.

Fixes optimised named routes generating question mark followed by nothing when provided an empty hash as the last argument.
Signed-off-by: NMichael Koziarski <michael@koziarski.com>
[#481 state:committed]

[#906 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#887 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Performance: Better query for ASSOCIATION_ids. Select only ids if the association hasn't been loaded.
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Adds :shallow option to resource route definition. If true, paths for nested
resources which reference a specific member (ie. those with an :id parameter)
will not use the parent path prefix or name prefix.

Example :

map.resources :users, :shallow => true do |user|
  user.resources :posts
end

* GET /users/1/posts (maps to PostsController#index action as usual)
  named route "user_posts" is added as usual.

* GET /posts/2 (maps to PostsController#show action as if it were not nested)
  Additionally, named route "post" is added too.

[#943 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

[#939 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Format related patches to support serializing data out in the correct format with correct http request headers per http method type [#450 state:resolved]
Signed-off-by: NTarmo Tänav <tarmo@itech.ee>
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Make assert_select_rjs code more readable, make use of unused constants and use more simple Regexps.

[#540 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Ticket originally from http://dev.rubyonrails.org/ticket/3641Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Move some core extension methods into a module under the ActiveSupport::CoreExtensions namespace, instead of extending core classes directly. This is more friendly for API reference generators.

[#915 state:resolved]
Signed-off-by: NJeremy Kemper <jeremy@bitsweat.net>

Signed-off-by: NPratik Naik <pratiknaik@gmail.com>

Signed-off-by: NJoshua Peek <josh@joshpeek.com>

Remove some synchronization that's probably overkill, assuming one doesn't establish connections frequently

- Add connection checkin and checkout callbacks to adapter to allow
  adapter-specific customization of behavior (e.g., JRuby w/ JNDI)

- also clean up some cruft remaining from per-thread connection cache

Remove CachedConnectionPerThread per-thread pooling mechanism in favor of a fixed pool with default maximum of 5 connections