Merge lp:~fourkitchens/pressflow/6-evented into lp:pressflow

[David Strauss]

[lp:~fourkitchens/pressflow/6-evented]

88. By Aaron Forsander on 2010-07-16

Added very basic support for static files.

89. By Aaron Forsander on 2010-07-17

Drupal's .htaccess doesn't set q with the leading / and it trims trailing slashes anyways.

90. By Aaron Forsander on 2010-07-28

Created DaemonRequest and DaemonResponse classes to make working with requests and responses a little easier. Trying to figure out the appropriate session setup/teardown per request.

91. By Aaron Forsander on 2010-07-28

Cleaning up log output.

92. By David Strauss on 2010-08-22

Merge from 6.x trunk.

Unmerged revisions

92. By David Strauss on 2010-08-22

Merge from 6.x trunk.

91. By Aaron Forsander on 2010-07-28

Cleaning up log output.

90. By Aaron Forsander on 2010-07-28

Created DaemonRequest and DaemonResponse classes to make working with requests and responses a little easier. Trying to figure out the appropriate session setup/teardown per request.

89. By Aaron Forsander on 2010-07-17

Drupal's .htaccess doesn't set q with the leading / and it trims trailing slashes anyways.

88. By Aaron Forsander on 2010-07-16

Added very basic support for static files.

87. By David Strauss on 2010-07-13

Make the port number for the daemon a shell argument.

86. By David Strauss on 2010-07-13

Initial event-driven system.

=== added file 'DaemonRequest.php'
--- DaemonRequest.php	1970-01-01 00:00:00 +0000
+++ DaemonRequest.php	2010-08-22 07:23:38 +0000
@@ -0,0 +1,58 @@
+<?php
+
+class DaemonRequest {
+  public $request;
+  public $method = '';
+  public $uri = '';
+  public $query_string = '';
+  public $path = '';
+  public $headers = array();
+  public $body = '';
+
+  public function __construct($evhttp_request) {
+    $this->request = $evhttp_request;
+    $this->method = evhttp_request_method($this->request);
+    $this->uri = evhttp_request_uri($this->request);
+    $this->headers = evhttp_request_headers($this->request);
+    $this->body = evhttp_request_body($this->request);
+    $this->query_string = parse_url($this->uri, PHP_URL_QUERY);
+    $this->path = parse_url($this->uri, PHP_URL_PATH);
+  }
+
+  public function init() {
+    // Reset request-specific globals
+    foreach (array('_COOKIE', '_POST', '_GET', '_FILES', '_SESSION') as $global) {
+      $GLOBALS[$global] = array();
+    }
+
+    // Initialize SERVER data
+    $_SERVER["REQUEST_METHOD"] = $this->method;
+    $_SERVER["REQUEST_TIME"] = time();
+    $_SERVER["argv"] = $_SERVER["REQUEST_URI"] = $this->uri;
+
+    // Initialize HTTP data
+    foreach ($this->headers as $name => $value) {
+      $_SERVER["HTTP_" . str_replace("-", "_", strtoupper($name))] = $value;
+    }
+    
+    // Initialize POST data
+    if ($this->method === "POST") {
+      parse_str($this->body, $_POST);
+    }
+
+    // Initialize GET data
+    $_SERVER['QUERY_STRING'] = $this->query_string;
+    parse_str($this->query_string, $_GET);
+    $_GET['q'] = trim($this->path, '/');
+
+    // Initialize COOKIE data
+    if ($this->headers['Cookie']) {
+      $cookies = explode(';', $this->headers['Cookie']);
+      foreach ($cookies as $cookie) {
+        list($name, $value) = explode('=', $cookie);
+        $_COOKIE[$name] = $value;
+      }
+    }
+  }
+}
+
 
=== added file 'DaemonResponse.php'
--- DaemonResponse.php	1970-01-01 00:00:00 +0000
+++ DaemonResponse.php	2010-08-22 07:23:38 +0000
@@ -0,0 +1,139 @@
+<?php
+class DaemonResponse {
+  public $request;
+  public $response;
+  public $code;
+  public $body;
+  public $headers = array();
+
+  public static $messages = array(
+    // Informational 1xx
+    100 => 'Continue',
+    101 => 'Switching Protocols',
+
+    // Success 2xx
+    200 => 'OK',
+    201 => 'Created',
+    202 => 'Accepted',
+    203 => 'Non-Authoritative Information',
+    204 => 'No Content',
+    205 => 'Reset Content',
+    206 => 'Partial Content',
+    207 => 'Multi-Status',
+
+    // Redirection 3xx
+    300 => 'Multiple Choices',
+    301 => 'Moved Permanently',
+    302 => 'Found', // 1.1
+    303 => 'See Other',
+    304 => 'Not Modified',
+    305 => 'Use Proxy',
+    // 306 is deprecated but reserved
+    307 => 'Temporary Redirect',
+
+    // Client Error 4xx
+    400 => 'Bad Request',
+    401 => 'Unauthorized',
+    402 => 'Payment Required',
+    403 => 'Forbidden',
+    404 => 'Not Found',
+    405 => 'Method Not Allowed',
+    406 => 'Not Acceptable',
+    407 => 'Proxy Authentication Required',
+    408 => 'Request Timeout',
+    409 => 'Conflict',
+    410 => 'Gone',
+    411 => 'Length Required',
+    412 => 'Precondition Failed',
+    413 => 'Request Entity Too Large',
+    414 => 'Request-URI Too Long',
+    415 => 'Unsupported Media Type',
+    416 => 'Requested Range Not Satisfiable',
+    417 => 'Expectation Failed',
+    422 => 'Unprocessable Entity',
+    423 => 'Locked',
+    424 => 'Failed Dependency',
+
+    // Server Error 5xx
+    500 => 'Internal Server Error',
+    501 => 'Not Implemented',
+    502 => 'Bad Gateway',
+    503 => 'Service Unavailable',
+    504 => 'Gateway Timeout',
+    505 => 'HTTP Version Not Supported',
+    507 => 'Insufficient Storage',
+    509 => 'Bandwidth Limit Exceeded'
+  );
+
+  public function __construct($request) {
+    $this->request = $request;
+  }
+
+  public function addHeader($type, $content) {
+    $this->headers[] = array($type, $content);
+    return $this;
+  }
+
+  public function setBody($body = '') {
+    $this->body = $body;
+    return $this;
+  }
+  
+  public function getBody() {
+    return $this->body;
+  }
+
+  public function setCode($code = 500) {
+    $this->code = $code;
+    return $this;
+  }
+  
+  public function getCode() {
+    return $this->code;
+  }
+
+  public function setResponse($body = NULL, $code = NULL) {
+    $body = $body ? $body : $this->getBody();
+    $code = $code ? $code : $this->getCode();
+
+    foreach ($this->headers as $header) {
+      evhttp_response_add_header($this->request->request, $header[0], $header[1]);
+    }    
+
+    $this->response = evhttp_response_set($body, $code, self::$messages[$code]);
+    return $this;
+  }
+
+  public function getResponse() {
+    $this->setResponse();
+    return $this->response;
+  }
+
+  public function setCookie($name, $value = '', $maxage = 0, $path = '', $domain = '', $secure = false, $HTTPOnly = false)  { 
+    if ($domain) {
+      if (strtolower(substr($domain, 0, 4)) == 'www.') {
+        $domain = substr($domain, 4);
+      }
+      
+      if ($domain[0] != '.') {
+        $domain = '.'.$domain;
+      }
+
+      $port = strpos($domain, ':');
+      if ($port !== FALSE) {
+        $domain = substr($domain, 0, $port);
+      }
+    }
+
+    $header = rawurlencode($name).'='.rawurlencode($value)
+      .(empty($domain) ? '' : '; Domain='.$domain)
+      .(empty($maxage) ? '' : '; Max-Age='.$maxage)
+      .(empty($path) ? '' : '; Path='.$path)
+      .(!$secure ? '' : '; Secure')
+      .(!$HTTPOnly ? '' : '; HttpOnly');
+
+    evhttp_response_add_header($this->request->request, 'Set-Cookie', $header);
+    return $this;
+  }
+}
+
 
=== added file 'evented-daemon.php'
--- evented-daemon.php	1970-01-01 00:00:00 +0000
+++ evented-daemon.php	2010-08-22 07:23:38 +0000
@@ -0,0 +1,120 @@
+<?php
+
+require_once 'DaemonRequest.php';
+require_once 'DaemonResponse.php';
+
+/**
+ * Perform generic bootstrapping for daemonized requests.
+ */
+function daemon_initialize() {
+  global $conf;
+  require_once './includes/bootstrap.inc';
+  require_once './includes/path.inc';
+  require_once './includes/common.inc';
+  require_once './includes/module.inc';
+  drupal_bootstrap(DRUPAL_BOOTSTRAP_DATABASE, TRUE);
+  $conf = variable_init(isset($conf) ? $conf : array());
+  require_once variable_get('session_inc', './includes/session.inc');
+  _drupal_bootstrap_full(TRUE);
+  daemon_log('Base daemon initialized');
+}
+
+function daemon_log($msg) {
+  echo date("c") . " [Pressflow] $msg" . PHP_EOL;
+  return;
+}
+
+/**
+ * Handle an individual request.
+ */
+function daemon_request_callback(DaemonRequest $request) {
+  $start = microtime(TRUE);
+  global $user;
+
+  // Initialize our response object
+  $response = new DaemonResponse($request);
+
+  // MEGAHACK! Your mother would be ashamed!  There is no way around it! This needs 
+  // to be available to the rest of Drupal so it can set headers and whatnot.  This 
+  // causes a segfault unless it is cleaned up at the end of _daemon_request_callback.
+  $GLOBALS['response'] = $response;
+
+  // Initialize server
+  $request->init();
+
+  daemon_log('Using path: ' . $_GET['q']);  
+
+  // Start a new session
+  drupal_session_started(FALSE);
+  drupal_session_initialize();
+  if (!isset($_COOKIE[session_name()])) {
+    $user = drupal_anonymous_user();
+    $session_id = session_id(md5(uniqid('', TRUE)));
+    $response->setCookie(session_name(), $session_id);
+  }
+
+  // Initialize Drupal
+  bootstrap_invoke_all('boot');
+  module_list(TRUE, FALSE);
+  drupal_init_language();
+  drupal_init_path();
+  module_invoke_all('init');
+
+  // Hack to handle static files
+  $static_file_types = array('js' => 'application/x-javascript', 'css' => 'text/css', 'png' => 'image/png', 
+    'jpg' => 'image/jpeg', 'jpeg' => 'image/jpeg', 'gif' => 'image/gif', 'bmp' => 'image/bmp', 
+    'ico' => 'image/x-icon');
+  $ext = pathinfo($_GET['q'], PATHINFO_EXTENSION);
+  if (isset($static_file_types[$ext]) && file_exists($_GET['q']) && strpos(realpath($_GET['q']), getcwd()) === 0) {
+    return $response->addHeader('Content-type', $static_file_types[$ext])->setBody(file_get_contents($_GET['q']))->setCode(200);
+  }
+  else {
+    $response->addHeader('Content-type', 'text/html; charset=utf-8');
+  }
+
+  // Execute the appropriate menu handler.
+  $return = menu_execute_active_handler();
+  
+  // Menu status constants are integers; page content is a string.
+  if (is_int($return)) {
+    switch ($return) {
+      case MENU_NOT_FOUND:
+        daemon_log('Response: Not found');
+        return $response->setBody('Not found.')->setCode(404);
+      case MENU_ACCESS_DENIED:
+        daemon_log('Response: Access denied');
+        return $response->setBody('Access denied.')->setCode(403);
+      case MENU_SITE_OFFLINE:
+        daemon_log('Response: Site offline');
+        return $response->setBody('Service unavailable.')->setCode(503);
+    }
+  }
+  elseif (isset($return)) {
+    // Print any value (including an empty string) except NULL or undefined:
+    $res = theme('page', $return);
+  }
+  
+  drupal_page_footer();
+  session_write_close();
+  return $response->setBody($res)->setCode(200);
+}
+
+function _daemon_request_callback($evhttp_request) {
+  $response = daemon_request_callback(new DaemonRequest($evhttp_request));
+  unset($GLOBALS['response']);
+  return $response->getResponse();
+}
+
+if (!extension_loaded('event')) {
+  dl('event.' . PHP_SHLIB_SUFFIX);
+}
+
+error_reporting(E_ALL & ~E_NOTICE);
+ini_set('display_errors', 1);
+
+daemon_initialize();
+event_init();
+$httpd = evhttp_start('0.0.0.0', $argv[1]);
+evhttp_set_gencb($httpd, '_daemon_request_callback');
+event_dispatch();
+
 
=== modified file 'includes/bootstrap.inc'
--- includes/bootstrap.inc	2010-08-11 21:05:18 +0000
+++ includes/bootstrap.inc	2010-08-22 07:23:38 +0000
@@ -1400,14 +1400,14 @@
  *     DRUPAL_BOOTSTRAP_PATH: set $_GET['q'] to Drupal path of request.
  *     DRUPAL_BOOTSTRAP_FULL: Drupal is fully loaded, validate and fix input data.
  */
-function drupal_bootstrap($phase = NULL) {
+function drupal_bootstrap($phase = NULL, $daemonized = FALSE) {
   static $phases = array(DRUPAL_BOOTSTRAP_CONFIGURATION, DRUPAL_BOOTSTRAP_EARLY_PAGE_CACHE, DRUPAL_BOOTSTRAP_DATABASE, DRUPAL_BOOTSTRAP_ACCESS, DRUPAL_BOOTSTRAP_SESSION, DRUPAL_BOOTSTRAP_LATE_PAGE_CACHE, DRUPAL_BOOTSTRAP_LANGUAGE, DRUPAL_BOOTSTRAP_PATH, DRUPAL_BOOTSTRAP_FULL), $phase_index = 0;
 
   if (isset($phase)) {
     while ($phase >= $phase_index && isset($phases[$phase_index])) {
       $current_phase = $phases[$phase_index];
       unset($phases[$phase_index++]);
-      _drupal_bootstrap($current_phase);
+      _drupal_bootstrap($current_phase, $daemonized);
     }
   }
   
@@ -1424,7 +1424,7 @@
   }
 }
 
-function _drupal_bootstrap($phase) {
+function _drupal_bootstrap($phase, $daemonized) {
   global $conf, $user, $db_prefix;
 
   switch ($phase) {
@@ -1478,11 +1478,9 @@
 
     case DRUPAL_BOOTSTRAP_ACCESS:
       // Deny access to hosts which were banned - t() is not yet available.
-      if (drupal_is_denied('host', ip_address())) {
-        header('HTTP/1.1 403 Forbidden');
-        print 'Sorry, '. check_plain(ip_address()) .' has been banned.';
-        exit();
-      }
+      header('HTTP/1.1 403 Forbidden');
+      print 'Sorry, '. check_plain(ip_address()) .' has been banned.';
+      exit();
       break;
 
     case DRUPAL_BOOTSTRAP_SESSION:
@@ -1665,7 +1663,10 @@
   static $ip_address = NULL;
 
   if (!isset($ip_address)) {
-    $ip_address = $_SERVER['REMOTE_ADDR'];
+    $ip_address = '127.0.0.1';
+    if (isset($_SERVER['REMOTE_ADDR'])) {
+      $ip_address = $_SERVER['REMOTE_ADDR'];
+    }
     
     // Only use parts of the X-Forwarded-For (XFF) header that have followed a trusted route.
     // Specifically, identify the leftmost IP address in the XFF header that is not one of ours.
@@ -1699,7 +1700,7 @@
  */
 function drupal_session_initialize() {
   global $user;
-   
+ 
   session_set_save_handler('sess_open', 'sess_close', 'sess_read', 'sess_write', 'sess_destroy_sid', 'sess_gc');
  
   if (isset($_COOKIE[session_name()])) {
@@ -1823,6 +1824,7 @@
  */
 function drupal_save_session($status = NULL) {
   static $save_session = TRUE;
+
   if (isset($status)) {
     $save_session = $status;
   }
 
=== modified file 'includes/common.inc'
--- includes/common.inc	2010-08-11 21:05:18 +0000
+++ includes/common.inc	2010-08-22 07:23:38 +0000
@@ -303,6 +303,7 @@
  * @see drupal_get_destination()
  */
 function drupal_goto($path = '', $query = NULL, $fragment = NULL, $http_response_code = 302) {
+  global $response;
 
   $destination = FALSE;
   if (isset($_REQUEST['destination'])) {
@@ -335,12 +336,13 @@
   // we need all session data written to the database before redirecting.
   drupal_session_commit();
 
-  header('Location: '. $url, TRUE, $http_response_code);
+  // header('Location: '. $url, TRUE, $http_response_code);
+  $response->addHeader($http_response_code, 'Location: '. $url);
 
   // The "Location" header sends a redirect status code to the HTTP daemon. In
   // some cases this can be wrong, so we make sure none of the code below the
   // drupal_goto() call gets executed upon redirection.
-  exit();
+  // exit();
 }
 
 /**
@@ -1465,7 +1467,7 @@
   global $base_url;
   static $script;
 
-  if (!isset($script)) {
+  if (!isset($script) && isset($_SERVER['SERVER_SOFTWARE'])) {
     // On some web servers, such as IIS, we can't omit "index.php". So, we
     // generate "index.php?q=foo" instead of "?q=foo" on anything that is not
     // Apache.
@@ -2611,7 +2613,7 @@
   return call_user_func_array('_xmlrpc', $args);
 }
 
-function _drupal_bootstrap_full() {
+function _drupal_bootstrap_full($daemonized = FALSE) {
   static $called;
 
   if ($called) {
@@ -2629,10 +2631,10 @@
   require_once './includes/mail.inc';
   require_once './includes/actions.inc';
   // Set the Drupal custom error handler.
-  set_error_handler('_drupal_error_handler');
-  set_exception_handler('_drupal_exception_handler');
+  //set_error_handler('_drupal_error_handler');
+  //set_exception_handler('_drupal_exception_handler');
   // Emit the correct charset HTTP header.
-  drupal_set_header('Content-Type: text/html; charset=utf-8');
+  //drupal_set_header('Content-Type: text/html; charset=utf-8');
   // Detect string handling method
   unicode_check();
   // Undo magic quotes
@@ -2650,7 +2652,7 @@
   module_load_all();
   // Let all modules take action before menu system handles the request
   // We do not want this while running update.php.
-  if (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update') {
+  if (!$daemonized && (!defined('MAINTENANCE_MODE') || MAINTENANCE_MODE != 'update')) {
     module_invoke_all('init');
   }
 }
 
=== modified file 'themes/garland/page.tpl.php'
--- themes/garland/page.tpl.php	2009-04-30 00:36:53 +0000
+++ themes/garland/page.tpl.php	2010-08-22 07:23:38 +0000
@@ -91,5 +91,6 @@
 <!-- /layout -->
 
   <?php print $closure ?>
+  <?php foreach (array($_POST, $_GET, $_COOKIE) as $global) echo print_r($global, TRUE).'<br />'; ?>
   </body>
 </html>