passenger 5.2.1 → 5.2.2

data/src/cxx_supportlib/vendor-modified/boost/circular_buffer_fwd.hpp

@@ -0,0 +1,43 @@
+// Forward declaration of the circular buffer and its adaptor.
+
+// Copyright (c) 2003-2008 Jan Gaspar
+
+// Use, modification, and distribution is subject to the Boost Software
+// License, Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+// http://www.boost.org/LICENSE_1_0.txt)
+
+//  See www.boost.org/libs/circular_buffer for documentation.
+
+#if !defined(BOOST_CIRCULAR_BUFFER_FWD_HPP)
+#define BOOST_CIRCULAR_BUFFER_FWD_HPP
+
+#if defined(_MSC_VER)
+    #pragma once
+#endif
+
+#include <boost/config.hpp>
+#if !defined(BOOST_NO_STD_ALLOCATOR)
+    #include <memory>
+#else
+    #include <vector>
+#endif
+
+namespace boost {
+
+#if !defined(BOOST_NO_STD_ALLOCATOR)
+    #define BOOST_CB_DEFAULT_ALLOCATOR(T) std::allocator<T>
+#else
+    #define BOOST_CB_DEFAULT_ALLOCATOR(T) BOOST_DEDUCED_TYPENAME std::vector<T>::allocator_type
+#endif
+
+template <class T, class Alloc = BOOST_CB_DEFAULT_ALLOCATOR(T)>
+class circular_buffer;
+
+template <class T, class Alloc = BOOST_CB_DEFAULT_ALLOCATOR(T)>
+class circular_buffer_space_optimized;
+
+#undef BOOST_CB_DEFAULT_ALLOCATOR
+
+} // namespace boost
+
+#endif // #if !defined(BOOST_CIRCULAR_BUFFER_FWD_HPP)

data/src/cxx_supportlib/vendor-modified/boost/detail/call_traits.hpp

@@ -0,0 +1,172 @@
+//  (C) Copyright Steve Cleary, Beman Dawes, Howard Hinnant & John Maddock 2000.
+//  Use, modification and distribution are subject to the Boost Software License,
+//  Version 1.0. (See accompanying file LICENSE_1_0.txt or copy at
+//  http://www.boost.org/LICENSE_1_0.txt).
+//
+//  See http://www.boost.org/libs/utility for most recent version including documentation.
+
+// call_traits: defines typedefs for function usage
+// (see libs/utility/call_traits.htm)
+
+/* Release notes:
+   23rd July 2000:
+      Fixed array specialization. (JM)
+      Added Borland specific fixes for reference types
+      (issue raised by Steve Cleary).
+*/
+
+#ifndef BOOST_DETAIL_CALL_TRAITS_HPP
+#define BOOST_DETAIL_CALL_TRAITS_HPP
+
+#ifndef BOOST_CONFIG_HPP
+#include <boost/config.hpp>
+#endif
+#include <cstddef>
+
+#include <boost/type_traits/is_arithmetic.hpp>
+#include <boost/type_traits/is_enum.hpp>
+#include <boost/type_traits/is_pointer.hpp>
+#include <boost/detail/workaround.hpp>
+
+namespace boost{
+
+namespace detail{
+
+template <typename T, bool small_>
+struct ct_imp2
+{
+   typedef const T& param_type;
+};
+
+template <typename T>
+struct ct_imp2<T, true>
+{
+   typedef const T param_type;
+};
+
+template <typename T, bool isp, bool b1, bool b2>
+struct ct_imp
+{
+   typedef const T& param_type;
+};
+
+template <typename T, bool isp, bool b2>
+struct ct_imp<T, isp, true, b2>
+{
+   typedef typename ct_imp2<T, sizeof(T) <= sizeof(void*)>::param_type param_type;
+};
+
+template <typename T, bool isp, bool b1>
+struct ct_imp<T, isp, b1, true>
+{
+   typedef typename ct_imp2<T, sizeof(T) <= sizeof(void*)>::param_type param_type;
+};
+
+template <typename T, bool b1, bool b2>
+struct ct_imp<T, true, b1, b2>
+{
+   typedef const T param_type;
+};
+
+}
+
+template <typename T>
+struct call_traits
+{
+public:
+   typedef T value_type;
+   typedef T& reference;
+   typedef const T& const_reference;
+   //
+   // C++ Builder workaround: we should be able to define a compile time
+   // constant and pass that as a single template parameter to ct_imp<T,bool>,
+   // however compiler bugs prevent this - instead pass three bool's to
+   // ct_imp<T,bool,bool,bool> and add an extra partial specialisation
+   // of ct_imp to handle the logic. (JM)
+   typedef typename boost::detail::ct_imp<
+      T,
+      ::boost::is_pointer<T>::value,
+      ::boost::is_arithmetic<T>::value,
+      ::boost::is_enum<T>::value
+   >::param_type param_type;
+};
+
+template <typename T>
+struct call_traits<T&>
+{
+   typedef T& value_type;
+   typedef T& reference;
+   typedef const T& const_reference;
+   typedef T& param_type;  // hh removed const
+};
+
+#if BOOST_WORKAROUND( __BORLANDC__,  < 0x5A0 )
+// these are illegal specialisations; cv-qualifies applied to
+// references have no effect according to [8.3.2p1],
+// C++ Builder requires them though as it treats cv-qualified
+// references as distinct types...
+template <typename T>
+struct call_traits<T&const>
+{
+   typedef T& value_type;
+   typedef T& reference;
+   typedef const T& const_reference;
+   typedef T& param_type;  // hh removed const
+};
+template <typename T>
+struct call_traits<T&volatile>
+{
+   typedef T& value_type;
+   typedef T& reference;
+   typedef const T& const_reference;
+   typedef T& param_type;  // hh removed const
+};
+template <typename T>
+struct call_traits<T&const volatile>
+{
+   typedef T& value_type;
+   typedef T& reference;
+   typedef const T& const_reference;
+   typedef T& param_type;  // hh removed const
+};
+
+template <typename T>
+struct call_traits< T * >
+{
+   typedef T * value_type;
+   typedef T * & reference;
+   typedef T * const & const_reference;
+   typedef T * const param_type;  // hh removed const
+};
+#endif
+#if !defined(BOOST_NO_ARRAY_TYPE_SPECIALIZATIONS)
+template <typename T, std::size_t N>
+struct call_traits<T [N]>
+{
+private:
+   typedef T array_type[N];
+public:
+   // degrades array to pointer:
+   typedef const T* value_type;
+   typedef array_type& reference;
+   typedef const array_type& const_reference;
+   typedef const T* const param_type;
+};
+
+template <typename T, std::size_t N>
+struct call_traits<const T [N]>
+{
+private:
+   typedef const T array_type[N];
+public:
+   // degrades array to pointer:
+   typedef const T* value_type;
+   typedef array_type& reference;
+   typedef const array_type& const_reference;
+   typedef const T* const param_type;
+};
+#endif
+
+}
+
+#endif // BOOST_DETAIL_CALL_TRAITS_HPP

data/src/nginx_module/ConfigGeneral/AutoGeneratedDefinitions.c

@@ -62,6 +62,14 @@
     offsetof(passenger_main_conf_t, autogenerated.abort_on_startup_error),
     NULL
 },
+{
+    ngx_string("passenger_dump_config_manifest"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_dump_config_manifest,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.dump_config_manifest),
+    NULL
+},
 {
     ngx_string("passenger_log_level"),
     NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
@@ -222,6 +230,38 @@
     offsetof(passenger_loc_conf_t, autogenerated.app_file_descriptor_ulimit),
     NULL
 },
+{
+    ngx_string("passenger_admin_panel_url"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_admin_panel_url,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.admin_panel_url),
+    NULL
+},
+{
+    ngx_string("passenger_admin_panel_auth_type"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_admin_panel_auth_type,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.admin_panel_auth_type),
+    NULL
+},
+{
+    ngx_string("passenger_admin_panel_username"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_admin_panel_username,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.admin_panel_username),
+    NULL
+},
+{
+    ngx_string("passenger_admin_panel_password"),
+    NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_admin_panel_password,
+    NGX_HTTP_MAIN_CONF_OFFSET,
+    offsetof(passenger_main_conf_t, autogenerated.admin_panel_password),
+    NULL
+},
 {
     ngx_string("passenger_enabled"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_FLAG,
@@ -350,6 +390,14 @@
     offsetof(passenger_loc_conf_t, autogenerated.app_group_name),
     NULL
 },
+{
+    ngx_string("passenger_monitor_log_file"),
+    NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,
+    passenger_conf_set_monitor_log_file,
+    NGX_HTTP_LOC_CONF_OFFSET,
+    offsetof(passenger_loc_conf_t, autogenerated.monitor_log_file),
+    NULL
+},
 {
     ngx_string("passenger_app_root"),
     NGX_HTTP_MAIN_CONF | NGX_HTTP_SRV_CONF | NGX_HTTP_LOC_CONF | NGX_HTTP_LIF_CONF | NGX_CONF_TAKE1,

data/src/nginx_module/ConfigGeneral/AutoGeneratedSetterFuncs.c

@@ -109,6 +109,18 @@ passenger_conf_set_abort_on_startup_error(ngx_conf_t *cf, ngx_command_t *cmd, vo
     return ngx_conf_set_flag_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_dump_config_manifest(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.dump_config_manifest_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.dump_config_manifest_source_file,
+        &passenger_conf->autogenerated.dump_config_manifest_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_log_level(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_main_conf_t *passenger_conf = conf;
@@ -349,6 +361,54 @@ passenger_conf_set_app_file_descriptor_ulimit(ngx_conf_t *cf, ngx_command_t *cmd
     return ngx_conf_set_num_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_admin_panel_url(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.admin_panel_url_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.admin_panel_url_source_file,
+        &passenger_conf->autogenerated.admin_panel_url_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
+static char *
+passenger_conf_set_admin_panel_auth_type(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.admin_panel_auth_type_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.admin_panel_auth_type_source_file,
+        &passenger_conf->autogenerated.admin_panel_auth_type_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
+static char *
+passenger_conf_set_admin_panel_username(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.admin_panel_username_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.admin_panel_username_source_file,
+        &passenger_conf->autogenerated.admin_panel_username_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
+static char *
+passenger_conf_set_admin_panel_password(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_main_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.admin_panel_password_explicitly_set = 1;
+    record_main_conf_source_location(cf,
+        &passenger_conf->autogenerated.admin_panel_password_source_file,
+        &passenger_conf->autogenerated.admin_panel_password_source_line);
+
+    return ngx_conf_set_str_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_ruby(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;
@@ -529,6 +589,18 @@ passenger_conf_set_app_group_name(ngx_conf_t *cf, ngx_command_t *cmd, void *conf
     return ngx_conf_set_str_slot(cf, cmd, conf);
 }
 
+static char *
+passenger_conf_set_monitor_log_file(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
+    passenger_loc_conf_t *passenger_conf = conf;
+
+    passenger_conf->autogenerated.monitor_log_file_explicitly_set = 1;
+    record_loc_conf_source_location(cf, passenger_conf,
+        &passenger_conf->autogenerated.monitor_log_file_source_file,
+        &passenger_conf->autogenerated.monitor_log_file_source_line);
+
+    return ngx_conf_set_str_array_slot(cf, cmd, conf);
+}
+
 static char *
 passenger_conf_set_app_root(ngx_conf_t *cf, ngx_command_t *cmd, void *conf) {
     passenger_loc_conf_t *passenger_conf = conf;

data/src/nginx_module/ConfigGeneral/ManifestGeneration.c

@@ -146,6 +146,19 @@ infer_loc_conf_app_group_name(manifest_gen_ctx_t *ctx, passenger_loc_conf_t *plc
     return 1;
 }
 
+static u_char *
+infer_default_app_root(manifest_gen_ctx_t *ctx, ngx_http_core_loc_conf_t *clcf,
+    size_t *len)
+{
+    u_char *path, *end;
+
+    path = ngx_pnalloc(ctx->cf->temp_pool, clcf->root.len + 3);
+    end = ngx_snprintf(path, clcf->root.len + 3,
+        "%V/..", &clcf->root);
+    return (u_char *) psg_absolutize_path((const char *) path,
+        end - path, NULL, 0, len);
+}
+
 static PsgJsonValue *
 find_or_create_manifest_app_config_container(manifest_gen_ctx_t *ctx,
     ngx_str_t *app_group_name)
@@ -390,6 +403,7 @@ find_or_create_manifest_app_and_loc_options_containers(manifest_gen_ctx_t *ctx,
 {
     ngx_str_t app_group_name;
     PsgJsonValue *app_config_container, *loc_config_container;
+    ngx_str_t default_app_root;
 
     if (*app_options_container != NULL && *loc_options_container != NULL) {
         return;
@@ -405,6 +419,24 @@ find_or_create_manifest_app_and_loc_options_containers(manifest_gen_ctx_t *ctx,
         app_config_container = find_or_create_manifest_app_config_container(ctx, &app_group_name);
         *app_options_container = psg_json_value_get(app_config_container, "options", -1);
         *loc_options_container = psg_json_value_get(app_config_container, "default_location_configuration", -1);
+
+        /* Create a default value for passenger_app_root
+         * if we just created this config container
+         */
+        if (psg_json_value_size(*app_options_container) == 0) {
+            add_manifest_options_container_static_default_str(ctx,
+                *app_options_container,
+                "passenger_app_group_name", -1,
+                (const char *) app_group_name.data, app_group_name.len);
+
+            default_app_root.data = infer_default_app_root(
+                ctx, clcf, &default_app_root.len);
+            add_manifest_options_container_static_default_str(ctx,
+                *app_options_container,
+                "passenger_app_root", -1,
+                (const char *) default_app_root.data, default_app_root.len);
+            free(default_app_root.data);
+        }
     } else {
         /* We are in a location/if block */
         infer_loc_conf_app_group_name(ctx, plcf, clcf, &app_group_name);

data/src/nginx_module/ConfigGeneral/ManifestGeneration.h

@@ -4,6 +4,7 @@
 #include <ngx_config.h>
 #include <ngx_core.h>
 #include <ngx_http.h>
+#include "cxx_supportlib/FileTools/PathManipCBindings.h"
 #include "cxx_supportlib/JsonTools/CBindings.h"
 
 #ifndef _PASSENGER_NGINX_MODULE_CONF_STRUCT_TYPEDEFS_H_
@@ -40,6 +41,8 @@ static void recursively_generate_config_manifest_for_loc_conf(manifest_gen_ctx_t
 	passenger_loc_conf_t *plcf);
 static int infer_loc_conf_app_group_name(manifest_gen_ctx_t *ctx,
 	passenger_loc_conf_t *plcf, ngx_http_core_loc_conf_t *clcf, ngx_str_t *result);
+static u_char *infer_default_app_root(manifest_gen_ctx_t *ctx,
+    ngx_http_core_loc_conf_t *clcf, size_t *len);
 static void generate_config_manifest_for_loc_conf(manifest_gen_ctx_t *ctx,
 	passenger_loc_conf_t *plcf, ngx_http_core_srv_conf_t *cscf,
 	ngx_http_core_loc_conf_t *clcf);

data/src/nginx_module/Configuration.c

@@ -991,6 +991,9 @@ passenger_postprocess_config(ngx_conf_t *cf)
     ngx_http_conf_ctx_t  *http_ctx;
     passenger_loc_conf_t *toplevel_plcf;
     ngx_pool_cleanup_t   *manifest_cleanup;
+    char                 *dump_path, *dump_content;
+    FILE                 *dump_file;
+    u_char               *end;
 
     http_ctx = cf->ctx;
     toplevel_plcf = http_ctx->loc_conf[ngx_http_passenger_module.ctx_index];
@@ -1006,6 +1009,28 @@ passenger_postprocess_config(ngx_conf_t *cf)
     manifest_cleanup->handler = (ngx_pool_cleanup_pt) psg_json_value_free;
     manifest_cleanup->data = passenger_main_conf.manifest;
 
+    if (passenger_main_conf.autogenerated.dump_config_manifest.len != 0) {
+        dump_path = (char *) ngx_pnalloc(cf->temp_pool,
+            passenger_main_conf.autogenerated.dump_config_manifest.len + 1);
+        end = ngx_copy(dump_path,
+            passenger_main_conf.autogenerated.dump_config_manifest.data,
+            passenger_main_conf.autogenerated.dump_config_manifest.len);
+        *end = '\0';
+
+        dump_file = fopen(dump_path, "w");
+        if (dump_file != NULL) {
+            dump_content = psg_json_value_to_styled_string(
+                passenger_main_conf.manifest);
+            fwrite(dump_content, 1, strlen(dump_content), dump_file);
+            fclose(dump_file);
+            free(dump_content);
+        } else {
+            ngx_conf_log_error(NGX_LOG_ALERT, cf, 0,
+                "Error dumping " PROGRAM_NAME " configuration manifest to %V",
+                &passenger_main_conf.autogenerated.dump_config_manifest);
+        }
+    }
+
     return NGX_OK;
 }