passenger 5.0.28 → 5.0.29

data/src/nginx_module/ConfigurationCommands.c.cxxcodebuilder

@@ -0,0 +1,157 @@
+#  Phusion Passenger - https://www.phusionpassenger.com/
+#  Copyright (c) 2010-2016 Phusion Holding B.V.
+#
+#  "Passenger", "Phusion Passenger" and "Union Station" are registered
+#  trademarks of Phusion Holding B.V.
+#
+#  Permission is hereby granted, free of charge, to any person obtaining a copy
+#  of this software and associated documentation files (the "Software"), to deal
+#  in the Software without restriction, including without limitation the rights
+#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+#  copies of the Software, and to permit persons to whom the Software is
+#  furnished to do so, subject to the following conditions:
+#
+#  The above copyright notice and this permission notice shall be included in
+#  all copies or substantial portions of the Software.
+#
+#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+#  THE SOFTWARE.
+
+# This file uses the cxxcodebuilder API. Learn more at:
+# https://github.com/phusion/passenger/cxxcodebuilder
+
+require 'phusion_passenger/nginx/config_options'
+
+def main
+  set_indent_string '    '
+  comment copyright_header_for(__FILE__)
+
+  separator
+
+  comment %q{
+    ConfigurationCommands.c is automatically generated from ConfigurationCommands.c.cxxcodebuilder,
+    using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
+    Edits to ConfigurationCommands.c will be lost.
+
+    To update ConfigurationCommands.c:
+      rake nginx
+
+    To force regeneration of ConfigurationCommands.c:
+      rm -f src/nginx_module/ConfigurationCommands.c
+      rake src/nginx_module/ConfigurationCommands.c
+  }
+
+  separator
+
+  ctx = self
+  LOCATION_CONFIGURATION_OPTIONS.each do |option|
+    option = resolve_possible_alias(option)
+
+    struct_initializer do
+      element "ngx_string(#{ctx.name_for(option)})"
+      element "#{ctx.context_for(option)} | #{ctx.take_type_for(option)}"
+      element ctx.setter_function_for(option)
+      element ctx.struct_for(option)
+      element ctx.struct_field_for(option)
+      element ctx.post_for(option)
+    end
+
+    add_code ','
+  end
+end
+
+def resolve_possible_alias(option)
+  if option[:alias_for]
+    the_alias = LOCATION_CONFIGURATION_OPTIONS.find do |o|
+      o[:name] == option[:alias_for]
+    end.dup
+    the_alias[:aliased_for] = option[:name]
+    the_alias
+  else
+    option
+  end
+end
+
+def name_for(option)
+  (option[:aliased_for] || option[:name]).inspect
+end
+
+def context_for(option)
+  context = option.fetch(:context, [:main, :srv, :loc, :lif])
+  context.map{ |c| "NGX_HTTP_#{c.to_s.upcase}_CONF" }.join(" | ")
+end
+
+def take_type_for(option)
+  return option[:take] if option[:take]
+
+  case option[:type]
+  when :string, :integer, :uinteger, :string_array
+    "NGX_CONF_TAKE1"
+  when :flag
+    "NGX_CONF_FLAG"
+  when :string_keyval
+    "NGX_CONF_TAKE2"
+  else
+    raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
+  end
+end
+
+def setter_function_for(option)
+  return option[:function] if option[:function]
+
+  case option[:type]
+  when :string
+    "ngx_conf_set_str_slot"
+  when :integer, :uinteger
+    "ngx_conf_set_num_slot"
+  when :flag
+    "ngx_conf_set_flag_slot"
+  when :string_array
+    "ngx_conf_set_str_array_slot"
+  when :string_keyval
+    "ngx_conf_set_keyval_slot"
+  when :path
+    "ngx_conf_set_path_slot"
+  else
+    raise "Unknown type #{option[:type].inspect} for option #{option[:name]}"
+  end
+end
+
+def struct_for(option)
+  option[:struct] || "NGX_HTTP_LOC_CONF_OFFSET"
+end
+
+def struct_type_for(option)
+  case struct_for(option)
+  when "NGX_HTTP_LOC_CONF_OFFSET"
+    "passenger_loc_conf_t"
+  when "NGX_HTTP_MAIN_CONF_OFFSET"
+    "passenger_main_conf_t"
+  else
+    raise "Unknown struct #{struct_for(option).inspect}"
+  end
+end
+
+def struct_field_for(option)
+  if option.has_key?(:field)
+    if field = option[:field]
+      "offsetof(#{struct_type_for(option)}, #{field})"
+    else
+      "0"
+    end
+  else
+    field = option[:name].sub(/^passenger_/, '')
+    "offsetof(#{struct_type_for(option)}, #{field})"
+  end
+end
+
+def post_for(option)
+  option[:post] || 'NULL'
+end
+
+main

data/src/nginx_module/CreateLocationConfig.c

@@ -1,31 +1,31 @@
 /*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2015 Phusion Holding B.V.
+ * Phusion Passenger - https://www.phusionpassenger.com/
+ * Copyright (c) 2010-2016 Phusion Holding B.V.
  *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
+ * "Passenger", "Phusion Passenger" and "Union Station" are registered
+ * trademarks of Phusion Holding B.V.
  *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 /*
- * CreateLocationConfig.c is automatically generated from CreateLocationConfig.c.erb,
+ * CreateLocationConfig.c is automatically generated from CreateLocationConfig.c.cxxcodebuilder,
  * using definitions from src/ruby_supportlib/phusion_passenger/nginx/config_options.rb.
  * Edits to CreateLocationConfig.c will be lost.
  *
@@ -37,190 +37,66 @@
  *   rake src/nginx_module/CreateLocationConfig.c
  */
 
-void generated_set_conf_part(passenger_loc_conf_t  *conf) {
-
-
-
-	
-		conf->socket_backlog = NGX_CONF_UNSET;
-	
-
-	
-		conf->core_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
-	
-
-	
-		conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
-	
-
-	
-		conf->enabled = NGX_CONF_UNSET;
-	
-
-	
-		conf->ruby.data = NULL;
-		conf->ruby.len  = 0;
-	
-
-	
-		conf->python.data = NULL;
-		conf->python.len  = 0;
-	
-
-	
-		conf->nodejs.data = NULL;
-		conf->nodejs.len  = 0;
-	
-
-	
-		conf->meteor_app_settings.data = NULL;
-		conf->meteor_app_settings.len  = 0;
-	
-
-	
-		conf->environment.data = NULL;
-		conf->environment.len  = 0;
-	
-
-	
-		conf->friendly_error_pages = NGX_CONF_UNSET;
-	
-
-	
-		conf->min_instances = NGX_CONF_UNSET;
-	
-
-	
-		conf->max_instances_per_app = NGX_CONF_UNSET;
-	
-
-	
-		conf->max_requests = NGX_CONF_UNSET;
-	
-
-	
-		conf->start_timeout = NGX_CONF_UNSET;
-	
-
-	
-		conf->base_uris = NGX_CONF_UNSET_PTR;
-	
-
-	
-		conf->document_root.data = NULL;
-		conf->document_root.len  = 0;
-	
-
-	
-		conf->user.data = NULL;
-		conf->user.len  = 0;
-	
-
-	
-		conf->group.data = NULL;
-		conf->group.len  = 0;
-	
-
-	
-		conf->app_group_name.data = NULL;
-		conf->app_group_name.len  = 0;
-	
-
-	
-		conf->app_root.data = NULL;
-		conf->app_root.len  = 0;
-	
-
-	
-		conf->app_rights.data = NULL;
-		conf->app_rights.len  = 0;
-	
-
-	
-		conf->union_station_support = NGX_CONF_UNSET;
-	
-
-	
-		conf->union_station_filters = NGX_CONF_UNSET_PTR;
-	
-
-	
-		conf->debugger = NGX_CONF_UNSET;
-	
-
-	
-		conf->max_preloader_idle_time = NGX_CONF_UNSET;
-	
-
-	
-		conf->env_vars = NULL;
-	
-
-	
-		conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
-	
-
-	
-		conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
-	
-
-	
-		conf->spawn_method.data = NULL;
-		conf->spawn_method.len  = 0;
-	
-
-	
-		conf->load_shell_envvars = NGX_CONF_UNSET;
-	
-
-	
-		conf->union_station_key.data = NULL;
-		conf->union_station_key.len  = 0;
-	
-
-	
-		conf->max_request_queue_size = NGX_CONF_UNSET;
-	
-
-	
-		conf->request_queue_overflow_status_code = NGX_CONF_UNSET;
-	
-
-	
-		conf->restart_dir.data = NULL;
-		conf->restart_dir.len  = 0;
-	
-
-	
-		conf->app_type.data = NULL;
-		conf->app_type.len  = 0;
-	
-
-	
-		conf->startup_file.data = NULL;
-		conf->startup_file.len  = 0;
-	
-
-	
-		conf->sticky_sessions = NGX_CONF_UNSET;
-	
-
-	
-		conf->sticky_sessions_cookie_name.data = NULL;
-		conf->sticky_sessions_cookie_name.len  = 0;
-	
-
-	
-		conf->vary_turbocache_by_cookie.data = NULL;
-		conf->vary_turbocache_by_cookie.len  = 0;
-	
-
-	
-		conf->abort_websockets_on_process_shutdown = NGX_CONF_UNSET;
-	
-
-	
-		conf->force_max_concurrent_requests_per_process = NGX_CONF_UNSET;
-	
-
+void
+generated_set_conf_part(passenger_loc_conf_t  *conf) {
+    conf->socket_backlog = NGX_CONF_UNSET;
+    conf->core_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
+    conf->app_file_descriptor_ulimit = NGX_CONF_UNSET_UINT;
+    conf->enabled = NGX_CONF_UNSET;
+    conf->ruby.data = NULL;
+    conf->ruby.len  = 0;
+    conf->python.data = NULL;
+    conf->python.len  = 0;
+    conf->nodejs.data = NULL;
+    conf->nodejs.len  = 0;
+    conf->meteor_app_settings.data = NULL;
+    conf->meteor_app_settings.len  = 0;
+    conf->environment.data = NULL;
+    conf->environment.len  = 0;
+    conf->friendly_error_pages = NGX_CONF_UNSET;
+    conf->min_instances = NGX_CONF_UNSET;
+    conf->max_instances_per_app = NGX_CONF_UNSET;
+    conf->max_requests = NGX_CONF_UNSET;
+    conf->start_timeout = NGX_CONF_UNSET;
+    conf->base_uris = NGX_CONF_UNSET_PTR;
+    conf->document_root.data = NULL;
+    conf->document_root.len  = 0;
+    conf->user.data = NULL;
+    conf->user.len  = 0;
+    conf->group.data = NULL;
+    conf->group.len  = 0;
+    conf->app_group_name.data = NULL;
+    conf->app_group_name.len  = 0;
+    conf->app_root.data = NULL;
+    conf->app_root.len  = 0;
+    conf->app_rights.data = NULL;
+    conf->app_rights.len  = 0;
+    conf->union_station_support = NGX_CONF_UNSET;
+    conf->union_station_filters = NGX_CONF_UNSET_PTR;
+    conf->debugger = NGX_CONF_UNSET;
+    conf->max_preloader_idle_time = NGX_CONF_UNSET;
+    conf->env_vars = NULL;
+    conf->headers_hash_max_size = NGX_CONF_UNSET_UINT;
+    conf->headers_hash_bucket_size = NGX_CONF_UNSET_UINT;
+    conf->spawn_method.data = NULL;
+    conf->spawn_method.len  = 0;
+    conf->load_shell_envvars = NGX_CONF_UNSET;
+    conf->union_station_key.data = NULL;
+    conf->union_station_key.len  = 0;
+    conf->max_request_queue_size = NGX_CONF_UNSET;
+    conf->request_queue_overflow_status_code = NGX_CONF_UNSET;
+    conf->restart_dir.data = NULL;
+    conf->restart_dir.len  = 0;
+    conf->app_type.data = NULL;
+    conf->app_type.len  = 0;
+    conf->startup_file.data = NULL;
+    conf->startup_file.len  = 0;
+    conf->sticky_sessions = NGX_CONF_UNSET;
+    conf->sticky_sessions_cookie_name.data = NULL;
+    conf->sticky_sessions_cookie_name.len  = 0;
+    conf->vary_turbocache_by_cookie.data = NULL;
+    conf->vary_turbocache_by_cookie.len  = 0;
+    conf->abort_websockets_on_process_shutdown = NGX_CONF_UNSET;
+    conf->force_max_concurrent_requests_per_process = NGX_CONF_UNSET;
 }
+