Expose relation version to api and fix remaining server status typo in old_relation...

[rails.git] / config / nginx.conf

diff --git a/config/nginx.conf b/config/nginx.conf
index 41fd52d8d2eefc666ec23174e9366181cdb6e799..a78e1dc705312ddb733b91332600e1422098dcca 100644 (file)
--- a/config/nginx.conf
+++ b/config/nginx.conf
@@ -164,18 +164,21 @@ http {
 
         # Handle bulk api requests
         location ~ ^/api/0\.6/(map|relation|trackpoints|amf|amf/read|swf/trackpoints|trace/[0-9]+/data)$ {
+            fastcgi_read_timeout 300;
             fastcgi_pass bulkapi_backend;
             break;
         }
         
         # Send search requests to the bulk api backend
         location ~ ^/api/0\.6/.*/search$ {
+            fastcgi_read_timeout 300;
             fastcgi_pass bulkapi_backend;
             break;
         }
 
         # Send requests for full objects to the bulk api backend
         location ~ ^/api/0\.6/.*/full$ {
+            fastcgi_read_timeout 300;
             fastcgi_pass bulkapi_backend;
             break;
         }