passenger 6.0.2 → 6.0.7

data/src/apache2_module/DirConfig/AutoGeneratedMergeFunction.cpp

@@ -88,6 +88,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mBufferUpload != Apache2Module::UNSET)
 		? add->mBufferUpload
 		: base->mBufferUpload;
+	config->mDirectInstanceRequestAddress =
+		(!add->mDirectInstanceRequestAddress.empty())
+		? add->mDirectInstanceRequestAddress
+		: base->mDirectInstanceRequestAddress;
 	config->mEnabled =
 		(add->mEnabled != Apache2Module::UNSET)
 		? add->mEnabled
@@ -176,6 +180,10 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 		(add->mStickySessions != Apache2Module::UNSET)
 		? add->mStickySessions
 		: base->mStickySessions;
+	config->mStickySessionsCookieAttributes =
+		(!add->mStickySessionsCookieAttributes.empty())
+		? add->mStickySessionsCookieAttributes
+		: base->mStickySessionsCookieAttributes;
 	config->mStickySessionsCookieName =
 		(!add->mStickySessionsCookieName.empty())
 		? add->mStickySessionsCookieName
@@ -195,6 +203,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceFile = add->mBaseURIsSourceFile;
 	config->mBufferResponseSourceFile = add->mBufferResponseSourceFile;
 	config->mBufferUploadSourceFile = add->mBufferUploadSourceFile;
+	config->mDirectInstanceRequestAddressSourceFile = add->mDirectInstanceRequestAddressSourceFile;
 	config->mEnabledSourceFile = add->mEnabledSourceFile;
 	config->mErrorOverrideSourceFile = add->mErrorOverrideSourceFile;
 	config->mForceMaxConcurrentRequestsPerProcessSourceFile = add->mForceMaxConcurrentRequestsPerProcessSourceFile;
@@ -217,6 +226,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mStartTimeoutSourceFile = add->mStartTimeoutSourceFile;
 	config->mStartupFileSourceFile = add->mStartupFileSourceFile;
 	config->mStickySessionsSourceFile = add->mStickySessionsSourceFile;
+	config->mStickySessionsCookieAttributesSourceFile = add->mStickySessionsCookieAttributesSourceFile;
 	config->mStickySessionsCookieNameSourceFile = add->mStickySessionsCookieNameSourceFile;
 	config->mUserSourceFile = add->mUserSourceFile;
 
@@ -230,6 +240,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsSourceLine = add->mBaseURIsSourceLine;
 	config->mBufferResponseSourceLine = add->mBufferResponseSourceLine;
 	config->mBufferUploadSourceLine = add->mBufferUploadSourceLine;
+	config->mDirectInstanceRequestAddressSourceLine = add->mDirectInstanceRequestAddressSourceLine;
 	config->mEnabledSourceLine = add->mEnabledSourceLine;
 	config->mErrorOverrideSourceLine = add->mErrorOverrideSourceLine;
 	config->mForceMaxConcurrentRequestsPerProcessSourceLine = add->mForceMaxConcurrentRequestsPerProcessSourceLine;
@@ -252,6 +263,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mStartTimeoutSourceLine = add->mStartTimeoutSourceLine;
 	config->mStartupFileSourceLine = add->mStartupFileSourceLine;
 	config->mStickySessionsSourceLine = add->mStickySessionsSourceLine;
+	config->mStickySessionsCookieAttributesSourceLine = add->mStickySessionsCookieAttributesSourceLine;
 	config->mStickySessionsCookieNameSourceLine = add->mStickySessionsCookieNameSourceLine;
 	config->mUserSourceLine = add->mUserSourceLine;
 
@@ -265,6 +277,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mBaseURIsExplicitlySet = add->mBaseURIsExplicitlySet;
 	config->mBufferResponseExplicitlySet = add->mBufferResponseExplicitlySet;
 	config->mBufferUploadExplicitlySet = add->mBufferUploadExplicitlySet;
+	config->mDirectInstanceRequestAddressExplicitlySet = add->mDirectInstanceRequestAddressExplicitlySet;
 	config->mEnabledExplicitlySet = add->mEnabledExplicitlySet;
 	config->mErrorOverrideExplicitlySet = add->mErrorOverrideExplicitlySet;
 	config->mForceMaxConcurrentRequestsPerProcessExplicitlySet = add->mForceMaxConcurrentRequestsPerProcessExplicitlySet;
@@ -287,6 +300,7 @@ mergeDirConfig_autoGenerated(DirConfig *config, DirConfig *base, DirConfig *add)
 	config->mStartTimeoutExplicitlySet = add->mStartTimeoutExplicitlySet;
 	config->mStartupFileExplicitlySet = add->mStartupFileExplicitlySet;
 	config->mStickySessionsExplicitlySet = add->mStickySessionsExplicitlySet;
+	config->mStickySessionsCookieAttributesExplicitlySet = add->mStickySessionsCookieAttributesExplicitlySet;
 	config->mStickySessionsCookieNameExplicitlySet = add->mStickySessionsCookieNameExplicitlySet;
 	config->mUserExplicitlySet = add->mUserExplicitlySet;
 }

data/src/apache2_module/DirConfig/AutoGeneratedStruct.h

@@ -166,6 +166,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mAppType;
 
+	/*
+	 * The address that Passenger binds to in order to allow sending HTTP requests to individual application processes.
+	 */
+	StaticString mDirectInstanceRequestAddress;
+
 	/*
 	 * The group that Ruby applications must run as.
 	 */
@@ -206,6 +211,11 @@ struct AutoGeneratedDirConfig {
 	 */
 	StaticString mStartupFile;
 
+	/*
+	 * The attributes to use for the sticky session cookie.
+	 */
+	StaticString mStickySessionsCookieAttributes;
+
 	/*
 	 * The cookie name to use for sticky sessions.
 	 */
@@ -249,6 +259,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mAppRootSourceFile;
 	StaticString mAppStartCommandSourceFile;
 	StaticString mAppTypeSourceFile;
+	StaticString mDirectInstanceRequestAddressSourceFile;
 	StaticString mGroupSourceFile;
 	StaticString mMeteorAppSettingsSourceFile;
 	StaticString mNodejsSourceFile;
@@ -257,6 +268,7 @@ struct AutoGeneratedDirConfig {
 	StaticString mRubySourceFile;
 	StaticString mSpawnMethodSourceFile;
 	StaticString mStartupFileSourceFile;
+	StaticString mStickySessionsCookieAttributesSourceFile;
 	StaticString mStickySessionsCookieNameSourceFile;
 	StaticString mUserSourceFile;
 	StaticString mBaseURIsSourceFile;
@@ -284,6 +296,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mAppRootSourceLine;
 	unsigned int mAppStartCommandSourceLine;
 	unsigned int mAppTypeSourceLine;
+	unsigned int mDirectInstanceRequestAddressSourceLine;
 	unsigned int mGroupSourceLine;
 	unsigned int mMeteorAppSettingsSourceLine;
 	unsigned int mNodejsSourceLine;
@@ -292,6 +305,7 @@ struct AutoGeneratedDirConfig {
 	unsigned int mRubySourceLine;
 	unsigned int mSpawnMethodSourceLine;
 	unsigned int mStartupFileSourceLine;
+	unsigned int mStickySessionsCookieAttributesSourceLine;
 	unsigned int mStickySessionsCookieNameSourceLine;
 	unsigned int mUserSourceLine;
 	unsigned int mBaseURIsSourceLine;
@@ -319,6 +333,7 @@ struct AutoGeneratedDirConfig {
 	bool mAppRootExplicitlySet: 1;
 	bool mAppStartCommandExplicitlySet: 1;
 	bool mAppTypeExplicitlySet: 1;
+	bool mDirectInstanceRequestAddressExplicitlySet: 1;
 	bool mGroupExplicitlySet: 1;
 	bool mMeteorAppSettingsExplicitlySet: 1;
 	bool mNodejsExplicitlySet: 1;
@@ -327,6 +342,7 @@ struct AutoGeneratedDirConfig {
 	bool mRubyExplicitlySet: 1;
 	bool mSpawnMethodExplicitlySet: 1;
 	bool mStartupFileExplicitlySet: 1;
+	bool mStickySessionsCookieAttributesExplicitlySet: 1;
 	bool mStickySessionsCookieNameExplicitlySet: 1;
 	bool mUserExplicitlySet: 1;
 	bool mBaseURIsExplicitlySet: 1;
@@ -507,6 +523,15 @@ struct AutoGeneratedDirConfig {
 		return mAppType;
 	}
 
+	StaticString
+	getDirectInstanceRequestAddress() const {
+		if (mDirectInstanceRequestAddress.empty()) {
+			return P_STATIC_STRING("127.0.0.1");
+		} else {
+			return mDirectInstanceRequestAddress;
+		}
+	}
+
 	StaticString
 	getGroup() const {
 		return mGroup;
@@ -563,6 +588,15 @@ struct AutoGeneratedDirConfig {
 		return mStartupFile;
 	}
 
+	StaticString
+	getStickySessionsCookieAttributes() const {
+		if (mStickySessionsCookieAttributes.empty()) {
+			return DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES;
+		} else {
+			return mStickySessionsCookieAttributes;
+		}
+	}
+
 	StaticString
 	getStickySessionsCookieName() const {
 		if (mStickySessionsCookieName.empty()) {

data/src/apache2_module/Hooks.cpp

@@ -1020,6 +1020,10 @@ private:
 			env = (apr_table_entry_t*) env_arr->elts;
 
 			for (i = 0; i < env_arr->nelts; ++i) {
+				if ((strcmp(env[i].key, "SCRIPT_NAME") == 0)
+				 || (strcmp(env[i].key, "PATH_INFO")   == 0)) {
+					continue;
+				}
 				envvarsData.append(env[i].key);
 				envvarsData.append("\0", 1);
 				if (env[i].val != NULL) {
@@ -1334,6 +1338,7 @@ public:
 		config["controller_socket_backlog"] = serverConfig.socketBacklog;
 		config["controller_file_buffered_channel_buffer_dir"] = nonEmptyString(serverConfig.dataBufferDir);
 		config["instance_registry_dir"] = nonEmptyString(serverConfig.instanceRegistryDir);
+		config["spawn_dir"] = nonEmptyString(serverConfig.spawnDir);
 		config["security_update_checker_disabled"] = serverConfig.disableSecurityUpdateCheck;
 		config["security_update_checker_proxy_url"] = nonEmptyString(serverConfig.securityUpdateCheckProxy);
 		config["telemetry_collector_disabled"] = serverConfig.disableAnonymousTelemetry;

data/src/apache2_module/ServerConfig/AutoGeneratedManifestGeneration.cpp

@@ -312,6 +312,17 @@ ConfigManifestGenerator::autoGenerated_generateConfigManifestForServerConfig() {
 			serverConfig.socketBacklogSourceLine);
 		hierarchyMember["value"] = serverConfig.socketBacklog;
 	}
+	if (serverConfig.spawnDirExplicitlySet) {
+		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
+			"PassengerSpawnDir",
+			sizeof("PassengerSpawnDir") - 1);
+		Json::Value &hierarchyMember = addOptionContainerHierarchyMember(optionContainer,
+			serverConfig.spawnDirSourceFile,
+			serverConfig.spawnDirSourceLine);
+		hierarchyMember["value"] = Json::Value(
+			serverConfig.spawnDir.data(),
+			serverConfig.spawnDir.data() + serverConfig.spawnDir.size());
+	}
 	if (serverConfig.statThrottleRateExplicitlySet) {
 		Json::Value &optionContainer = findOrCreateOptionContainer(globalOptionsContainer,
 			"PassengerStatThrottleRate",

data/src/apache2_module/ServerConfig/AutoGeneratedStruct.h

@@ -197,6 +197,11 @@ struct AutoGeneratedServerConfig {
 	 */
 	StaticString securityUpdateCheckProxy;
 
+	/*
+	 * The directory for Phusion Passenger used during child spawning.
+	 */
+	StaticString spawnDir;
+
 	/*
 	 * Prestart the given web applications during startup.
 	 */
@@ -231,6 +236,7 @@ struct AutoGeneratedServerConfig {
 	StaticString logFileSourceFile;
 	StaticString rootSourceFile;
 	StaticString securityUpdateCheckProxySourceFile;
+	StaticString spawnDirSourceFile;
 	StaticString prestartURLsSourceFile;
 
 	unsigned int disableAnonymousTelemetrySourceLine;
@@ -261,6 +267,7 @@ struct AutoGeneratedServerConfig {
 	unsigned int logFileSourceLine;
 	unsigned int rootSourceLine;
 	unsigned int securityUpdateCheckProxySourceLine;
+	unsigned int spawnDirSourceLine;
 	unsigned int prestartURLsSourceLine;
 
 	bool disableAnonymousTelemetryExplicitlySet: 1;
@@ -291,6 +298,7 @@ struct AutoGeneratedServerConfig {
 	bool logFileExplicitlySet: 1;
 	bool rootExplicitlySet: 1;
 	bool securityUpdateCheckProxyExplicitlySet: 1;
+	bool spawnDirExplicitlySet: 1;
 	bool prestartURLsExplicitlySet: 1;
 
 
@@ -349,6 +357,9 @@ struct AutoGeneratedServerConfig {
 		/*
 		 * securityUpdateCheckProxy: default initialized
 		 */
+		/*
+		 * spawnDir: default initialized
+		 */
 		/*
 		 * prestartURLs: default initialized
 		 */
@@ -381,6 +392,7 @@ struct AutoGeneratedServerConfig {
 		logFileSourceLine = 0;
 		rootSourceLine = 0;
 		securityUpdateCheckProxySourceLine = 0;
+		spawnDirSourceLine = 0;
 		prestartURLsSourceLine = 0;
 
 		disableAnonymousTelemetryExplicitlySet = false;
@@ -411,6 +423,7 @@ struct AutoGeneratedServerConfig {
 		logFileExplicitlySet = false;
 		rootExplicitlySet = false;
 		securityUpdateCheckProxyExplicitlySet = false;
+		spawnDirExplicitlySet = false;
 		prestartURLsExplicitlySet = false;
 	}
 

data/src/cxx_supportlib/Constants.h

@@ -48,6 +48,7 @@
 #define DEFAULT_APP_OUTPUT_LOG_LEVEL 3
 #define DEFAULT_APP_OUTPUT_LOG_LEVEL_NAME "notice"
 #define DEFAULT_APP_THREAD_COUNT 1
+#define DEFAULT_BIND_ADDRESS "127.0.0.1"
 #define DEFAULT_CONCURRENCY_MODEL "process"
 #define DEFAULT_FILE_BUFFERED_CHANNEL_THRESHOLD 131072
 #define DEFAULT_HTTP_SERVER_LISTEN_ADDRESS "tcp://127.0.0.1:3000"
@@ -68,9 +69,10 @@
 #define DEFAULT_SPAWN_METHOD "smart"
 #define DEFAULT_START_TIMEOUT 90000
 #define DEFAULT_STAT_THROTTLE_RATE 10
+#define DEFAULT_STICKY_SESSIONS_COOKIE_ATTRIBUTES "SameSite=Lax; Secure;"
 #define DEFAULT_STICKY_SESSIONS_COOKIE_NAME "_passenger_route"
 #define DEFAULT_WEB_APP_USER "nobody"
-#define ENTERPRISE_URL "https://www.phusionpassenger.com/enterprise"
+#define ENTERPRISE_URL "https://www.phusionpassenger.com/features#premium-features"
 #define FEEDBACK_FD 3
 #define FLYING_PASSENGER_NAME "Flying Passenger"
 #define GLOBAL_NAMESPACE_DIRNAME "passenger"
@@ -81,7 +83,7 @@
 #define PASSENGER_API_VERSION_MAJOR 0
 #define PASSENGER_API_VERSION_MINOR 3
 #define PASSENGER_DEFAULT_USER "nobody"
-#define PASSENGER_VERSION "6.0.2"
+#define PASSENGER_VERSION "6.0.7"
 #define POOL_HELPER_THREAD_STACK_SIZE 262144
 #define PROCESS_SHUTDOWN_TIMEOUT 60
 #define PROCESS_SHUTDOWN_TIMEOUT_DISPLAY "1 minute"

data/src/cxx_supportlib/Hooks.h

@@ -80,6 +80,7 @@ namespace {
 				key.append(1, toupper(*data));
 				data++;
 			}
+			if (key == "PASSENGER_CONFIG_MANIFEST") continue;
 			switch (it->type()) {
 			case Json::nullValue:
 			case Json::stringValue:

data/src/cxx_supportlib/LoggingKit/Config.h

@@ -51,6 +51,7 @@ using namespace std;
  *
  *   app_output_log_level         string    -   default("notice")
  *   buffer_logs                  boolean   -   default(false)
+ *   disable_log_prefix           boolean   -   default(false)
  *   file_descriptor_log_target   any       -   -
  *   level                        string    -   default("notice")
  *   redirect_stderr              boolean   -   default(true)

data/src/cxx_supportlib/ServerKit/HttpChunkedBodyParser.h

@@ -112,7 +112,7 @@ private:
 	static int parseHexDigit(char ch) {
 		if (ch >= 'A' && ch <= 'F') {
 			return 10 + ch - 'A';
-		} else if (ch >= 'a' && ch <= 'z') {
+		} else if (ch >= 'a' && ch <= 'f') {
 			return 10 + ch - 'a';
 		} else {
 			return ch - '0';

data/src/cxx_supportlib/SystemTools/ContainerHelpers.h

@@ -43,7 +43,7 @@ _linuxAutoDetectInContainer() {
 		return (file.length() > 0);
 	}
 
-	if (getuid() == 0) {
+	if (geteuid() == 0) {
 		if (fileExists("/proc/1/environ")) {
 			string file = unsafeReadFile("/proc/1/environ");
 			if (file.size() > 0) {
@@ -59,7 +59,7 @@ _linuxAutoDetectInContainer() {
 
 		if (fileExists("/proc/1/sched")) {
 			string file = unsafeReadFile("/proc/1/sched");
-			if (file.length() >= 0) {
+			if (file.length() > 0) {
 				const char t = file[0];
 				if (t == '\0') {
 					return false;

data/src/cxx_supportlib/WebSocketCommandReverseServer.h

@@ -295,6 +295,10 @@ private:
 	bool reconnectAfterReply;
 	bool shuttingDown;
 
+	unsigned int secondsToMilis(double seconds) {
+		return (unsigned int) (seconds * 1000.0);
+	}
+
 	/**
 	 * It could happen that a certain method or handler is invoked
 	 * for a connection that has already been closed. For example,
@@ -528,7 +532,7 @@ private:
 				}
 			}
 
-			conn->set_proxy_timeout(config["proxy_timeout"].asDouble() * 1000, ec);
+			conn->set_proxy_timeout(secondsToMilis(config["proxy_timeout"].asDouble()), ec);
 			if (ec) {
 				P_ERROR(getLogPrefix()
 					<< "Error setting proxy timeout to "
@@ -538,9 +542,9 @@ private:
 			}
 		}
 
-		conn->set_open_handshake_timeout(config["connect_timeout"].asDouble() * 1000);
-		conn->set_pong_timeout(config["ping_timeout"].asDouble() * 1000);
-		conn->set_close_handshake_timeout(config["close_timeout"].asDouble() * 1000);
+		conn->set_open_handshake_timeout(secondsToMilis(config["connect_timeout"].asDouble()));
+		conn->set_pong_timeout(secondsToMilis(config["ping_timeout"].asDouble()));
+		conn->set_close_handshake_timeout(secondsToMilis(config["close_timeout"].asDouble()));
 
 		return true;
 	}
@@ -566,7 +570,7 @@ private:
 	void scheduleReconnect() {
 		P_NOTICE(getLogPrefix() << "Reestablishing connection in " <<
 			config["reconnect_timeout"].asDouble() << " seconds");
-		restartTimer(config["reconnect_timeout"].asDouble() * 1000);
+		restartTimer(secondsToMilis(config["reconnect_timeout"].asDouble()));
 	}
 
 	void closeConnection(websocketpp::close::status::value code,
@@ -626,7 +630,7 @@ private:
 		buffer.clear();
 		P_DEBUG(getLogPrefix() << "Scheduling next ping in " <<
 			config["ping_interval"].asDouble() << " seconds");
-		restartTimer(config["ping_interval"].asDouble() * 1000);
+		restartTimer(secondsToMilis(config["ping_interval"].asDouble()));
 	}
 
 	void onConnectFailed(ConnectionWeakPtr wconn) {
@@ -741,7 +745,7 @@ private:
 
 		P_DEBUG(getLogPrefix() << "Pong received. Scheduling next ping in " <<
 			config["ping_interval"].asDouble() << " seconds");
-		restartTimer(config["ping_interval"].asDouble() * 1000);
+		restartTimer(secondsToMilis(config["ping_interval"].asDouble()));
 	}
 
 	void onMessage(ConnectionWeakPtr wconn, MessagePtr msg) {

data/src/cxx_supportlib/oxt/system_calls.cpp

@@ -132,15 +132,15 @@ shouldSimulateFailure() {
 			_my_errno = errno; \
 		} while ((error_expression) \
 			&& _my_errno == EINTR \
-			&& (!this_thread::syscalls_interruptable() \
-			    || !(_intr_requested = this_thread::interruption_requested())) \
+			&& (!boost::this_thread::syscalls_interruptable() \
+			    || !(_intr_requested = boost::this_thread::interruption_requested())) \
 		); \
 		if (OXT_LIKELY(ctx != NULL)) { \
 			ctx->syscall_interruption_lock.lock(); \
 		} \
 		if ((error_expression) \
 		 && _my_errno == EINTR \
-		 && this_thread::syscalls_interruptable() \
+		 && boost::this_thread::syscalls_interruptable() \
 		 && _intr_requested) { \
 			throw thread_interrupted(); \
 		} \
@@ -284,8 +284,8 @@ syscalls::close(int fd) {
 		}
 		if (ret == -1
 		 && errno == EINTR
-		 && this_thread::syscalls_interruptable()
-		 && this_thread::interruption_requested()) {
+		 && boost::this_thread::syscalls_interruptable()
+		 && boost::this_thread::interruption_requested()) {
 			throw thread_interrupted();
 		} else {
 			return ret;
@@ -662,8 +662,8 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 		}
 	} while (ret == -1
 		&& e == EINTR
-		&& (!this_thread::syscalls_interruptable()
-		    || !(intr_requested = this_thread::interruption_requested()))
+		&& (!boost::this_thread::syscalls_interruptable()
+		    || !(intr_requested = boost::this_thread::interruption_requested()))
 	);
 
 	if (OXT_UNLIKELY(ctx != NULL)) {
@@ -672,7 +672,7 @@ syscalls::nanosleep(const struct timespec *req, struct timespec *rem) {
 
 	if (ret == -1
 	 && e == EINTR
-	 && this_thread::syscalls_interruptable()
+	 && boost::this_thread::syscalls_interruptable()
 	 && intr_requested) {
 		throw thread_interrupted();
 	}
@@ -748,14 +748,14 @@ syscalls::waitpid(pid_t pid, int *status, int options) {
 	 * http://stackoverflow.com/questions/20410943/segmentation-fault-when-accessing-statically-initialized-thread-variable?noredirect=1#comment30483943_20410943
 	 * https://bugzilla.redhat.com/show_bug.cgi?id=731228
 	 */
-	__thread int this_thread::_syscalls_interruptable = 1;
+	__thread int boost::this_thread::_syscalls_interruptable = 1;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {
 		return _syscalls_interruptable;
 	}
 #else
-	boost::thread_specific_ptr<bool> this_thread::_syscalls_interruptable;
+	boost::thread_specific_ptr<bool> boost::this_thread::_syscalls_interruptable;
 
 	bool
 	boost::this_thread::syscalls_interruptable() {