passenger 3.0.0 → 3.0.1

data/ext/common/Utils/utf8/unchecked.h

@@ -0,0 +1,229 @@
+// Copyright 2006 Nemanja Trifunovic
+// UTF-8 CPP 2.3
+
+/*
+Permission is hereby granted, free of charge, to any person or organization
+obtaining a copy of the software and accompanying documentation covered by
+this license (the "Software") to use, reproduce, display, distribute,
+execute, and transmit the Software, and to prepare derivative works of the
+Software, and to permit third-parties to whom the Software is furnished to
+do so, all subject to the following:
+
+The copyright notices in the Software and this entire statement, including
+the above license grant, this restriction and the following disclaimer,
+must be included in all copies of the Software, in whole or in part, and
+all derivative works of the Software, unless such copies or derivative
+works are solely in the form of machine-executable object code generated by
+a source language processor.
+
+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, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+*/
+
+
+#ifndef UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+#define UTF8_FOR_CPP_UNCHECKED_H_2675DCD0_9480_4c0c_B92A_CC14C027B731
+
+#include <Utils/utf8/core.h>
+
+namespace utf8
+{
+    namespace unchecked 
+    {
+        template <typename octet_iterator>
+        octet_iterator append(uint32_t cp, octet_iterator result)
+        {
+            if (cp < 0x80)                        // one octet
+                *(result++) = static_cast<uint8_t>(cp);  
+            else if (cp < 0x800) {                // two octets
+                *(result++) = static_cast<uint8_t>((cp >> 6)          | 0xc0);
+                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
+            else if (cp < 0x10000) {              // three octets
+                *(result++) = static_cast<uint8_t>((cp >> 12)         | 0xe0);
+                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
+                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
+            else {                                // four octets
+                *(result++) = static_cast<uint8_t>((cp >> 18)         | 0xf0);
+                *(result++) = static_cast<uint8_t>(((cp >> 12) & 0x3f)| 0x80);
+                *(result++) = static_cast<uint8_t>(((cp >> 6) & 0x3f) | 0x80);
+                *(result++) = static_cast<uint8_t>((cp & 0x3f)        | 0x80);
+            }
+            return result;
+        }
+
+        template <typename octet_iterator>
+        uint32_t next(octet_iterator& it)
+        {
+            uint32_t cp = internal::mask8(*it);
+            typename std::iterator_traits<octet_iterator>::difference_type length = utf8::internal::sequence_length(it);
+            switch (length) {
+                case 1:
+                    break;
+                case 2:
+                    it++;
+                    cp = ((cp << 6) & 0x7ff) + ((*it) & 0x3f);
+                    break;
+                case 3:
+                    ++it; 
+                    cp = ((cp << 12) & 0xffff) + ((internal::mask8(*it) << 6) & 0xfff);
+                    ++it;
+                    cp += (*it) & 0x3f;
+                    break;
+                case 4:
+                    ++it;
+                    cp = ((cp << 18) & 0x1fffff) + ((internal::mask8(*it) << 12) & 0x3ffff);                
+                    ++it;
+                    cp += (internal::mask8(*it) << 6) & 0xfff;
+                    ++it;
+                    cp += (*it) & 0x3f; 
+                    break;
+            }
+            ++it;
+            return cp;        
+        }
+
+        template <typename octet_iterator>
+        uint32_t peek_next(octet_iterator it)
+        {
+            return next(it);    
+        }
+
+        template <typename octet_iterator>
+        uint32_t prior(octet_iterator& it)
+        {
+            while (internal::is_trail(*(--it))) ;
+            octet_iterator temp = it;
+            return next(temp);
+        }
+
+        // Deprecated in versions that include prior, but only for the sake of consistency (see utf8::previous)
+        template <typename octet_iterator>
+        inline uint32_t previous(octet_iterator& it)
+        {
+            return prior(it);
+        }
+
+        template <typename octet_iterator, typename distance_type>
+        void advance (octet_iterator& it, distance_type n)
+        {
+            for (distance_type i = 0; i < n; ++i)
+                next(it);
+        }
+
+        template <typename octet_iterator>
+        typename std::iterator_traits<octet_iterator>::difference_type
+        distance (octet_iterator first, octet_iterator last)
+        {
+            typename std::iterator_traits<octet_iterator>::difference_type dist;
+            for (dist = 0; first < last; ++dist) 
+                next(first);
+            return dist;
+        }
+
+        template <typename u16bit_iterator, typename octet_iterator>
+        octet_iterator utf16to8 (u16bit_iterator start, u16bit_iterator end, octet_iterator result)
+        {       
+            while (start != end) {
+                uint32_t cp = internal::mask16(*start++);
+            // Take care of surrogate pairs first
+                if (internal::is_lead_surrogate(cp)) {
+                    uint32_t trail_surrogate = internal::mask16(*start++);
+                    cp = (cp << 10) + trail_surrogate + internal::SURROGATE_OFFSET;
+                }
+                result = append(cp, result);
+            }
+            return result;         
+        }
+
+        template <typename u16bit_iterator, typename octet_iterator>
+        u16bit_iterator utf8to16 (octet_iterator start, octet_iterator end, u16bit_iterator result)
+        {
+            while (start < end) {
+                uint32_t cp = next(start);
+                if (cp > 0xffff) { //make a surrogate pair
+                    *result++ = static_cast<uint16_t>((cp >> 10)   + internal::LEAD_OFFSET);
+                    *result++ = static_cast<uint16_t>((cp & 0x3ff) + internal::TRAIL_SURROGATE_MIN);
+                }
+                else
+                    *result++ = static_cast<uint16_t>(cp);
+            }
+            return result;
+        }
+
+        template <typename octet_iterator, typename u32bit_iterator>
+        octet_iterator utf32to8 (u32bit_iterator start, u32bit_iterator end, octet_iterator result)
+        {
+            while (start != end)
+                result = append(*(start++), result);
+
+            return result;
+        }
+
+        template <typename octet_iterator, typename u32bit_iterator>
+        u32bit_iterator utf8to32 (octet_iterator start, octet_iterator end, u32bit_iterator result)
+        {
+            while (start < end)
+                (*result++) = next(start);
+
+            return result;
+        }
+
+        // The iterator class
+        template <typename octet_iterator>
+          class iterator : public std::iterator <std::bidirectional_iterator_tag, uint32_t> { 
+            octet_iterator it;
+            public:
+            iterator () {};
+            explicit iterator (const octet_iterator& octet_it): it(octet_it) {}
+            // the default "big three" are OK
+            octet_iterator base () const { return it; }
+            uint32_t operator * () const
+            {
+                octet_iterator temp = it;
+                return next(temp);
+            }
+            bool operator == (const iterator& rhs) const 
+            { 
+                return (it == rhs.it);
+            }
+            bool operator != (const iterator& rhs) const
+            {
+                return !(operator == (rhs));
+            }
+            iterator& operator ++ () 
+            {
+                std::advance(it, internal::sequence_length(it));
+                return *this;
+            }
+            iterator operator ++ (int)
+            {
+                iterator temp = *this;
+                std::advance(it, internal::sequence_length(it));
+                return temp;
+            }  
+            iterator& operator -- ()
+            {
+                prior(it);
+                return *this;
+            }
+            iterator operator -- (int)
+            {
+                iterator temp = *this;
+                prior(it);
+                return temp;
+            }
+          }; // class iterator
+
+    } // namespace utf8::unchecked
+} // namespace utf8 
+
+
+#endif // header guard
+

data/ext/common/Watchdog.cpp

@@ -51,6 +51,7 @@
 #include "Utils.h"
 #include "Utils/Base64.h"
 #include "Utils/Timer.h"
+#include "Utils/ScopeGuard.h"
 #include "Utils/IOUtils.h"
 #include "Utils/VariantMap.h"
 
@@ -88,37 +89,6 @@ static EventFd *errorEvent;
 #define REQUEST_SOCKET_PASSWORD_SIZE     64
 
 
-class FailGuard {
-private:
-	function<void ()> func;
-public:
-	FailGuard() { }
-	FailGuard(const function<void ()> &_func): func(_func) { }
-	
-	~FailGuard() {
-		if (func != NULL) {
-			func();
-		}
-	}
-	
-	void runNow() {
-		if (func != NULL) {
-			function<void ()> func = this->func;
-			this->func = NULL;
-			func();
-		}
-	}
-	
-	void set(const function<void ()> &func) {
-		this->func = func;
-	}
-	
-	void clear() {
-		func = NULL;
-	}
-};
-
-
 /**
  * Abstract base class for watching agent processes.
  */
@@ -137,6 +107,7 @@ private:
 				pid = this->pid;
 				lock.unlock();
 				
+				// Process can be started before the watcher thread is launched.
 				if (pid == 0) {
 					pid = start();
 				}
@@ -301,22 +272,19 @@ public:
 		this_thread::disable_interruption di;
 		this_thread::disable_syscall_interruption dsi;
 		string exeFilename = getExeFilename();
-		int fds[2], e, ret;
+		SocketPair fds;
+		int e, ret;
 		pid_t pid;
 		
 		/* Create feedback fd for this agent process. We'll send some startup
 		 * arguments to this agent process through this fd, and we'll receive
 		 * startup information through it as well.
 		 */
-		if (syscalls::socketpair(AF_UNIX, SOCK_STREAM, 0, fds) == -1) {
-			int e = errno;
-			throw SystemException("Cannot create a Unix socket pair", e);
-		}
+		fds = createUnixSocketPair();
 		
 		pid = syscalls::fork();
 		if (pid == 0) {
 			// Child
-			long max_fds, i;
 			
 			/* Make sure file descriptor FEEDBACK_FD refers to the newly created
 			 * feedback fd (fds[1]) and close all other file descriptors.
@@ -345,11 +313,7 @@ public:
 				}
 			}
 			
-			/* Close all file descriptors except 0-FEEDBACK_FD. */
-			max_fds = sysconf(_SC_OPEN_MAX);
-			for (i = FEEDBACK_FD + 1; i < max_fds; i++) {
-				syscalls::close(i);
-			}
+			closeAllFileDescriptors(FEEDBACK_FD);
 			
 			/* Become the process group leader so that the watchdog can kill the
 			 * agent as well as all its descendant processes. */
@@ -366,49 +330,58 @@ public:
 			try {
 				MessageChannel(FEEDBACK_FD).write("exec error",
 					toString(e).c_str(), NULL);
-				_exit(1);
 			} catch (...) {
 				fprintf(stderr, "Passenger Watchdog: could not execute %s: %s (%d)\n",
 					exeFilename.c_str(), strerror(e), e);
 				fflush(stderr);
-				_exit(1);
 			}
+			_exit(1);
 		} else if (pid == -1) {
 			// Error
 			e = errno;
-			syscalls::close(fds[0]);
-			syscalls::close(fds[1]);
 			throw SystemException("Cannot fork a new process", e);
 		} else {
 			// Parent
-			FileDescriptor feedbackFd(fds[0]);
+			FileDescriptor feedbackFd = fds[0];
 			vector<string> args;
 			
-			syscalls::close(fds[1]);
+			fds[1].close();
 			this_thread::restore_interruption ri(di);
 			this_thread::restore_syscall_interruption rsi(dsi);
-			FailGuard failGuard(boost::bind(killAndWait, pid));
+			ScopeGuard failGuard(boost::bind(killAndWait, pid));
 			
-			// Send startup arguments.
+			/* Send startup arguments. Ignore EPIPE and ECONNRESET here
+			 * because the child process might have sent an feedback message
+			 * without reading startup arguments.
+			 */
 			try {
 				sendStartupArguments(pid, feedbackFd);
 			} catch (const SystemException &ex) {
-				throw SystemException(string("Unable to start the ") + name() +
-					": an error occurred while sending startup arguments",
-					ex.code());
+				if (ex.code() != EPIPE && ex.code() != ECONNRESET) {
+					throw SystemException(string("Unable to start the ") + name() +
+						": an error occurred while sending startup arguments",
+						ex.code());
+				}
 			}
 			
 			// Now read its feedback.
 			try {
-				if (!MessageChannel(feedbackFd).read(args)) {
-					throw EOFException("");
+				ret = MessageChannel(feedbackFd).read(args);
+			} catch (const SystemException &e) {
+				if (e.code() == ECONNRESET) {
+					ret = false;
+				} else {
+					throw SystemException(string("Unable to start the ") + name() +
+						": unable to read its startup information",
+						e.code());
 				}
-			} catch (const EOFException &e) {
+			}
+			if (!ret) {
 				this_thread::disable_interruption di2;
 				this_thread::disable_syscall_interruption dsi2;
 				int status;
 				
-				/* The feedback fd was closed for an unknown reason.
+				/* The feedback fd was prematurely closed for an unknown reason.
 				 * Did the agent process crash?
 				 *
 				 * We use timedWaitPid() here because if the process crashed
@@ -417,7 +390,7 @@ public:
 				 * message, so we give it some time to print the error
 				 * before we kill it.
 				 */
-				ret = timedWaitPid(pid, &status, 1000);
+				ret = timedWaitPid(pid, &status, 5000);
 				if (ret == 0) {
 					/* Doesn't look like it; it seems it's still running.
 					 * We can't do anything without proper feedback so kill
@@ -425,36 +398,40 @@ public:
 					 */
 					failGuard.runNow();
 					throw RuntimeException(string("Unable to start the ") + name() +
-						": an unknown error occurred during its startup");
+						": it froze and reported an unknown error during its startup");
 				} else if (ret != -1 && WIFSIGNALED(status)) {
 					/* Looks like a crash which caused a signal. */
 					throw RuntimeException(string("Unable to start the ") + name() +
 						": it seems to have been killed with signal " +
 						getSignalName(WTERMSIG(status)) + " during startup");
-				} else {
+				} else if (ret == -1) {
 					/* Looks like it exited after detecting an error. */
 					throw RuntimeException(string("Unable to start the ") + name() +
 						": it seems to have crashed during startup for an unknown reason");
+				} else {
+					/* Looks like it exited after detecting an error, but has an exit code. */
+					throw RuntimeException(string("Unable to start the ") + name() +
+						": it seems to have crashed during startup for an unknown reason, "
+						"with exit code " + toString(WEXITSTATUS(status)));
 				}
-			} catch (const SystemException &e) {
-				throw SystemException(string("Unable to start the ") + name() +
-					": unable to read its startup information",
-					e.code());
-			} catch (const RuntimeException &) {
-				/* Rethrow without killing the PID because the process
-				 * is already dead.
-				 */
-				failGuard.clear();
-				throw;
 			}
 			
 			if (args[0] == "system error before exec") {
 				throw SystemException(string("Unable to start the ") + name() +
 					": " + args[1], atoi(args[2]));
 			} else if (args[0] == "exec error") {
-				throw SystemException(string("Unable to start the ") + name() +
-					" because exec(\"" + getExeFilename() + "\") failed",
-					atoi(args[1]));
+				e = atoi(args[1]);
+				if (e == ENOENT) {
+					throw RuntimeException(string("Unable to start the ") + name() +
+						" because its executable (" + getExeFilename() + ") "
+						"doesn't exist. This probably means that your "
+						"Phusion Passenger installation is broken or "
+						"incomplete. Please reinstall Phusion Passenger");
+				} else {
+					throw SystemException(string("Unable to start the ") + name() +
+						" because exec(\"" + getExeFilename() + "\") failed",
+						atoi(args[1]));
+				}
 			} else if (!processStartupInfo(pid, feedbackFd, args)) {
 				throw RuntimeException(string("The ") + name() +
 					" sent an unknown startup info message '" +
@@ -540,7 +517,7 @@ public:
 	}
 	
 	/**
-	 * Returns the agent process feedback fd, or NULL if the agent process
+	 * Returns the agent process feedback fd, or -1 if the agent process
 	 * hasn't been started yet. Can be used to check whether this agent process
 	 * has exited without using waitpid().
 	 */
@@ -681,13 +658,8 @@ private:
 			if (pid == 0) {
 				// Child
 				int prio, ret, e;
-				long max_fds, i;
 				
-				// Close all unnecessary file descriptors.
-				max_fds = sysconf(_SC_OPEN_MAX);
-				for (i = 3; i < max_fds; i++) {
-					syscalls::close(i);
-				}
+				closeAllFileDescriptors(2);
 				
 				// Make process nicer.
 				do {
@@ -919,11 +891,6 @@ forceAllAgentsShutdown(vector<AgentWatcher *> &watchers) {
 
 int
 main(int argc, char *argv[]) {
-	/* Become the session leader so that Apache can't kill this
-	 * watchdog with killpg() during shutdown, and so that a
-	 * Ctrl-C only affects the web server.
-	 */
-	setsid();
 	disableOomKiller();
 	
 	agentsOptions = initializeAgent(argc, argv, "PassengerWatchdog");