X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b38684e59eef299e82f5858fe1e14f6cf2aaa10a..a8bfe7c32ed654b0474b894f44da49c3f136266b:/app/controllers/api_controller.rb diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb index 285558bcf..564f71899 100644 --- a/app/controllers/api_controller.rb +++ b/app/controllers/api_controller.rb @@ -1,6 +1,5 @@ class ApiController < ApplicationController - session :off before_filter :check_api_readable, :except => [:capabilities] after_filter :compress_output around_filter :api_call_handle_error, :api_call_timeout @@ -263,6 +262,9 @@ class ApiController < ApplicationController changesets = XML::Node.new 'changesets' changesets['maximum_elements'] = Changeset::MAX_ELEMENTS.to_s api << changesets + timeout = XML::Node.new 'timeout' + timeout['seconds'] = APP_CONFIG['api_timeout'].to_s + api << timeout doc.root << api