SOURCES (DEVEL): drupal-cron.patch, drupal-topdir.patch - 4.7.0-beta1
glen
glen at pld-linux.org
Fri Dec 9 18:33:53 CET 2005
Author: glen Date: Fri Dec 9 17:33:53 2005 GMT
Module: SOURCES Tag: DEVEL
---- Log message:
- 4.7.0-beta1
---- Files affected:
SOURCES:
drupal-cron.patch (1.2 -> 1.2.2.1) , drupal-topdir.patch (1.2 -> 1.2.2.1)
---- Diffs:
================================================================
Index: SOURCES/drupal-cron.patch
diff -u SOURCES/drupal-cron.patch:1.2 SOURCES/drupal-cron.patch:1.2.2.1
--- SOURCES/drupal-cron.patch:1.2 Mon Dec 5 12:29:29 2005
+++ SOURCES/drupal-cron.patch Fri Dec 9 18:33:47 2005
@@ -1,25 +1,25 @@
---- ./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");
- }
-
+#--- ./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 @@
================================================================
Index: SOURCES/drupal-topdir.patch
diff -u SOURCES/drupal-topdir.patch:1.2 SOURCES/drupal-topdir.patch:1.2.2.1
--- SOURCES/drupal-topdir.patch:1.2 Wed Jul 6 17:46:13 2005
+++ SOURCES/drupal-topdir.patch Fri Dec 9 18:33:48 2005
@@ -1,20 +1,20 @@
---- ./index.php~ 2004-08-21 09:42:34.000000000 +0300
-+++ ./index.php 2005-05-20 14:10:24.260339523 +0300
+--- ./index.php~ 2005-12-09 16:03:31.000000000 +0200
++++ ./index.php 2005-12-09 16:04:54.000000000 +0200
@@ -9,6 +9,7 @@
* prints the appropriate page.
*/
+chdir('..');
- include_once 'includes/bootstrap.inc';
- drupal_page_header();
- include_once 'includes/common.inc';
---- drupal-4.6.2/xmlrpc.php~ 2004-08-21 09:42:34.000000000 +0300
-+++ drupal-4.6.2/xmlrpc.php 2005-07-06 18:44:26.000000000 +0300
+ require_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+
+--- ./xmlrpc.php~ 2005-12-09 16:03:31.000000000 +0200
++++ ./xmlrpc.php 2005-12-09 16:05:14.000000000 +0200
@@ -6,6 +6,7 @@
* PHP page for handling incoming XML-RPC requests from clients.
*/
+chdir('..');
- include_once 'includes/bootstrap.inc';
- include_once 'includes/common.inc';
- include_once 'includes/xmlrpc.inc';
+ include_once './includes/bootstrap.inc';
+ drupal_bootstrap(DRUPAL_BOOTSTRAP_FULL);
+ include_once './includes/xmlrpc.inc';
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/drupal-cron.patch?r1=1.2&r2=1.2.2.1&f=u
http://cvs.pld-linux.org/SOURCES/drupal-topdir.patch?r1=1.2&r2=1.2.2.1&f=u
More information about the pld-cvs-commit
mailing list