summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Douglass2007-05-11 06:16:28 (GMT)
committerRobert Douglass2007-05-11 06:16:28 (GMT)
commit2d8cab74d7a863385ae35e189af70c71f303c813 (patch)
tree80964f1293402ba7ac26caca390caf683006fbab
parent71548cff9165003b5b09966414bd1a6be49ad77f (diff)
Id's all around
-rw-r--r--INSTALLATION.txt12
-rw-r--r--README.txt14
-rw-r--r--memcache.inc2
-rw-r--r--memcache.install1
-rw-r--r--memcache.js2
-rw-r--r--memcache.module1
-rw-r--r--memcachetests.php4
-rw-r--r--session-memcache.inc4
8 files changed, 24 insertions, 16 deletions
diff --git a/INSTALLATION.txt b/INSTALLATION.txt
index 2262e47..f6588ab 100644
--- a/INSTALLATION.txt
+++ b/INSTALLATION.txt
@@ -1,7 +1,9 @@
+// $Id$
+
Fedora memcache + drupal walkthrough
1) Have a look at the background reading
-
+
A - http://www.danga.com/memcached/ (cache daemon)
B - http://pecl.php.net/package/memcache (PHP integration for memcache)
@@ -26,13 +28,13 @@ Fedora memcache + drupal walkthrough
1010 yum install php-devel
1011 rpmbuild --rebuild php-pecl-memcache-2.0.4-1.rf.src.rpm
-3) Installed RPMS
+3) Installed RPMS
[root@yoursite ~]# rpm -Uvh /usr/src/redhat/RPMS/x86_64/memcached-1.2.1-4.rf.x86_64.rpm /usr/src/redhat/RPMS/x86_64/php-pecl-memcache-2.0.4-1.rf.x86_64.rpm
Preparing... ########################################### [100%]
1:php-pecl-memcache ########################################### [ 50%]
2:memcached ########################################### [100%]
-[root@yoursite ~]#
+[root@yoursite ~]#
4) Verify configuration. Change if required.
@@ -51,7 +53,7 @@ Starting Distributed memory caching (memcached): [ OK ]
[root@yoursite ~]# service httpd restart
Stopping httpd: [ OK ]
Starting httpd: [ OK ]
-[root@yoursite ~]#
+[root@yoursite ~]#
Check phpinfo() for memcached status. Mine said
@@ -85,7 +87,7 @@ whole $cfg. The example below uses the default localhost:11211 server.
$conf = array(
'memcache_inc' => './includes/memcache.inc',
);
- [simon@yoursite memcache]$
+ [simon@yoursite memcache]$
8) Enable the drupal module from /admin/build/modules (it's in the "Other"
section)
diff --git a/README.txt b/README.txt
index 66bc30a..22d91b5 100644
--- a/README.txt
+++ b/README.txt
@@ -1,3 +1,5 @@
+// $Id$
+
## INSTALLATION ##
To install, move memcache.inc to your DRUPAL/includes directory (where the
@@ -48,14 +50,14 @@ bins go to 'default'.
$conf = array(
'cache_inc' => './includes/memcache.inc',
- 'memcache_servers' => array('localhost:11211' => 'default',
- 'localhost:11212' => 'default',
- '123.45.67.890:11211' => 'default',
- '123.45.67.891:11211' => 'cluster2',
+ 'memcache_servers' => array('localhost:11211' => 'default',
+ 'localhost:11212' => 'default',
+ '123.45.67.890:11211' => 'default',
+ '123.45.67.891:11211' => 'cluster2',
'123.45.67.892:11211' => 'cluster2'),
- 'memcache_bins' => array('cache' => 'default',
- 'cache_filter' => 'cluster2',
+ 'memcache_bins' => array('cache' => 'default',
+ 'cache_filter' => 'cluster2',
'cache_menu' => 'cluster2'),
);
diff --git a/memcache.inc b/memcache.inc
index 7aa0e9e..aa12d37 100644
--- a/memcache.inc
+++ b/memcache.inc
@@ -1,5 +1,5 @@
<?php
-// $ID$
+// $Id$
global $_memcache_statistics;
$_memcache_statistics = array('get' => array(), 'set' => array(), 'hit' => array());
diff --git a/memcache.install b/memcache.install
index 70deca8..57b4411 100644
--- a/memcache.install
+++ b/memcache.install
@@ -1,4 +1,5 @@
<?php
+// $Id$
/**
* Add serialized field to cache tables
diff --git a/memcache.js b/memcache.js
index 75ea131..60bdc5d 100644
--- a/memcache.js
+++ b/memcache.js
@@ -1,3 +1,5 @@
+// $Id$
+
// Global Killswitch
if (Drupal.jsEnabled) {
$(document).ready(function() {
diff --git a/memcache.module b/memcache.module
index 317749e..c9c3e12 100644
--- a/memcache.module
+++ b/memcache.module
@@ -1,4 +1,5 @@
<?php
+// $Id$
function memcache_init() {
if (strstr($_SERVER['PHP_SELF'], 'update.php') || strstr($_GET['q'], 'autocomplete')) {
diff --git a/memcachetests.php b/memcachetests.php
index 3a310f9..5b37081 100644
--- a/memcachetests.php
+++ b/memcachetests.php
@@ -1,5 +1,5 @@
<?php
-// $ID$
+// $Id$
/*
* Some unit tests used while developing. You may find them instructional.
@@ -395,4 +395,4 @@ function formatStats2($mc1, $mc2, $flush = FALSE) {
print "<tr><td>$count</td><td>". $stats1['bytes']. "</td><td>". $stats2['bytes']. "</td></tr>";
$count++;
}
-?> \ No newline at end of file
+?>
diff --git a/session-memcache.inc b/session-memcache.inc
index 43c64a0..1cc3103 100644
--- a/session-memcache.inc
+++ b/session-memcache.inc
@@ -126,7 +126,7 @@ function sess_regenerate() {
/**
* Counts how many users have sessions. Can count either anonymous sessions, authenticated sessions, or both.
- * Would be insane slow with memcached as we would need to retrieve at least the stats of all object.
+ * Would be insane slow with memcached as we would need to retrieve at least the stats of all object.
* Not implemented.
*/
function sess_count($timestamp = 0, $anonymous = true) {
@@ -156,4 +156,4 @@ function sess_gc($lifetime) {
// to '1814400'. At that value, only after a user doesn't log in after
// three weeks (1814400 seconds) will his/her session be removed.
return TRUE;
-} \ No newline at end of file
+}