SOURCES (DEVEL): drupal-cron.patch - update to 5.1

[glen]

Author: glen                         Date: Mon Mar 12 09:36:59 2007 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- update to 5.1

---- Files affected:
SOURCES:
   drupal-cron.patch (1.5 -> 1.5.2.1) 

---- Diffs:

================================================================
Index: SOURCES/drupal-cron.patch
diff -u SOURCES/drupal-cron.patch:1.5 SOURCES/drupal-cron.patch:1.5.2.1
--- SOURCES/drupal-cron.patch:1.5	Tue Jan 30 17:04:28 2007
+++ SOURCES/drupal-cron.patch	Mon Mar 12 10:36:54 2007
@@ -1,27 +1,34 @@
---- ./includes/bootstrap.inc	2005-10-11 10:02:05.000000000 +0300
-+++ /tmp/bootstrap.inc	2005-10-11 10:01:51.000000000 +0300
-@@ -50,7 +50,7 @@
- 
-   $confdir = '/etc/drupal/sites';
-   $uri = explode('/', $_SERVER['PHP_SELF']);
--  $server = explode('.', rtrim($_SERVER['HTTP_HOST'], '.'));
-+  $server = explode('.', rtrim(@$_SERVER['HTTP_HOST'], '.'));
+--- drupal/includes/bootstrap.inc~	2007-01-30 09:20:05.000000000 +0200
++++ drupal/includes/bootstrap.inc	2007-03-12 11:29:22.377223778 +0200
+@@ -201,7 +201,7 @@
+ 
+   $confdir = '/etc/webapps/drupal/sites';
+   $uri = explode('/', $_SERVER['PHP_SELF'] ? $_SERVER['PHP_SELF'] : $_SERVER['SCRIPT_FILENAME']);
+-  $server = explode('.', implode('.', array_reverse(explode(':', rtrim($_SERVER['HTTP_HOST'], '.')))));
++  $server = explode('.', implode('.', array_reverse(explode(':', rtrim(@$_SERVER['HTTP_HOST'], '.')))));
    for ($i = count($uri) - 1; $i > 0; $i--) {
      for ($j = count($server); $j > 0; $j--) {
        $dir = implode('.', array_slice($server, -$j)) . implode('.', array_slice($uri, 0, $i));
---- ./includes/session.inc	2005-08-10 23:43:03.000000000 +0300
-+++ /tmp/session.inc	2005-10-11 10:03:38.000000000 +0300
-@@ -25,7 +25,7 @@
-   $result = db_query_range("SELECT u.*, s.* FROM {users} u INNER JOIN {sessions} s ON u.uid = s.uid WHERE s.sid = '%s' AND u.status < 3", $key, 0, 1);
- 
-   if (!db_num_rows($result)) {
--    db_query("INSERT INTO {sessions} (sid, uid, hostname, timestamp) VALUES ('%s', 0, '%s', %d)", $key, $_SERVER["REMOTE_ADDR"], time());
-+    db_query("INSERT INTO {sessions} (sid, uid, hostname, timestamp) VALUES ('%s', 0, '%s', %d)", $key, @$_SERVER["REMOTE_ADDR"], time());
-     $result = db_query("SELECT u.* FROM {users} u WHERE u.uid = 0");
-   }
- 
---- ./cron.php	2005-12-09 20:13:27.000000000 +0200
-+++ drupal-4.6.11/cron.php	2007-01-30 18:02:41.911795649 +0200
+@@ -235,7 +235,7 @@
+ function conf_init() {
+   global $db_url, $db_prefix, $base_url, $base_path, $base_root, $conf, $installed_profile;
+   $conf = array();
+-  include_once './'. conf_path() .'/settings.php';
++  include_once conf_path() .'/settings.php';
+ 
+   if (isset($base_url)) {
+     // Parse fixed base URL from settings.php.
+@@ -250,7 +250,7 @@
+   else {
+     // Create base URL
+     $base_root = (isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] == 'on') ? 'https' : 'http';
+-    $base_url = $base_root .= '://'. $_SERVER['HTTP_HOST'];
++    $base_url = $base_root .= '://'. @$_SERVER['HTTP_HOST'];
+     if ($dir = trim(dirname($_SERVER['PHP_SELF']), '\,/')) {
+       $base_path = "/$dir";
+       $base_url .= $base_path;
+--- drupal-4.6.11/cron.php	2007-01-30 18:02:41.911795649 +0200
++++ drupal-5.1/cron.php	2007-03-12 11:35:43.444806437 +0200
 @@ -1,3 +1,4 @@
 +#!/usr/bin/php
  <?php
@@ -38,6 +45,6 @@
 +
 +chdir(dirname(__FILE__));
 +
- include_once 'includes/bootstrap.inc';
- include_once 'includes/common.inc' ;
- 
+ include_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+ drupal_cron_run();
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/drupal-cron.patch?r1=1.5&r2=1.5.2.1&f=u