passenger 5.1.10 → 5.1.11

data/src/agent/Watchdog/UstRouterWatcher.cpp

@@ -1,80 +0,0 @@
-/*
- *  Phusion Passenger - https://www.phusionpassenger.com/
- *  Copyright (c) 2010-2017 Phusion Holding B.V.
- *
- *  "Passenger", "Phusion Passenger" and "Union Station" are registered
- *  trademarks of Phusion Holding B.V.
- *
- *  Permission is hereby granted, free of charge, to any person obtaining a copy
- *  of this software and associated documentation files (the "Software"), to deal
- *  in the Software without restriction, including without limitation the rights
- *  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- *  copies of the Software, and to permit persons to whom the Software is
- *  furnished to do so, subject to the following conditions:
- *
- *  The above copyright notice and this permission notice shall be included in
- *  all copies or substantial portions of the Software.
- *
- *  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- *  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- *  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- *  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- *  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- *  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
- *  THE SOFTWARE.
- */
-
-class UstRouterWatcher: public AgentWatcher {
-protected:
-	string agentFilename;
-	string socketAddress;
-
-	virtual const char *name() const {
-		return SHORT_PROGRAM_NAME " UstRouter";
-	}
-
-	virtual string getExeFilename() const {
-		return agentFilename;
-	}
-
-	virtual void execProgram() const {
-		if (hasEnvOption("PASSENGER_RUN_UST_ROUTER_IN_VALGRIND", false)) {
-			execlp("valgrind", "valgrind", "--dsymutil=yes", "--track-origins=yes", "--leak-check=full",
-				agentFilename.c_str(), "ust-router",
-				// Some extra space to allow the child process to change its process title.
-				"                                                ", (char *) 0);
-		} else {
-			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("core_password");
-		options.erase("core_authorizations");
-		options.writeToFd(fd);
-	}
-
-	virtual bool processStartupInfo(pid_t pid, FileDescriptor &fd, const vector<string> &args) {
-		return args[0] == "initialized";
-	}
-
-public:
-	UstRouterWatcher(const WorkingObjectsPtr &wo)
-		: AgentWatcher(wo)
-	{
-		agentFilename = wo->resourceLocator->findSupportBinary(AGENT_EXE);
-	}
-
-	virtual void reportAgentsInformation(VariantMap &report) {
-		const VariantMap &options = *agentsOptions;
-		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/src/ruby_supportlib/phusion_passenger/platform_info/macos.rb

@@ -1,45 +0,0 @@
-# encoding: binary
-#  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2017 Phusion Holding B.V.
-#
-#  "Passenger", "Phusion Passenger" and "Union Station" are registered
-#  trademarks of Phusion Holding B.V.
-#
-#  Permission is hereby granted, free of charge, to any person obtaining a copy
-#  of this software and associated documentation files (the "Software"), to deal
-#  in the Software without restriction, including without limitation the rights
-#  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-#  copies of the Software, and to permit persons to whom the Software is
-#  furnished to do so, subject to the following conditions:
-#
-#  The above copyright notice and this permission notice shall be included in
-#  all copies or substantial portions of the Software.
-#
-#  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-#  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-#  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-#  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-#  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-#  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-#  THE SOFTWARE.
-
-PhusionPassenger.require_passenger_lib 'platform_info'
-PhusionPassenger.require_passenger_lib 'platform_info/operating_system'
-
-module PhusionPassenger
-
-  module PlatformInfo
-    # Autodetects the current MacOS distribution and return a number of identifier tags.
-    # The first tag identifies the distribution while the other tags indicate which
-    # distributions it is likely compatible with.
-    # Returns nil if the operating system is not MacOS.
-    def self.macos_version
-      if os_name_simple != "macosx"
-        return nil
-      end
-      `sw_vers -productVersion | cut -d '.' -f 2,3`.to_f
-    end
-    memoize :macos_version
-  end
-
-end # PhusionPassenger