Merge branch 'nginx' into thread_safe_nginx_rakefile

phusion · Apr 15, 2009 · 656fe77 · 656fe77
2 parents b5b2c59 + 4098be0
commit 656fe77
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/doc/Users guide Nginx.txt b/doc/Users guide Nginx.txt
@@ -686,6 +686,7 @@ include::users_guide_snippets/rails_spawn_method.txt[]
 
 This option may occur in the following places:
 
+ * In the 'http' configuration block.
  * In a 'server' configuration block.
  * In a 'location' configuration block.
  * In an 'if' configuration scope.

diff --git a/ext/nginx/Configuration.c b/ext/nginx/Configuration.c
@@ -915,7 +915,7 @@ const ngx_command_t passenger_commands[] = {
       NULL },
 
     { ngx_string("rails_spawn_method"),
-      NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+      NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_str_slot,
       NGX_HTTP_LOC_CONF_OFFSET,
       offsetof(passenger_loc_conf_t, spawn_method),