SOURCES (DEVEL): drupal-cron.patch, drupal-topdir.patch - fixed

[glen]

Author: glen                         Date: Fri Dec 30 17:25:20 2005 GMT
Module: SOURCES                       Tag: DEVEL
---- Log message:
- fixed

---- Files affected:
SOURCES:
   drupal-cron.patch (1.2.2.1 -> 1.2.2.2) , drupal-topdir.patch (1.2.2.1 -> 1.2.2.2) 

---- Diffs:

================================================================
Index: SOURCES/drupal-cron.patch
diff -u SOURCES/drupal-cron.patch:1.2.2.1 SOURCES/drupal-cron.patch:1.2.2.2
--- SOURCES/drupal-cron.patch:1.2.2.1	Fri Dec  9 18:33:47 2005
+++ SOURCES/drupal-cron.patch	Fri Dec 30 18:25:14 2005
@@ -1,32 +1,19 @@
-#--- ./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'], '.'));
-#   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-01-09 11:22:38.000000000 +0200
-+++ ./cron.php	2005-12-05 13:27:39.904990542 +0200
-@@ -12,6 +12,7 @@
- // If not in 'safe mode', increase the maximum execution time:
- if (!ini_get('safe_mode')) {
-   set_time_limit(240);
+--- drupal-4.7.0-beta2/cron.php~	2005-12-16 15:23:27.000000000 +0200
++++ drupal-4.7.0-beta2/cron.php	2005-12-30 18:40:40.000000000 +0200
+@@ -1,3 +1,4 @@
++#!/usr/bin/php
+ <?php
+ // $Id$
+ 
+@@ -7,6 +7,11 @@
+  * Handles incoming requests to fire off regularly-scheduled tasks (cron jobs).
+  */
+ 
++// If not in 'safe mode', increase the memory limit
++if (!ini_get('safe_mode')) {
 +  ini_set('memory_limit', '12M');
- }
++}
++
+ include_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
  
- // Check if the last cron run completed

================================================================
Index: SOURCES/drupal-topdir.patch
diff -u SOURCES/drupal-topdir.patch:1.2.2.1 SOURCES/drupal-topdir.patch:1.2.2.2
--- SOURCES/drupal-topdir.patch:1.2.2.1	Fri Dec  9 18:33:48 2005
+++ SOURCES/drupal-topdir.patch	Fri Dec 30 18:25:15 2005
@@ -18,3 +18,13 @@
  include_once './includes/bootstrap.inc';
  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
  include_once './includes/xmlrpc.inc';
+--- drupal-4.7.0-beta2/update.php~	2005-12-16 15:23:27.000000000 +0200
++++ drupal-4.7.0-beta2/update.php	2005-12-30 18:14:14.000000000 +0200
+@@ -486,6 +486,7 @@
+ </ol>';
+ }
+ 
++chdir('..');
+ include_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+ drupal_maintenance_theme();
================================================================

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