passenger 5.0.10 → 5.0.11

data/ext/common/{agents/Watchdog/LoggingAgentWatcher.cpp → agent/Watchdog/UstRouterWatcher.cpp}

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -23,13 +23,13 @@
  *  THE SOFTWARE.
  */
 
-class LoggingAgentWatcher: public AgentWatcher {
+class UstRouterWatcher: public AgentWatcher {
 protected:
 	string agentFilename;
 	string socketAddress;
 
 	virtual const char *name() const {
-		return PROGRAM_NAME " logging agent";
+		return SHORT_PROGRAM_NAME " UstRouter";
 	}
 
 	virtual string getExeFilename() const {
@@ -37,15 +37,15 @@ protected:
 	}
 
 	virtual void execProgram() const {
-		execl(agentFilename.c_str(), AGENT_EXE, "logger",
+		execl(agentFilename.c_str(), AGENT_EXE, "ust-router",
 			// Some extra space to allow the child process to change its process title.
 			"                                                ", (char *) 0);
 	}
 
 	virtual void sendStartupArguments(pid_t pid, FileDescriptor &fd) {
 		VariantMap options = *agentsOptions;
-		options.erase("server_password");
-		options.erase("server_authorizations");
+		options.erase("core_password");
+		options.erase("core_authorizations");
 		options.writeToFd(fd);
 	}
 
@@ -54,7 +54,7 @@ protected:
 	}
 
 public:
-	LoggingAgentWatcher(const WorkingObjectsPtr &wo)
+	UstRouterWatcher(const WorkingObjectsPtr &wo)
 		: AgentWatcher(wo)
 	{
 		agentFilename = wo->resourceLocator->findSupportBinary(AGENT_EXE);
@@ -62,7 +62,11 @@ public:
 
 	virtual void reportAgentsInformation(VariantMap &report) {
 		const VariantMap &options = *agentsOptions;
-		report.set("logging_agent_address", options.get("logging_agent_address"));
-		report.set("logging_agent_password", options.get("logging_agent_password"));
+		report.set("ust_router_address", options.get("ust_router_address"));
+		report.set("ust_router_password", options.get("ust_router_password"));
+
+		// For backward compatibilty:
+		report.set("logging_agent_address", options.get("ust_router_address"));
+		report.set("logging_agent_password", options.get("ust_router_password"));
 	}
 };

data/ext/nginx/CacheLocationConfig.c

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -38,8 +38,10 @@
 
 
 
-size_t len = 0;
-u_char int_buf[32], *end, *buf, *pos;
+/* 0: NGX_ERROR, 1: OK */
+int generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
+	size_t len = 0;
+	u_char int_buf[32], *end, *buf, *pos;
 
 /* Calculate lengths */
 
@@ -304,7 +306,7 @@ u_char int_buf[32], *end, *buf, *pos;
 /* Create string */
 buf = pos = ngx_pnalloc(cf->pool, len);
 if (buf == NULL) {
-	return NGX_ERROR;
+	return 0;
 }
 
 
@@ -664,5 +666,8 @@ if (buf == NULL) {
 	
 
 
-conf->options_cache.data = buf;
-conf->options_cache.len = pos - buf;
+	conf->options_cache.data = buf;
+	conf->options_cache.len = pos - buf;
+	
+	return 1;
+}

data/ext/nginx/CacheLocationConfig.c.erb

@@ -1,6 +1,6 @@
 /*
  *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2014 Phusion
+ *  Copyright (c) 2010-2015 Phusion
  *
  *  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
  *
@@ -61,8 +61,10 @@ def header_name_for(option)
 end
 %>
 
-size_t len = 0;
-u_char int_buf[32], *end, *buf, *pos;
+/* 0: NGX_ERROR, 1: OK */
+int generated_cache_location_part(ngx_conf_t *cf, passenger_loc_conf_t *conf) {
+	size_t len = 0;
+	u_char int_buf[32], *end, *buf, *pos;
 
 /* Calculate lengths */
 <% for option in filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS) %>
@@ -107,7 +109,7 @@ u_char int_buf[32], *end, *buf, *pos;
 /* Create string */
 buf = pos = ngx_pnalloc(cf->pool, len);
 if (buf == NULL) {
-	return NGX_ERROR;
+	return 0;
 }
 
 <% for option in filter_eligible_options(LOCATION_CONFIGURATION_OPTIONS) %>
@@ -149,5 +151,8 @@ if (buf == NULL) {
 	<% end %>
 <% end %>
 
-conf->options_cache.data = buf;
-conf->options_cache.len = pos - buf;
+	conf->options_cache.data = buf;
+	conf->options_cache.len = pos - buf;
+	
+	return 1;
+}

data/ext/nginx/Configuration.c

@@ -38,7 +38,7 @@
 #include "Configuration.h"
 #include "ContentHandler.h"
 #include "common/Constants.h"
-#include "common/agents/LoggingAgent/FilterSupport.h"
+#include "common/agent/UstRouter/FilterSupport.h"
 #include "common/Utils/modp_b64.h"
 
 
@@ -248,6 +248,8 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     return NGX_CONF_OK;
 }
 
+#include "CreateLocationConfig.c"
+
 void *
 passenger_create_loc_conf(ngx_conf_t *cf)
 {
@@ -273,7 +275,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
      *     conf->upstream_config.store_values = NULL;
      */
 
-    #include "CreateLocationConfig.c"
+    generated_set_conf_part(conf);
 
     /******************************/
     /******************************/
@@ -349,6 +351,8 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     return conf;
 }
 
+#include "CacheLocationConfig.c"
+
 static ngx_int_t
 cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
 {
@@ -357,9 +361,15 @@ cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
     size_t         unencoded_len;
     u_char        *unencoded_buf;
 
-    #include "CacheLocationConfig.c"
+    if (generated_cache_location_part(cf, conf) == 0) {
+    	return NGX_ERROR;
+    }
 
     if (conf->env_vars != NULL) {
+    	size_t len = 0;
+    	u_char *buf;
+    	u_char *pos;
+
         /* Cache env vars data as base64-serialized string.
          * First, calculate the length of the unencoded data.
          */
@@ -418,6 +428,8 @@ cache_loc_conf_options(ngx_conf_t *cf, passenger_loc_conf_t *conf)
     return NGX_OK;
 }
 
+#include "MergeLocationConfig.c"
+
 char *
 passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 {
@@ -430,7 +442,10 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
     clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
 
-    #include "MergeLocationConfig.c"
+    if (generated_merge_part(conf, prev, cf) == 0) {
+    	return NGX_CONF_ERROR;
+    }
+
     if (prev->options_cache.data == NULL) {
         if (cache_loc_conf_options(cf, prev) != NGX_OK) {
             ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
@@ -1106,9 +1121,9 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         passenger_conf->enabled = 1;
 
         /* Register a placeholder value as upstream address. The real upstream
-         * address (the helper agent socket filename) will be set while processing
-         * requests, because we can't start the helper agent until config
-         * loading is done.
+         * address (the Passenger core socket filename) will be set while processing
+         * requests, because we can't start the watchdog (and thus the Passenger core)
+         * until config loading is done.
          */
         ngx_memzero(&upstream_url, sizeof(ngx_url_t));
         upstream_url.url = pp_placeholder_upstream_address;

data/ext/nginx/Configuration.h

@@ -31,25 +31,7 @@
 #include <ngx_config.h>
 #include <ngx_http.h>
 
-typedef struct {
-    ngx_http_upstream_conf_t upstream_config;
-    ngx_array_t *flushes;
-    ngx_array_t *headers_set_len;
-    ngx_array_t *headers_set;
-    ngx_hash_t   headers_set_hash;
-
-    /** Raw HTTP header data for this location are cached here. */
-    ngx_str_t    options_cache;
-    ngx_str_t    env_vars_cache;
-
-    #include "ConfigurationFields.h"
-
-#if (NGX_HTTP_CACHE)
-    ngx_http_complex_value_t cache_key;
-#endif
-
-    /************************************/
-} passenger_loc_conf_t;
+#include "ConfigurationFields.h"
 
 typedef struct {
     ngx_str_t    root_dir;

data/ext/nginx/ConfigurationFields.h

@@ -35,6 +35,17 @@
  *   rm -f ext/nginx/ConfigurationFields.h
  *   rake ext/nginx/ConfigurationFields.h
  */
+ 
+ typedef struct {
+    ngx_http_upstream_conf_t upstream_config;
+    ngx_array_t *flushes;
+    ngx_array_t *headers_set_len;
+    ngx_array_t *headers_set;
+    ngx_hash_t   headers_set_hash;
+
+    /** Raw HTTP header data for this location are cached here. */
+    ngx_str_t    options_cache;
+    ngx_str_t    env_vars_cache;
 
 
 
@@ -113,3 +124,11 @@
 
 	ngx_str_t vary_turbocache_by_cookie;
 
+
+
+#if (NGX_HTTP_CACHE)
+    ngx_http_complex_value_t cache_key;
+#endif
+
+    /************************************/
+} passenger_loc_conf_t;

data/ext/nginx/ConfigurationFields.h.erb

@@ -35,6 +35,17 @@
  *   rm -f ext/nginx/ConfigurationFields.h
  *   rake ext/nginx/ConfigurationFields.h
  */
+ 
+ typedef struct {
+    ngx_http_upstream_conf_t upstream_config;
+    ngx_array_t *flushes;
+    ngx_array_t *headers_set_len;
+    ngx_array_t *headers_set;
+    ngx_hash_t   headers_set_hash;
+
+    /** Raw HTTP header data for this location are cached here. */
+    ngx_str_t    options_cache;
+    ngx_str_t    env_vars_cache;
 
 <%
 require 'phusion_passenger/nginx/config_options'
@@ -90,3 +101,11 @@ end
 <% for definition in definitions %>
 	<%= definition[0] %>;
 <% end %>
+
+
+#if (NGX_HTTP_CACHE)
+    ngx_http_complex_value_t cache_key;
+#endif
+
+    /************************************/
+} passenger_loc_conf_t;

data/ext/nginx/ContentHandler.c

@@ -1,7 +1,7 @@
 /*
  * Copyright (C) Igor Sysoev
  * Copyright (C) 2007 Manlio Perillo (manlio.perillo@gmail.com)
- * Copyright (C) 2010-2014 Phusion
+ * Copyright (C) 2010-2015 Phusion
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -207,35 +207,35 @@ static void
 set_upstream_server_address(ngx_http_upstream_t *upstream, ngx_http_upstream_conf_t *upstream_config) {
     ngx_http_upstream_server_t *servers = upstream_config->upstream->servers->elts;
     ngx_addr_t                 *address = &servers[0].addrs[0];
-    const char                 *server_address;
-    unsigned int                server_address_len;
+    const char                 *core_address;
+    unsigned int                core_address_len;
     struct sockaddr_un         *sockaddr;
 
     /* The Nginx API makes it extremely difficult to register an upstream server
      * address outside of the configuration loading phase. However we don't know
-     * the helper agent's request socket filename until we're done with loading
+     * the Passenger core's request socket filename until we're done with loading
      * the configuration. So during configuration loading we register a placeholder
      * address for the upstream configuration, and while processing requests
-     * we substitute the placeholder filename with the real helper agent request
+     * we substitute the placeholder filename with the real Passenger core request
      * socket filename.
      */
     if (address->name.data == pp_placeholder_upstream_address.data) {
         sockaddr = (struct sockaddr_un *) address->sockaddr;
-        server_address =
-            pp_agents_starter_get_server_address(pp_agents_starter,
-                                                 &server_address_len);
-        server_address += sizeof("unix:") - 1;
-        server_address_len -= sizeof("unix:") - 1;
-
-        address->name.data = (u_char *) server_address;
-        address->name.len  = server_address_len;
-        strncpy(sockaddr->sun_path, server_address, sizeof(sockaddr->sun_path));
+        core_address =
+            pp_agents_starter_get_core_address(pp_agents_starter,
+                                               &core_address_len);
+        core_address += sizeof("unix:") - 1;
+        core_address_len -= sizeof("unix:") - 1;
+
+        address->name.data = (u_char *) core_address;
+        address->name.len  = core_address_len;
+        strncpy(sockaddr->sun_path, core_address, sizeof(sockaddr->sun_path));
         sockaddr->sun_path[sizeof(sockaddr->sun_path) - 1] = '\0';
     }
 }
 
 /**
- * If the helper agent socket cannot be connected to then we want Nginx to print
+ * If the Passenger core socket cannot be connected to then we want Nginx to print
  * the proper socket filename in the error message. The socket filename is stored
  * in one of the upstream peer data structures. This name is initialized during
  * the first ngx_http_read_client_request_body() call so there's no way to fix the
@@ -247,8 +247,8 @@ fix_peer_address(ngx_http_request_t *r) {
     ngx_http_upstream_rr_peers_t     *peers;
     ngx_http_upstream_rr_peer_t      *peer;
     unsigned int                      peer_index;
-    const char                       *server_address;
-    unsigned int                      server_address_len;
+    const char                       *core_address;
+    unsigned int                      core_address_len;
 
     if (r->upstream->peer.get != ngx_http_upstream_get_round_robin_peer) {
         /* This function only supports the round-robin upstream method. */
@@ -257,24 +257,24 @@ fix_peer_address(ngx_http_request_t *r) {
 
     rrp        = r->upstream->peer.data;
     peers      = rrp->peers;
-    server_address =
-        pp_agents_starter_get_server_address(pp_agents_starter,
-                                             &server_address_len);
+    core_address =
+        pp_agents_starter_get_core_address(pp_agents_starter,
+                                             &core_address_len);
 
     while (peers != NULL) {
         if (peers->name) {
-            if (peers->name->data == (u_char *) server_address) {
+            if (peers->name->data == (u_char *) core_address) {
                 /* Peer names already fixed. */
                 return;
             }
-            peers->name->data = (u_char *) server_address;
-            peers->name->len  = server_address_len;
+            peers->name->data = (u_char *) core_address;
+            peers->name->len  = core_address_len;
         }
         peer_index = 0;
         while (1) {
             peer = &peers->peer[peer_index];
-            peer->name.data = (u_char *) server_address;
-            peer->name.len  = server_address_len;
+            peer->name.data = (u_char *) core_address;
+            peer->name.len  = core_address_len;
             if (peer->down) {
                 peer_index++;
             } else {
@@ -312,7 +312,7 @@ create_key(ngx_http_request_t *r)
 
 /**
  * Checks whether the given header is "Transfer-Encoding".
- * We do not pass Transfer-Encoding headers to the HelperAgent because
+ * We do not pass Transfer-Encoding headers to the Passenger core because
  * Nginx always buffers the request body and always sets Content-Length
  * in the request headers.
  */
@@ -342,7 +342,7 @@ typedef struct {
     ngx_str_t     app_type;
     ngx_str_t     escaped_uri;
     ngx_str_t     content_length;
-    ngx_str_t     server_password;
+    ngx_str_t     core_password;
     ngx_str_t     remote_port;
 } buffer_construction_state;
 
@@ -448,9 +448,9 @@ prepare_request_buffer_construction(ngx_http_request_t *r, passenger_context_t *
             - state->content_length.data;
     }
 
-    state->server_password.data = (u_char *) pp_agents_starter_get_server_password(
+    state->core_password.data = (u_char *) pp_agents_starter_get_core_password(
         pp_agents_starter, &len);
-    state->server_password.len  = len;
+    state->core_password.len  = len;
 
     switch (r->connection->sockaddr->sa_family) {
     #if (NGX_HAVE_INET6)
@@ -628,11 +628,11 @@ construct_request_buffer(ngx_http_request_t *r, passenger_loc_conf_t *slcf,
 
     if (b != NULL) {
         b->last = ngx_copy(b->last, "!~: ", sizeof("!~: ") - 1);
-        b->last = ngx_copy(b->last, state->server_password.data,
-            state->server_password.len);
+        b->last = ngx_copy(b->last, state->core_password.data,
+            state->core_password.len);
         b->last = ngx_copy(b->last, "\r\n", sizeof("\r\n") - 1);
     }
-    total_size += (sizeof("!~: \r\n") - 1) + state->server_password.len;
+    total_size += (sizeof("!~: \r\n") - 1) + state->core_password.len;
 
     PUSH_STATIC_STR("!~DOCUMENT_ROOT: ");
     if (b != NULL) {
@@ -1450,7 +1450,7 @@ passenger_content_handler(ngx_http_request_t *r)
     }
 
 
-    /* Setup upstream stuff and prepare sending the request to the HelperAgent. */
+    /* Setup upstream stuff and prepare sending the request to the Passenger core. */
 
     if (ngx_http_upstream_create(r) != NGX_OK) {
         return NGX_HTTP_INTERNAL_SERVER_ERROR;