passenger 3.0.0 → 3.0.1

data/ext/apache2/Configuration.hpp

@@ -82,9 +82,9 @@ struct DirConfig {
 	/** Whether to autodetect WSGI applications. */
 	Threeway autoDetectWSGI;
 	
-	/** The environment (i.e. value for RAILS_ENV) under which
-	 * Rails applications should operate. */
-	const char *railsEnv;
+	/** The environment (RAILS_ENV/RACK_ENV/WSGI_ENV) under which
+	 * applications should operate. */
+	const char *environment;
 	
 	/** The path to the application's root (for example: RAILS_ROOT
 	 * for Rails applications, directory containing 'config.ru'
@@ -183,6 +183,8 @@ struct DirConfig {
 	 */
 	const char *uploadBufferDir;
 	
+	string unionStationKey;
+	
 	/**
 	 * Whether Phusion Passenger should show friendly error pages.
 	 */
@@ -240,17 +242,9 @@ struct DirConfig {
 		}
 	}
 	
-	const char *getRailsEnv() const {
-		if (railsEnv != NULL) {
-			return railsEnv;
-		} else {
-			return "production";
-		}
-	}
-	
-	const char *getRackEnv() const {
-		if (rackEnv != NULL) {
-			return rackEnv;
+	const char *getEnvironment() const {
+		if (environment != NULL) {
+			return environment;
 		} else {
 			return "production";
 		}
@@ -383,6 +377,10 @@ struct ServerConfig {
 	/** The temp directory that Passenger should use. */
 	string tempDir;
 	
+	string unionStationGatewayAddress;
+	int unionStationGatewayPort;
+	string unionStationGatewayCert;
+	
 	/** Directory in which analytics logs should be saved. */
 	string analyticsLogDir;
 	string analyticsLogUser;
@@ -402,6 +400,9 @@ struct ServerConfig {
 		userSwitching      = true;
 		defaultUser        = DEFAULT_WEB_APP_USER;
 		tempDir            = getSystemTempDir();
+		unionStationGatewayAddress = DEFAULT_UNION_STATION_GATEWAY_ADDRESS;
+		unionStationGatewayPort    = DEFAULT_UNION_STATION_GATEWAY_PORT;
+		unionStationGatewayCert    = "";
 		analyticsLogUser   = DEFAULT_ANALYTICS_LOG_USER;
 		analyticsLogGroup  = DEFAULT_ANALYTICS_LOG_GROUP;
 		analyticsLogPermissions = DEFAULT_ANALYTICS_LOG_PERMISSIONS;

data/ext/apache2/DirectoryMapper.h

@@ -272,22 +272,6 @@ public:
 			return NULL;
 		};
 	}
-	
-	/**
-	 * Returns the environment under which the application should be spawned.
-	 *
-	 * @throws FileSystemException An error occured while examening the filesystem.
-	 */
-	const char *getEnvironment() {
-		switch (getApplicationType()) {
-		case RAILS:
-			return config->getRailsEnv();
-		case RACK:
-			return config->getRackEnv();
-		default:
-			return "production";
-		}
-	}
 };
 
 } // namespace Passenger

data/ext/apache2/Hooks.cpp

@@ -236,7 +236,8 @@ private:
 	 */
 	inline RequestNote *getRequestNote(request_rec *r) {
 		// The union is needed in order to be compliant with
-		// C99/C++'s strict aliasing rules. http://tinyurl.com/g5hgh
+		// C99/C++'s strict aliasing rules.
+		// http://cellperformance.beyond3d.com/articles/2006/06/understanding-strict-aliasing.html
 		union {
 			RequestNote *note;
 			void *pointer;
@@ -566,7 +567,10 @@ private:
 		try {
 			AnalyticsLogPtr log;
 			if (config->analyticsEnabled()) {
-				log = analyticsLogger->newTransaction(config->getAppGroupName(appRoot));
+				log = analyticsLogger->newTransaction(
+					config->getAppGroupName(appRoot),
+					"requests",
+					config->unionStationKey);
 				log->message(string("URI: ") + r->uri);
 			} else {
 				log.reset(new AnalyticsLog());
@@ -640,7 +644,7 @@ private:
 					appRoot,
 					config->getAppGroupName(appRoot),
 					mapper.getApplicationTypeString(),
-					mapper.getEnvironment(),
+					config->getEnvironment(),
 					config->getSpawnMethodString(),
 					config->getUser(),
 					config->getGroup(),
@@ -873,43 +877,40 @@ private:
 	/**
 	 * Convert an HTTP header name to a CGI environment name.
 	 */
-	char *http2env(apr_pool_t *p, const char *name) {
-		char *env_name = apr_pstrcat(p, "HTTP_", name, NULL);
-		char *cp;
+	char *httpToEnv(apr_pool_t *p, const char *headerName) {
+		char *result  = apr_pstrcat(p, "HTTP_", headerName, NULL);
+		char *current = result + sizeof("HTTP_") - 1;
 		
-		for (cp = env_name + 5; *cp != 0; cp++) {
-			if (*cp == '-') {
-				*cp = '_';
+		while (*current != '\0') {
+			if (*current == '-') {
+				*current = '_';
 			} else {
-				*cp = apr_toupper(*cp);
+				*current = apr_toupper(*current);
 			}
+			current++;
 		}
 		
-		return env_name;
+		return result;
 	}
 	
-	char *lookupName(apr_table_t *t, const char *name) {
-		const apr_array_header_t *hdrs_arr = apr_table_elts(t);
-		apr_table_entry_t *hdrs = (apr_table_entry_t *) hdrs_arr->elts;
-		int i;
+	const char *lookupInTable(apr_table_t *table, const char *name) {
+		const apr_array_header_t *headers = apr_table_elts(table);
+		apr_table_entry_t *elements = (apr_table_entry_t *) headers->elts;
 		
-		for (i = 0; i < hdrs_arr->nelts; ++i) {
-			if (hdrs[i].key == NULL) {
-				continue;
-			}
-			if (strcasecmp(hdrs[i].key, name) == 0) {
-				return hdrs[i].val;
+		for (int i = 0; i < headers->nelts; i++) {
+			if (elements[i].key != NULL && strcasecmp(elements[i].key, name) == 0) {
+				return elements[i].val;
 			}
 		}
 		return NULL;
 	}
 	
-	char *lookupHeader(request_rec *r, const char *name) {
-		return lookupName(r->headers_in, name);
+	const char *lookupHeader(request_rec *r, const char *name) {
+		return lookupInTable(r->headers_in, name);
 	}
 	
-	char *lookupEnv(request_rec *r, const char *name) {
-		return lookupName(r->subprocess_env, name);
+	const char *lookupEnv(request_rec *r, const char *name) {
+		return lookupInTable(r->subprocess_env, name);
 	}
 	
 	void inline addHeader(apr_table_t *table, const char *name, const char *value) {
@@ -982,7 +983,7 @@ private:
 		hdrs = (apr_table_entry_t *) hdrs_arr->elts;
 		for (i = 0; i < hdrs_arr->nelts; ++i) {
 			if (hdrs[i].key) {
-				addHeader(headers, http2env(r->pool, hdrs[i].key), hdrs[i].val);
+				addHeader(headers, httpToEnv(r->pool, hdrs[i].key), hdrs[i].val);
 			}
 		}
 		
@@ -1337,9 +1338,9 @@ public:
 			"",
 			serverConfig.analyticsLogDir, serverConfig.analyticsLogUser,
 			serverConfig.analyticsLogGroup, serverConfig.analyticsLogPermissions,
-			DEFAULT_UNION_STATION_GATEWAY_ADDRESS,
-			DEFAULT_UNION_STATION_GATEWAY_PORT,
-			"",
+			serverConfig.unionStationGatewayAddress,
+			serverConfig.unionStationGatewayPort,
+			serverConfig.unionStationGatewayCert,
 			serverConfig.prestartURLs);
 		
 		analyticsLogger = ptr(new AnalyticsLogger(agentsStarter.getLoggingSocketAddress(),

data/ext/boost/algorithm/string/detail/case_conv.hpp

@@ -31,7 +31,7 @@ namespace boost {
             struct to_lowerF : public std::unary_function<CharT, CharT>
             {
                 // Constructor
-                to_lowerF( const std::locale& Loc ) : m_Loc( Loc ) {}
+                to_lowerF( const std::locale& Loc ) : m_Loc( &Loc ) {}
 
                 // Operation
                 CharT operator ()( CharT Ch ) const
@@ -39,11 +39,11 @@ namespace boost {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::tolower( Ch);
                     #else
-                        return std::tolower<CharT>( Ch, m_Loc );
+                        return std::tolower<CharT>( Ch, *m_Loc );
                     #endif
                 }
             private:
-                const std::locale& m_Loc;
+                const std::locale* m_Loc;
             };
 
             // a toupper functor
@@ -51,7 +51,7 @@ namespace boost {
             struct to_upperF : public std::unary_function<CharT, CharT>
             {
                 // Constructor
-                to_upperF( const std::locale& Loc ) : m_Loc( Loc ) {}
+                to_upperF( const std::locale& Loc ) : m_Loc( &Loc ) {}
 
                 // Operation
                 CharT operator ()( CharT Ch ) const
@@ -59,11 +59,11 @@ namespace boost {
                     #if defined(__BORLANDC__) && (__BORLANDC__ >= 0x560) && (__BORLANDC__ <= 0x564) && !defined(_USE_OLD_RW_STL)
                         return std::toupper( Ch);
                     #else
-                        return std::toupper<CharT>( Ch, m_Loc );
+                        return std::toupper<CharT>( Ch, *m_Loc );
                     #endif
                 }
             private:
-                const std::locale& m_Loc;
+                const std::locale* m_Loc;
             };
 
 #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)

data/ext/boost/algorithm/string/detail/find_format.hpp

@@ -49,17 +49,17 @@ namespace boost {
                 if ( !M )
                 {
                     // Match not found - return original sequence
-                    std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
+                    Output = std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
                     return Output;
                 }
 
                 // Copy the beginning of the sequence
-                std::copy( ::boost::begin(Input), ::boost::begin(M), Output );
+                Output = std::copy( ::boost::begin(Input), ::boost::begin(M), Output );
                 // Format find result
                 // Copy formated result
-                std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
+                Output = std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
                 // Copy the rest of the sequence
-                std::copy( M.end(), ::boost::end(Input), Output );
+                Output = std::copy( M.end(), ::boost::end(Input), Output );
 
                 return Output;
             }
@@ -75,12 +75,16 @@ namespace boost {
                 FormatterT Formatter,
                 const FindResultT& FindResult )
             {       
+                if( ::boost::algorithm::detail::check_find_result(Input, FindResult) ) {
                 return ::boost::algorithm::detail::find_format_copy_impl2( 
                     Output,
                     Input,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
+                } else {
+                    return std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
+            }
             }
 
  
@@ -132,11 +136,15 @@ namespace boost {
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
+                if( ::boost::algorithm::detail::check_find_result(Input, FindResult) ) {
                 return ::boost::algorithm::detail::find_format_copy_impl2(
                     Input,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
+                } else {
+                    return Input;
+            }
             }
 
  // replace implementation ----------------------------------------------------//
@@ -180,12 +188,14 @@ namespace boost {
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
+                if( ::boost::algorithm::detail::check_find_result(Input, FindResult) ) {
                 ::boost::algorithm::detail::find_format_impl2(
                     Input,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
             }
+            }
 
         } // namespace detail
     } // namespace algorithm

data/ext/boost/algorithm/string/detail/find_format_all.hpp

@@ -57,9 +57,9 @@ namespace boost {
                 while( M )
                 {
                     // Copy the beginning of the sequence
-                    std::copy( LastMatch, M.begin(), Output );
+                    Output = std::copy( LastMatch, M.begin(), Output );
                     // Copy formated result
-                    std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
+                    Output = std::copy( ::boost::begin(M.format_result()), ::boost::end(M.format_result()), Output );
 
                     // Proceed to the next match
                     LastMatch=M.end();
@@ -67,7 +67,7 @@ namespace boost {
                 }
 
                 // Copy the rest of the sequence
-                std::copy( LastMatch, ::boost::end(Input), Output );
+                Output = std::copy( LastMatch, ::boost::end(Input), Output );
 
                 return Output;
             }
@@ -85,6 +85,7 @@ namespace boost {
                 FormatterT Formatter,
                 const FindResultT& FindResult )
             {       
+                if( ::boost::algorithm::detail::check_find_result(Input, FindResult) ) {
                 return ::boost::algorithm::detail::find_format_all_copy_impl2( 
                     Output,
                     Input,
@@ -92,6 +93,9 @@ namespace boost {
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
+                } else {
+                    return std::copy( ::boost::begin(Input), ::boost::end(Input), Output );
+            }
             }
 
  // find_format_all_copy implementation ----------------------------------------------//
@@ -156,12 +160,16 @@ namespace boost {
                 FormatterT Formatter,
                 const FindResultT& FindResult)
             {
+                if( ::boost::algorithm::detail::check_find_result(Input, FindResult) ) {
                 return ::boost::algorithm::detail::find_format_all_copy_impl2(
                     Input,
                     Finder,
                     Formatter,
                     FindResult,
                     Formatter(FindResult) );
+                } else {
+                    return Input;
+            }
             }
 
  // find_format_all implementation ------------------------------------------------//
@@ -248,6 +256,7 @@ namespace boost {
                 FormatterT Formatter,
                 FindResultT FindResult)
             {
+                if( ::boost::algorithm::detail::check_find_result(Input, FindResult) ) {
                 ::boost::algorithm::detail::find_format_all_impl2(
                     Input,
                     Finder,
@@ -255,6 +264,7 @@ namespace boost {
                     FindResult,
                     Formatter(FindResult) );
             }
+            }
 
         } // namespace detail
     } // namespace algorithm

data/ext/boost/algorithm/string/detail/find_format_store.hpp

@@ -52,7 +52,9 @@ namespace boost {
                 find_format_store& operator=( FindResultT FindResult )
                 {
                     iterator_range<ForwardIteratorT>::operator=(FindResult);
+                    if( !this->empty() ) {
                     m_FormatResult=m_Formatter(FindResult);
+                    }
                     
                     return *this;
                 }
@@ -68,6 +70,15 @@ namespace boost {
                 const formatter_type& m_Formatter;
             };
 
+            template<typename InputT, typename FindResultT>
+            bool check_find_result(InputT& Input, FindResultT& FindResult)
+            {
+                typedef BOOST_STRING_TYPENAME 
+                    range_const_iterator<InputT>::type input_iterator_type; 
+                iterator_range<input_iterator_type> ResultRange(FindResult);
+                return !ResultRange.empty();
+            }
+
 #if BOOST_WORKAROUND(BOOST_MSVC, >= 1400)
 #pragma warning(pop)
 #endif

data/ext/boost/algorithm/string/erase.hpp

@@ -752,7 +752,7 @@ namespace boost {
 
             \param Output An output iterator to which the result will be copied
             \param Input An input string
-            \param N Length of the head.                 
+            \param N Length of the tail.                 
                 For N>=0, at most N characters are extracted.
                 For N<0, size(Input)-|N| characters are extracted.
             \return An output iterator pointing just after the last inserted character or
@@ -797,7 +797,7 @@ namespace boost {
             considered to be the tail. The input sequence is modified in-place.
 
             \param Input An input string
-            \param N Length of the head
+            \param N Length of the tail
                 For N>=0, at most N characters are extracted.
                 For N<0, size(Input)-|N| characters are extracted.
         */

data/ext/boost/bind/placeholders.hpp

@@ -25,7 +25,7 @@
 namespace
 {
 
-#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ < 400)
+#if defined(__BORLANDC__) || defined(__GNUC__) && (__GNUC__ < 4)
 
 static inline boost::arg<1> _1() { return boost::arg<1>(); }
 static inline boost::arg<2> _2() { return boost::arg<2>(); }
@@ -38,7 +38,7 @@ static inline boost::arg<8> _8() { return boost::arg<8>(); }
 static inline boost::arg<9> _9() { return boost::arg<9>(); }
 
 #elif defined(BOOST_MSVC) || (defined(__DECCXX_VER) && __DECCXX_VER <= 60590031) || defined(__MWERKS__) || \
-    defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__ == 400)  
+    defined(__GNUC__) && (__GNUC__ == 4 && __GNUC_MINOR__ < 2)  
 
 static boost::arg<1> _1;
 static boost::arg<2> _2;

data/ext/boost/concept/detail/backward_compatibility.hpp

@@ -0,0 +1,16 @@
+// Copyright David Abrahams 2009. Distributed under 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)
+#ifndef BOOST_CONCEPT_BACKWARD_COMPATIBILITY_DWA200968_HPP
+# define BOOST_CONCEPT_BACKWARD_COMPATIBILITY_DWA200968_HPP
+
+namespace boost
+{
+  namespace concepts {}
+
+# if !defined(BOOST_NO_CONCEPTS) && !defined(BOOST_CONCEPT_NO_BACKWARD_KEYWORD)
+  namespace concept = concepts;
+# endif 
+} // namespace boost::concept
+
+#endif // BOOST_CONCEPT_BACKWARD_COMPATIBILITY_DWA200968_HPP