passenger 5.0.0.beta2 → 5.0.0.beta3

data/ext/common/agents/LoggingAgent/AdminServer.h

@@ -250,6 +250,24 @@ private:
 		}
 	}
 
+	void processStatusTxt(Client *client, Request *req) {
+		if (req->method != HTTP_GET) {
+			respondWith405(client, req);
+		} else if (authorize(client, req, READONLY)) {
+			HeaderTable headers;
+			headers.insert(req->pool, "content-type", "text/plain");
+
+			stringstream stream;
+			loggingServer->dump(stream);
+			writeSimpleResponse(client, 200, &headers, stream.str());
+			if (!req->ended()) {
+				endRequest(&client, &req);
+			}
+		} else {
+			respondWith401(client, req);
+		}
+	}
+
 	void respondWith401(Client *client, Request *req) {
 		HeaderTable headers;
 		headers.insert(req->pool, "cache-control", "no-cache, no-store, must-revalidate");
@@ -301,7 +319,9 @@ protected:
 		} else if (path == P_STATIC_STRING("/config.json")) {
 			processConfig(client, req);
 		} else if (path == P_STATIC_STRING("/reopen_logs.json")) {
-				processReopenLogs(client, req);
+			processReopenLogs(client, req);
+		} else if (path == P_STATIC_STRING("/status.txt")) {
+			processStatusTxt(client, req);
 		} else {
 			respondWith404(client, req);
 		}

data/ext/nginx/CacheLocationConfig.c

@@ -284,6 +284,14 @@ u_char int_buf[32], *end, *buf, *pos;
 		}
 	
 
+	
+		if (conf->vary_turbocache_by_cookie.data != NULL) {
+			len += sizeof("!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ") - 1;
+			len += conf->vary_turbocache_by_cookie.len;
+			len += sizeof("\r\n") - 1;
+		}
+	
+
 
 /* Create string */
 buf = pos = ngx_pnalloc(cf->pool, len);
@@ -623,6 +631,18 @@ if (buf == NULL) {
 		}
 	
 
+	
+		if (conf->vary_turbocache_by_cookie.data != NULL) {
+			pos = ngx_copy(pos,
+				"!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ",
+				sizeof("!~PASSENGER_VARY_TURBOCACHE_BY_COOKIE: ") - 1);
+			pos = ngx_copy(pos,
+				conf->vary_turbocache_by_cookie.data,
+				conf->vary_turbocache_by_cookie.len);
+			pos = ngx_copy(pos, (const u_char *) "\r\n", sizeof("\r\n") - 1);
+		}
+	
+
 
 conf->options_cache.data = buf;
 conf->options_cache.len = pos - buf;

data/ext/nginx/Configuration.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
@@ -93,6 +93,7 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->abort_on_startup_error = NGX_CONF_UNSET;
     conf->max_pool_size = NGX_CONF_UNSET_UINT;
     conf->pool_idle_time = NGX_CONF_UNSET_UINT;
+    conf->response_buffer_high_watermark = NGX_CONF_UNSET_UINT;
     conf->stat_throttle_rate = NGX_CONF_UNSET_UINT;
     conf->user_switching = NGX_CONF_UNSET;
     conf->show_version_in_header = NGX_CONF_UNSET;
@@ -165,6 +166,10 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
         conf->pool_idle_time = DEFAULT_POOL_IDLE_TIME;
     }
 
+    if (conf->response_buffer_high_watermark == NGX_CONF_UNSET_UINT) {
+        conf->response_buffer_high_watermark = DEFAULT_RESPONSE_BUFFER_HIGH_WATERMARK;
+    }
+
     if (conf->stat_throttle_rate == NGX_CONF_UNSET_UINT) {
         conf->stat_throttle_rate = DEFAULT_STAT_THROTTLE_RATE;
     }
@@ -272,17 +277,29 @@ passenger_create_loc_conf(ngx_conf_t *cf)
 
     conf->upstream_config.store = NGX_CONF_UNSET;
     conf->upstream_config.store_access = NGX_CONF_UNSET_UINT;
+    #if NGINX_VERSION_NUM >= 1007005
+        conf->upstream_config.next_upstream_tries = NGX_CONF_UNSET_UINT;
+    #endif
     conf->upstream_config.buffering = NGX_CONF_UNSET;
     conf->upstream_config.ignore_client_abort = NGX_CONF_UNSET;
+    #if NGINX_VERSION_NUM >= 1007007
+        conf->upstream_config.force_ranges = NGX_CONF_UNSET;
+    #endif
 
     conf->upstream_config.local = NGX_CONF_UNSET_PTR;
 
     conf->upstream_config.connect_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream_config.send_timeout = NGX_CONF_UNSET_MSEC;
     conf->upstream_config.read_timeout = NGX_CONF_UNSET_MSEC;
+    #if NGINX_VERSION_NUM >= 1007005
+        conf->upstream_config.next_upstream_timeout = NGX_CONF_UNSET_MSEC;
+    #endif
 
     conf->upstream_config.send_lowat = NGX_CONF_UNSET_SIZE;
     conf->upstream_config.buffer_size = NGX_CONF_UNSET_SIZE;
+    #if NGINX_VERSION_NUM >= 1007007
+        conf->upstream_config.limit_rate = NGX_CONF_UNSET_SIZE;
+    #endif
 
     conf->upstream_config.busy_buffers_size_conf = NGX_CONF_UNSET_SIZE;
     conf->upstream_config.max_temp_file_size_conf = NGX_CONF_UNSET_SIZE;
@@ -292,14 +309,22 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->upstream_config.pass_request_body = NGX_CONF_UNSET;
 
 #if (NGX_HTTP_CACHE)
-    conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
+    #if NGINX_VERSION_NUM >= 1007009
+        conf->upstream_config.cache = NGX_CONF_UNSET;
+    #else
+        conf->upstream_config.cache = NGX_CONF_UNSET_PTR;
+    #endif
     conf->upstream_config.cache_min_uses = NGX_CONF_UNSET_UINT;
     conf->upstream_config.cache_bypass = NGX_CONF_UNSET_PTR;
     conf->upstream_config.no_cache = NGX_CONF_UNSET_PTR;
     conf->upstream_config.cache_valid = NGX_CONF_UNSET_PTR;
-    #if NGINX_VERSION_NUM >= 1002000
-        conf->upstream_config.cache_lock = NGX_CONF_UNSET;
-        conf->upstream_config.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
+    conf->upstream_config.cache_lock = NGX_CONF_UNSET;
+    conf->upstream_config.cache_lock_timeout = NGX_CONF_UNSET_MSEC;
+    #if NGINX_VERSION_NUM >= 1007008
+        conf->upstream_config.cache_lock_age = NGX_CONF_UNSET_MSEC;
+    #endif
+    #if NGINX_VERSION_NUM >= 1006000
+        conf->upstream_config.cache_revalidate = NGX_CONF_UNSET;
     #endif
 #endif
 
@@ -308,9 +333,7 @@ passenger_create_loc_conf(ngx_conf_t *cf)
     conf->upstream_config.cyclic_temp_file = 0;
     conf->upstream_config.change_buffering = 1;
 
-#if NGINX_VERSION_NUM >= 1000010
     ngx_str_set(&conf->upstream_config.module, "passenger");
-#endif
 
     conf->options_cache.data  = NULL;
     conf->options_cache.len   = 0;
@@ -410,25 +433,54 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     /******************************/
     /******************************/
 
-    if (conf->upstream_config.store != 0) {
-        ngx_conf_merge_value(conf->upstream_config.store,
-                                  prev->upstream_config.store, 0);
+    #if (NGX_HTTP_CACHE) && NGINX_VERSION_NUM >= 1007009
+        if (conf->upstream_config.store > 0) {
+            conf->upstream_config.cache = 0;
+        }
+        if (conf->upstream_config.cache > 0) {
+            conf->upstream_config.store = 0;
+        }
+    #endif
+
+    #if NGINX_VERSION_NUM >= 1007009
+        if (conf->upstream_config.store == NGX_CONF_UNSET) {
+            ngx_conf_merge_value(conf->upstream_config.store,
+                                      prev->upstream_config.store, 0);
 
-        if (conf->upstream_config.store_lengths == NULL) {
             conf->upstream_config.store_lengths = prev->upstream_config.store_lengths;
             conf->upstream_config.store_values = prev->upstream_config.store_values;
         }
-    }
+    #else
+        if (conf->upstream_config.store != 0) {
+            ngx_conf_merge_value(conf->upstream_config.store,
+                                      prev->upstream_config.store, 0);
+
+            if (conf->upstream_config.store_lengths == NULL) {
+                conf->upstream_config.store_lengths = prev->upstream_config.store_lengths;
+                conf->upstream_config.store_values = prev->upstream_config.store_values;
+            }
+        }
+    #endif
 
     ngx_conf_merge_uint_value(conf->upstream_config.store_access,
                               prev->upstream_config.store_access, 0600);
 
+    #if NGINX_VERSION_NUM >= 1007005
+        ngx_conf_merge_uint_value(conf->upstream_config.next_upstream_tries,
+                                  prev->upstream_config.next_upstream_tries, 0);
+    #endif
+
     ngx_conf_merge_value(conf->upstream_config.buffering,
                          prev->upstream_config.buffering, 0);
 
     ngx_conf_merge_value(conf->upstream_config.ignore_client_abort,
                          prev->upstream_config.ignore_client_abort, 0);
 
+    #if NGINX_VERSION_NUM >= 1007007
+        ngx_conf_merge_value(conf->upstream_config.force_ranges,
+                             prev->upstream_config.force_ranges, 0);
+    #endif
+
     ngx_conf_merge_ptr_value(conf->upstream_config.local,
                              prev->upstream_config.local, NULL);
 
@@ -441,6 +493,11 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
     ngx_conf_merge_msec_value(conf->upstream_config.read_timeout,
                               prev->upstream_config.read_timeout, 12000000);
 
+    #if NGINX_VERSION_NUM >= 1007005
+        ngx_conf_merge_msec_value(conf->upstream_config.next_upstream_timeout,
+                                  prev->upstream_config.next_upstream_timeout, 0);
+    #endif
+
     ngx_conf_merge_size_value(conf->upstream_config.send_lowat,
                               prev->upstream_config.send_lowat, 0);
 
@@ -448,6 +505,11 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                               prev->upstream_config.buffer_size,
                               16 * 1024);
 
+    #if NGINX_VERSION_NUM >= 1007007
+        ngx_conf_merge_size_value(conf->upstream_config.limit_rate,
+                                  prev->upstream_config.limit_rate, 0);
+    #endif
+
 
     ngx_conf_merge_bufs_value(conf->upstream_config.bufs, prev->upstream_config.bufs,
                               8, 16 * 1024);
@@ -562,20 +624,42 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
 
 #if (NGX_HTTP_CACHE)
 
-    ngx_conf_merge_ptr_value(conf->upstream_config.cache,
-                             prev->upstream_config.cache, NULL);
+    #if NGINX_VERSION_NUM >= 1007009
+        if (conf->upstream_config.cache == NGX_CONF_UNSET) {
+           ngx_conf_merge_value(conf->upstream_config.cache,
+                                prev->upstream_config.cache, 0);
 
-    if (conf->upstream_config.cache && conf->upstream_config.cache->data == NULL) {
-        ngx_shm_zone_t  *shm_zone;
+           conf->upstream_config.cache_zone = prev->upstream_config.cache_zone;
+           conf->upstream_config.cache_value = prev->upstream_config.cache_value;
+        }
 
-        shm_zone = conf->upstream_config.cache;
+        if (conf->upstream_config.cache_zone && conf->upstream_config.cache_zone->data == NULL) {
+            ngx_shm_zone_t  *shm_zone;
 
-        ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
-                           "\"scgi_cache\" zone \"%V\" is unknown",
-                           &shm_zone->shm.name);
+            shm_zone = conf->upstream_config.cache_zone;
 
-        return NGX_CONF_ERROR;
-    }
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "\"scgi_cache\" zone \"%V\" is unknown",
+                               &shm_zone->shm.name);
+
+            return NGX_CONF_ERROR;
+        }
+    #else
+        ngx_conf_merge_ptr_value(conf->upstream_config.cache,
+                                 prev->upstream_config.cache, NULL);
+
+        if (conf->upstream_config.cache && conf->upstream_config.cache->data == NULL) {
+            ngx_shm_zone_t  *shm_zone;
+
+            shm_zone = conf->upstream_config.cache;
+
+            ngx_conf_log_error(NGX_LOG_EMERG, cf, 0,
+                               "\"scgi_cache\" zone \"%V\" is unknown",
+                               &shm_zone->shm.name);
+
+            return NGX_CONF_ERROR;
+        }
+    #endif
 
     ngx_conf_merge_uint_value(conf->upstream_config.cache_min_uses,
                               prev->upstream_config.cache_min_uses, 1);
@@ -613,12 +697,23 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         conf->cache_key = prev->cache_key;
     }
 
-    #if NGINX_VERSION_NUM >= 1002000
     ngx_conf_merge_value(conf->upstream_config.cache_lock,
                          prev->upstream_config.cache_lock, 0);
 
     ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_timeout,
                               prev->upstream_config.cache_lock_timeout, 5000);
+
+    ngx_conf_merge_value(conf->upstream_config.cache_revalidate,
+                         prev->upstream_config.cache_revalidate, 0);
+
+    #if NGINX_VERSION_NUM >= 1007008
+        ngx_conf_merge_msec_value(conf->upstream_config.cache_lock_age,
+                                  prev->upstream_config.cache_lock_age, 5000);
+    #endif
+
+    #if NGINX_VERSION_NUM >= 1006000
+        ngx_conf_merge_value(conf->upstream_config.cache_revalidate,
+                             prev->upstream_config.cache_revalidate, 0);
     #endif
 
 #endif
@@ -690,7 +785,11 @@ merge_headers(ngx_conf_t *cf, passenger_loc_conf_t *conf, passenger_loc_conf_t *
 
     if (conf->headers_set_hash.buckets
 #if (NGX_HTTP_CACHE)
-        && ((conf->upstream_config.cache == NULL) == (prev->upstream_config.cache == NULL))
+    #if NGINX_VERSION_NUM >= 1007009
+        && ((conf->upstream_config.cache == NGX_CONF_UNSET) == (prev->upstream_config.cache == NGX_CONF_UNSET))
+    #else
+        && ((conf->upstream_config.cache == NGX_CONF_UNSET_PTR) == (prev->upstream_config.cache == NGX_CONF_UNSET_PTR))
+    #endif
 #endif
        )
     {
@@ -1212,6 +1311,13 @@ const ngx_command_t passenger_commands[] = {
       offsetof(passenger_main_conf_t, pool_idle_time),
       NULL },
 
+    { ngx_string("passenger_response_buffer_high_watermark"),
+      NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
+      ngx_conf_set_num_slot,
+      NGX_HTTP_MAIN_CONF_OFFSET,
+      offsetof(passenger_main_conf_t, response_buffer_high_watermark),
+      NULL },
+
     { ngx_string("passenger_stat_throttle_rate"),
       NGX_HTTP_MAIN_CONF | NGX_CONF_TAKE1,
       ngx_conf_set_num_slot,

data/ext/nginx/Configuration.h

@@ -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
@@ -62,6 +62,7 @@ typedef struct {
     ngx_flag_t   abort_on_startup_error;
     ngx_uint_t   max_pool_size;
     ngx_uint_t   pool_idle_time;
+    ngx_uint_t   response_buffer_high_watermark;
     ngx_uint_t   stat_throttle_rate;
     ngx_flag_t   turbocaching;
     ngx_flag_t   show_version_in_header;

data/ext/nginx/ConfigurationCommands.c

@@ -469,6 +469,16 @@
 	NULL
 },
 
+{
+	
+	ngx_string("passenger_vary_turbocache_by_cookie"),
+	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, vary_turbocache_by_cookie),
+	NULL
+},
+
 {
 	
 	ngx_string("passenger_fly_with"),

data/ext/nginx/ConfigurationFields.h

@@ -109,3 +109,5 @@
 
 	ngx_str_t user;
 
+	ngx_str_t vary_turbocache_by_cookie;
+

data/ext/nginx/ContentHandler.c

@@ -1233,7 +1233,7 @@ process_header(ngx_http_request_t *r)
                 ngx_str_set(&u->headers_in.status_line, "200 OK");
             }
 
-            if (u->state) {
+            if (u->state && u->state->status == 0) {
                 u->state->status = u->headers_in.status_n;
             }
 
@@ -1299,11 +1299,6 @@ passenger_content_handler(ngx_http_request_t *r)
 
     if (passenger_main_conf.root_dir.len == 0) {
         return NGX_DECLINED;
-    } else if (r->subrequest_in_memory) {
-        ngx_log_error(NGX_LOG_ALERT, r->connection->log, 0,
-                      "ngx_http_passenger_module does not support "
-                      "subrequest in memory");
-        return NGX_HTTP_INTERNAL_SERVER_ERROR;
     }
 
     slcf = ngx_http_get_module_loc_conf(r, ngx_http_passenger_module);

data/ext/nginx/CreateLocationConfig.c

@@ -191,3 +191,8 @@
 		conf->sticky_sessions_cookie_name.len  = 0;
 	
 
+	
+		conf->vary_turbocache_by_cookie.data = NULL;
+		conf->vary_turbocache_by_cookie.len  = 0;
+	
+

data/ext/nginx/MergeLocationConfig.c

@@ -249,3 +249,9 @@
 			NULL);
 	
 
+	
+		ngx_conf_merge_str_value(conf->vary_turbocache_by_cookie,
+			prev->vary_turbocache_by_cookie,
+			NULL);
+	
+

data/ext/nginx/StaticContentHandler.c

@@ -75,9 +75,7 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
     clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
 
     ngx_memzero(&of, sizeof(ngx_open_file_info_t));
-    #if NGX_VERSION_NUM >= 8000
-        of.read_ahead = clcf->read_ahead;
-    #endif
+    of.read_ahead = clcf->read_ahead;
     of.directio = clcf->directio;
     of.valid = clcf->open_file_cache_valid;
     of.min_uses = clcf->open_file_cache_min_uses;
@@ -121,9 +119,7 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
         return rc;
     }
 
-    #if NGINX_VERSION_NUM >= 7000
-        r->root_tested = !r->error_page;
-    #endif
+    r->root_tested = !r->error_page;
 
     ngx_log_debug1(NGX_LOG_DEBUG_HTTP, log, 0, "http static fd: %d", of.fd);
 
@@ -238,9 +234,7 @@ passenger_static_content_handler(ngx_http_request_t *r, ngx_str_t *filename)
     b->file->fd = of.fd;
     b->file->name = *filename;
     b->file->log = log;
-    #if NGINX_VERSION_NUM >= 7000
-        b->file->directio = of.is_directio;
-    #endif
+    b->file->directio = of.is_directio;
 
     out.buf = b;
     out.next = NULL;