Adam Simpkins
e7a5f77b35
Change the Server API so that users don't have to subclass it in order to override shouldHandle(). Now users can specify a custom std::function for checking allowed URLs. This will make it easier to provide alternative Server implementations. Previously InternalPageServerImpl had to subclass LibEventServer in order to override shouldHandle(). This tied the code to LibEventServer, so that it could not be easily changed to an alternative implementation. It seems like this URL checking functionality should perhaps be moved into the RequestHandler. However, for now this is a simpler change.
59 linhas
2.1 KiB
C++
59 linhas
2.1 KiB
C++
/*
|
|
+----------------------------------------------------------------------+
|
|
| HipHop for PHP |
|
|
+----------------------------------------------------------------------+
|
|
| Copyright (c) 2010-2013 Facebook, Inc. (http://www.facebook.com) |
|
|
+----------------------------------------------------------------------+
|
|
| This source file is subject to version 3.01 of the PHP license, |
|
|
| that is bundled with this package in the file LICENSE, and is |
|
|
| available through the world-wide-web at the following url: |
|
|
| http://www.php.net/license/3_01.txt |
|
|
| If you did not receive a copy of the PHP license and are unable to |
|
|
| obtain it through the world-wide-web, please send a note to |
|
|
| license@php.net so we can mail you a copy immediately. |
|
|
+----------------------------------------------------------------------+
|
|
*/
|
|
|
|
#include "hphp/runtime/base/server/server.h"
|
|
#include "hphp/runtime/base/complex_types.h"
|
|
#include "hphp/runtime/base/server/satellite_server.h"
|
|
#include "hphp/runtime/base/preg.h"
|
|
#include <signal.h>
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
// statics
|
|
|
|
static HPHP::ServerPtrVec AllServers;
|
|
static void on_kill(int sig) {
|
|
signal(sig, SIG_DFL);
|
|
for (unsigned int i = 0; i < AllServers.size(); i++) {
|
|
AllServers[i]->stop();
|
|
}
|
|
raise(sig);
|
|
}
|
|
|
|
namespace HPHP {
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
bool Server::StackTraceOnError = true;
|
|
|
|
void Server::InstallStopSignalHandlers(ServerPtr server) {
|
|
if (AllServers.empty()) {
|
|
signal(SIGTERM, on_kill);
|
|
signal(SIGUSR1, on_kill);
|
|
}
|
|
|
|
AllServers.push_back(server);
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
|
|
Server::Server(const std::string &address, int port, int threadCount)
|
|
: m_address(address), m_port(port), m_threadCount(threadCount),
|
|
m_urlChecker(SatelliteServerInfo::checkMainURL),
|
|
m_status(NOT_YET_STARTED) {
|
|
}
|
|
|
|
///////////////////////////////////////////////////////////////////////////////
|
|
}
|