passenger 4.0.48 → 4.0.49

data/ext/common/agents/Watchdog/Main.cpp

@@ -169,7 +169,7 @@ setOomScore(const StaticString &score) {
 
 	FILE *f;
 	OomFileType type;
-	
+
 	f = openOomAdjFile("w", type);
 	if (f != NULL) {
 		size_t ret = fwrite(score.data(), 1, score.size(), f);
@@ -188,7 +188,7 @@ setOomScoreNeverKill() {
 	string oldScore;
 	FILE *f;
 	OomFileType type;
-	
+
 	f = openOomAdjFile("r", type);
 	if (f == NULL) {
 		return "";
@@ -207,7 +207,7 @@ setOomScoreNeverKill() {
 		}
 	}
 	fclose(f);
-	
+
 	f = openOomAdjFile("w", type);
 	if (f == NULL) {
 		return "";
@@ -219,7 +219,7 @@ setOomScoreNeverKill() {
 		fprintf(f, "-17\n");
 	}
 	fclose(f);
-	
+
 	return oldScore;
 }
 
@@ -237,34 +237,34 @@ waitForStarterProcessOrWatchers(const WorkingObjectsPtr &wo, vector<AgentWatcher
 	fd_set fds;
 	int max, ret;
 	char x;
-	
+
 	FD_ZERO(&fds);
 	FD_SET(FEEDBACK_FD, &fds);
 	FD_SET(wo->errorEvent.fd(), &fds);
-	
+
 	if (FEEDBACK_FD > wo->errorEvent.fd()) {
 		max = FEEDBACK_FD;
 	} else {
 		max = wo->errorEvent.fd();
 	}
-	
+
 	ret = syscalls::select(max + 1, &fds, NULL, NULL, NULL);
 	if (ret == -1) {
 		int e = errno;
 		P_ERROR("select() failed: " << strerror(e));
 		return false;
 	}
-	
+
 	if (FD_ISSET(wo->errorEvent.fd(), &fds)) {
 		vector<AgentWatcherPtr>::const_iterator it;
 		string message, backtrace, watcherName;
-		
+
 		for (it = watchers.begin(); it != watchers.end() && message.empty(); it++) {
 			message   = (*it)->getErrorMessage();
 			backtrace = (*it)->getErrorBacktrace();
 			watcherName = (*it)->name();
 		}
-		
+
 		if (!message.empty() && backtrace.empty()) {
 			P_ERROR("Error in " << watcherName << " watcher:\n  " << message);
 		} else if (!message.empty() && !backtrace.empty()) {
@@ -340,11 +340,11 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 				// Change process title.
 				strcpy(argv[0], "PassengerWatchdog (cleaning up...)");
 			#endif
-			
+
 			// Wait until all agent processes have exited. The starter
 			// process is responsible for telling the individual agents
 			// to exit.
-			
+
 			max = 0;
 			FD_ZERO(&fds);
 			for (it = watchers.begin(); it != watchers.end(); it++) {
@@ -361,7 +361,7 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 			    && timer.elapsed() < deadline)
 			{
 				struct timeval timeout;
-				
+
 				#ifdef FD_COPY
 					FD_COPY(&fds, &fds2);
 				#else
@@ -370,7 +370,7 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 						FD_SET((*it)->getFeedbackFd(), &fds2);
 					}
 				#endif
-				
+
 				timeout.tv_sec = 0;
 				timeout.tv_usec = 10000;
 				agentProcessesDone = syscalls::select(max + 1, &fds2, NULL, NULL, &timeout);
@@ -413,15 +413,15 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 			P_CRITICAL("An unknown exception occurred during cleaning up");
 			_exit(1);
 		}
-		
+
 	} else if (pid == -1) {
 		// Error
 		e = errno;
 		throw SystemException("fork() failed", e);
-		
+
 	} else {
 		// Parent
-		
+
 		// Let child process handle cleanup.
 		wo->serverInstanceDir->detach();
 		wo->generation->detach();
@@ -431,7 +431,7 @@ cleanupAgentsInBackground(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &
 static void
 forceAllAgentsShutdown(const WorkingObjectsPtr &wo, vector<AgentWatcherPtr> &watchers) {
 	vector<AgentWatcherPtr>::iterator it;
-	
+
 	for (it = watchers.begin(); it != watchers.end(); it++) {
 		(*it)->signalShutdown();
 	}
@@ -488,7 +488,7 @@ initializeBareEssentials(int argc, char *argv[]) {
 	 * so we need to restore it after each fork().
 	 */
 	oldOomScore = setOomScoreNeverKill();
-	
+
 	agentsOptions = initializeAgent(argc, argv, "PassengerWatchdog");
 
 	if (agentsOptions.get("test_binary", false) == "1") {
@@ -556,7 +556,7 @@ maybeSetsid() {
 static void
 lookupDefaultUidGid(uid_t &uid, gid_t &gid) {
 	struct passwd *userEntry;
-	
+
 	userEntry = getpwnam(defaultUser.c_str());
 	if (userEntry == NULL) {
 		throw NonExistentUserException("Default user '" + defaultUser +
@@ -699,7 +699,7 @@ main(int argc, char *argv[]) {
 	WorkingObjectsPtr wo;
 	ServerInstanceDirToucherPtr serverInstanceDirToucher;
 	vector<AgentWatcherPtr> watchers;
-	
+
 	try {
 		TRACE_POINT();
 		initializeOptions();
@@ -728,7 +728,7 @@ main(int argc, char *argv[]) {
 		P_INFO("All Phusion Passenger agents started!");
 		UPDATE_TRACE_POINT();
 		runHookScriptAndThrowOnError("after_watchdog_initialization");
-		
+
 		UPDATE_TRACE_POINT();
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;

data/ext/common/agents/Watchdog/ServerInstanceDirToucher.cpp

@@ -32,14 +32,14 @@ class ServerInstanceDirToucher {
 private:
 	WorkingObjectsPtr wo;
 	oxt::thread *thr;
-	
+
 	void
 	threadMain() {
 		while (!this_thread::interruption_requested()) {
 			syscalls::sleep(60 * 60 * 6);
-			
+
 			begin_touch:
-			
+
 			this_thread::disable_interruption di;
 			this_thread::disable_syscall_interruption dsi;
 			// Fork a process which touches everything in the server instance dir.
@@ -47,9 +47,9 @@ private:
 			if (pid == 0) {
 				// Child
 				int prio, ret, e;
-				
+
 				closeAllFileDescriptors(2);
-				
+
 				// Make process nicer.
 				do {
 					prio = getpriority(PRIO_PROCESS, getpid());
@@ -65,7 +65,7 @@ private:
 				} else {
 					perror("getpriority");
 				}
-				
+
 				do {
 					ret = chdir(wo->serverInstanceDir->getPath().c_str());
 				} while (ret == -1 && errno == EINTR);
@@ -77,9 +77,9 @@ private:
 					fflush(stderr);
 					_exit(1);
 				}
-				
+
 				setOomScore(oldOomScore);
-				
+
 				execlp("/bin/sh", "/bin/sh", "-c", "find . | xargs touch", (char *) 0);
 				e = errno;
 				fprintf(stderr, "Cannot execute 'find . | xargs touch': %s (%d)\n",
@@ -106,7 +106,7 @@ public:
 		thr = new oxt::thread(boost::bind(&ServerInstanceDirToucher::threadMain, this),
 			"Server instance dir toucher", 256 * 1024);
 	}
-	
+
 	~ServerInstanceDirToucher() {
 		thr->interrupt_and_join();
 		delete thr;

data/ext/libeio/eio.c

@@ -80,7 +80,7 @@
 static void eio_destroy (eio_req *req);
 
 #ifndef EIO_FINISH
-# define EIO_FINISH(req)  ((req)->finish) && !EIO_CANCELLED (req) ? (req)->finish (req) : 0
+# define EIO_FINISH(req)  ((req)->finish) ? (req)->finish (req) : 0
 #endif
 
 #ifndef EIO_DESTROY

data/ext/nginx/Configuration.c

@@ -61,12 +61,12 @@ void *
 passenger_create_main_conf(ngx_conf_t *cf)
 {
     passenger_main_conf_t *conf;
-    
+
     conf = ngx_pcalloc(cf->pool, sizeof(passenger_main_conf_t));
     if (conf == NULL) {
         return NGX_CONF_ERROR;
     }
-    
+
     conf->ctl = ngx_array_create(cf->pool, 1, sizeof(ngx_keyval_t));
     if (conf->ctl == NULL) {
         return NGX_CONF_ERROR;
@@ -95,12 +95,12 @@ passenger_create_main_conf(ngx_conf_t *cf)
     conf->union_station_gateway_cert.len = 0;
     conf->union_station_proxy_address.data = NULL;
     conf->union_station_proxy_address.len = 0;
-    
+
     conf->prestart_uris = ngx_array_create(cf->pool, 1, sizeof(ngx_str_t));
     if (conf->prestart_uris == NULL) {
         return NGX_CONF_ERROR;
     }
-    
+
     return conf;
 }
 
@@ -111,10 +111,10 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     struct passwd         *user_entry;
     struct group          *group_entry;
     char buf[128];
-    
+
     conf = &passenger_main_conf;
     *conf = *((passenger_main_conf_t *) conf_pointer);
-    
+
     if (conf->default_ruby.len == 0) {
         conf->default_ruby.data = (u_char *) DEFAULT_RUBY;
         conf->default_ruby.len = strlen(DEFAULT_RUBY);
@@ -123,27 +123,27 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     if (conf->log_level == (ngx_int_t) NGX_CONF_UNSET) {
         conf->log_level = DEFAULT_LOG_LEVEL;
     }
-    
+
     if (conf->debug_log_file.len == 0) {
         conf->debug_log_file.data = (u_char *) "";
     }
-    
+
     if (conf->abort_on_startup_error == NGX_CONF_UNSET) {
         conf->abort_on_startup_error = 0;
     }
-    
+
     if (conf->max_pool_size == (ngx_uint_t) NGX_CONF_UNSET) {
         conf->max_pool_size = DEFAULT_MAX_POOL_SIZE;
     }
-    
+
     if (conf->pool_idle_time == (ngx_uint_t) NGX_CONF_UNSET) {
         conf->pool_idle_time = DEFAULT_POOL_IDLE_TIME;
     }
-    
+
     if (conf->user_switching == NGX_CONF_UNSET) {
         conf->user_switching = 1;
     }
-    
+
     if (conf->default_user.len == 0) {
         conf->default_user.len  = sizeof(DEFAULT_WEB_APP_USER) - 1;
         conf->default_user.data = (u_char *) DEFAULT_WEB_APP_USER;
@@ -157,7 +157,7 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
     if (user_entry == NULL) {
         return "The user specified by the 'default_user' option does not exist.";
     }
-    
+
     if (conf->default_group.len > 0) {
         if (conf->default_group.len > sizeof(buf) - 1) {
             return "Value for 'default_group' is too long.";
@@ -169,34 +169,34 @@ passenger_init_main_conf(ngx_conf_t *cf, void *conf_pointer)
             return "The group specified by the 'default_group' option does not exist.";
         }
     }
-    
+
     if (conf->analytics_log_user.len == 0) {
         conf->analytics_log_user.len  = sizeof(DEFAULT_ANALYTICS_LOG_USER) - 1;
         conf->analytics_log_user.data = (u_char *) DEFAULT_ANALYTICS_LOG_USER;
     }
-    
+
     if (conf->analytics_log_group.len == 0) {
         conf->analytics_log_group.len  = sizeof(DEFAULT_ANALYTICS_LOG_GROUP) - 1;
         conf->analytics_log_group.data = (u_char *) DEFAULT_ANALYTICS_LOG_GROUP;
     }
-    
+
     if (conf->union_station_gateway_address.len == 0) {
         conf->union_station_gateway_address.len = sizeof(DEFAULT_UNION_STATION_GATEWAY_ADDRESS) - 1;
         conf->union_station_gateway_address.data = (u_char *) DEFAULT_UNION_STATION_GATEWAY_ADDRESS;
     }
-    
+
     if (conf->union_station_gateway_port == (ngx_uint_t) NGX_CONF_UNSET) {
         conf->union_station_gateway_port = DEFAULT_UNION_STATION_GATEWAY_PORT;
     }
-    
+
     if (conf->union_station_gateway_cert.len == 0) {
         conf->union_station_gateway_cert.data = (u_char *) "";
     }
-    
+
     if (conf->union_station_proxy_address.len == 0) {
         conf->union_station_proxy_address.data = (u_char *) "";
     }
-    
+
     return NGX_CONF_OK;
 }
 
@@ -271,19 +271,19 @@ passenger_create_loc_conf(ngx_conf_t *cf)
 
     conf->upstream_config.cyclic_temp_file = 0;
     conf->upstream_config.change_buffering = 1;
-    
+
     #define DEFINE_VAR_TO_PASS(header_name, var_name) \
         kv = ngx_array_push(conf->vars_source);       \
         kv->key.data = (u_char *) header_name;        \
         kv->key.len  = strlen(header_name) + 1;       \
         kv->value.data = (u_char *) var_name;         \
         kv->value.len  = strlen(var_name) + 1
-    
+
     conf->vars_source = ngx_array_create(cf->pool, 4, sizeof(ngx_keyval_t));
     if (conf->vars_source == NULL) {
         return NGX_CONF_ERROR;
     }
-    
+
     DEFINE_VAR_TO_PASS("SCGI",            "1");
     DEFINE_VAR_TO_PASS("QUERY_STRING",    "$query_string");
     DEFINE_VAR_TO_PASS("REQUEST_METHOD",  "$request_method");
@@ -329,7 +329,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
         cache_loc_conf_options(cf, prev);
     }
     cache_loc_conf_options(cf, conf);
-    
+
     if (prev->base_uris != NGX_CONF_UNSET_PTR) {
         if (conf->base_uris == NGX_CONF_UNSET_PTR) {
             conf->base_uris = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
@@ -337,7 +337,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                 return NGX_CONF_ERROR;
             }
         }
-        
+
         prev_base_uris = (ngx_str_t *) prev->base_uris->elts;
         for (i = 0; i < prev->base_uris->nelts; i++) {
             base_uri = (ngx_str_t *) ngx_array_push(conf->base_uris);
@@ -347,7 +347,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
             *base_uri = prev_base_uris[i];
         }
     }
-    
+
     if (prev->union_station_filters != NGX_CONF_UNSET_PTR) {
         if (conf->union_station_filters == NGX_CONF_UNSET_PTR) {
             conf->union_station_filters = ngx_array_create(cf->pool, 4, sizeof(ngx_str_t));
@@ -355,7 +355,7 @@ passenger_merge_loc_conf(ngx_conf_t *cf, void *parent, void *child)
                 return NGX_CONF_ERROR;
             }
         }
-        
+
         prev_union_station_filters = (ngx_str_t *) prev->union_station_filters->elts;
         for (i = 0; i < prev->union_station_filters->nelts; i++) {
             union_station_filter = (ngx_str_t *) ngx_array_push(conf->union_station_filters);
@@ -758,7 +758,7 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     value = cf->args->elts;
     if (ngx_strcasecmp(value[1].data, (u_char *) "on") == 0) {
         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
@@ -771,7 +771,7 @@ passenger_enabled(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
         if (passenger_conf->upstream_config.upstream == NULL) {
             return NGX_CONF_ERROR;
         }
-        
+
         clcf = ngx_http_conf_get_module_loc_conf(cf, ngx_http_core_module);
         clcf->handler = passenger_content_handler;
 
@@ -885,7 +885,7 @@ set_null_terminated_keyval_slot(ngx_conf_t *cf, ngx_command_t *cmd, void *conf)
     kv->key.len  = value[1].len + 1;
     last = ngx_copy(kv->key.data, value[1].data, value[1].len);
     *last = '\0';
-    
+
     kv->value.data = ngx_palloc(cf->pool, value[2].len + 1);
     kv->value.len  = value[2].len + 1;
     last = ngx_copy(kv->value.data, value[2].data, value[2].len);

data/ext/nginx/Configuration.h

@@ -38,7 +38,7 @@ typedef struct {
     ngx_array_t *vars;
     /** Raw SCGI header data for this location is cached here. */
     ngx_str_t    options_cache;
-    
+
     #include "ConfigurationFields.h"
 
 #if (NGX_HTTP_CACHE)