- updated source/patches for 6.16; untested

[packages/drupal.git] / drupal-cron.patch

diff --git a/drupal-cron.patch b/drupal-cron.patch
index 8b90534d91a7d7e10b5aa064e9c09607f6d9dc1f..3341281eb4190bae5c1887fc16c638e64f06e3b1 100644 (file)
--- a/drupal-cron.patch
+++ b/drupal-cron.patch
@@ -20,42 +20,16 @@ diff -uNdr drupal-5.7.old/cron.php drupal-5.7/cron.php
  include_once './includes/bootstrap.inc';
  drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
  drupal_cron_run();
-diff -uNdr drupal-5.7.old/includes/bootstrap.inc drupal-5.7/includes/bootstrap.inc
---- drupal-5.7.old/includes/bootstrap.inc      2008-01-10 23:14:24.000000000 +0100
-+++ drupal-5.7/includes/bootstrap.inc  2008-02-16 16:02:23.000000000 +0100
-@@ -201,7 +201,7 @@
- 
-   $confdir = 'sites';
-   $uri = explode('/', $_SERVER['SCRIPT_NAME'] ? $_SERVER['SCRIPT_NAME'] : $_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));
-@@ -240,7 +240,7 @@
-   global $db_url, $db_prefix, $cookie_domain, $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.
-@@ -258,7 +258,7 @@
- 
-     // As $_SERVER['HTTP_HOST'] is user input, ensure it only contains
-     // characters allowed in hostnames.
--    $base_url = $base_root .= '://'. preg_replace('/[^a-z0-9-:._]/i', '', $_SERVER['HTTP_HOST']);
-+    $base_url = $base_root .= '://'. preg_replace('/[^a-z0-9-:._]/i', '', @$_SERVER['HTTP_HOST']);
- 
-     // $_SERVER['SCRIPT_NAME'] can, in contrast to $_SERVER['PHP_SELF'], not
-     // be modified by a visitor.
-@@ -886,7 +886,7 @@
- 
-     case DRUPAL_BOOTSTRAP_ACCESS:
-       // Deny access to hosts which were banned - t() is not yet available.
--      if (drupal_is_denied('host', $_SERVER['REMOTE_ADDR'])) {
-+      if (drupal_is_denied('host', @$_SERVER['REMOTE_ADDR'])) {
-         header('HTTP/1.1 403 Forbidden');
-         print 'Sorry, '. $_SERVER['REMOTE_ADDR']. ' has been banned.';
-         exit();
+--- drupal-6.16/includes/bootstrap.inc~        2010-05-04 18:27:27.000000000 +0300
++++ drupal-6.16/includes/bootstrap.inc 2010-05-04 18:31:49.802495730 +0300
+@@ -318,8 +318,8 @@
+     $_SERVER['HTTP_HOST'] = '';
+   }
+ 
+-  if (file_exists('./'. conf_path() .'/settings.php')) {
+-    include_once './'. conf_path() .'/settings.php';
++  if (file_exists(conf_path() .'/settings.php')) {
++    include_once conf_path() .'/settings.php';
+   }
+ 
+   // Ignore the placeholder url from default.settings.php.