ialex at svn
Nov 20, 2009, 7:37 AM
Post #1 of 1
(78 views)
Permalink
|
|
SVN: [59289] trunk/phase3
|
|
http://www.mediawiki.org/wiki/Special:Code/MediaWiki/59289
Revision: 59289
Author: ialex
Date: 2009-11-20 15:37:28 +0000 (Fri, 20 Nov 2009)
Log Message:
-----------
* (bug 21403) memcached class renamed to MWMemecached to avoid conflict with PHP's memcached extension
* Put MemCachedClientforWiki in memcached-client.php so that maintenance/mctest.php doesn't crash when $wgMainCacheType is not CACHE_MEMCACHED
Based on a patch by Kim Hyun-Joon
Modified Paths:
--------------
trunk/phase3/CREDITS
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/AutoLoader.php
trunk/phase3/includes/ObjectCache.php
trunk/phase3/includes/memcached-client.php
trunk/phase3/maintenance/mcc.php
Modified: trunk/phase3/CREDITS
===================================================================
--- trunk/phase3/CREDITS 2009-11-20 14:35:03 UTC (rev 59288)
+++ trunk/phase3/CREDITS 2009-11-20 15:37:28 UTC (rev 59289)
@@ -81,6 +81,7 @@
* Jidanni
* Jimmy Xu
* Karun Dambietz
+* Kim Hyun-Joon
* liangent
* Lucas Garczewski
* Louperivois
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2009-11-20 14:35:03 UTC (rev 59288)
+++ trunk/phase3/RELEASE-NOTES 2009-11-20 15:37:28 UTC (rev 59289)
@@ -642,6 +642,8 @@
instead of fsockopen() with fwrite().
* (bug 16884) Fixed feed links in sidebar not complying with URL parameters
of the displayed page
+* (bug 21403) memcached class renamed to MWMemecached to avoid conflict with
+ PHP's memcached extension
== API changes in 1.16 ==
Modified: trunk/phase3/includes/AutoLoader.php
===================================================================
--- trunk/phase3/includes/AutoLoader.php 2009-11-20 14:35:03 UTC (rev 59288)
+++ trunk/phase3/includes/AutoLoader.php 2009-11-20 15:37:28 UTC (rev 59289)
@@ -162,10 +162,11 @@
'MediaWikiBagOStuff' => 'includes/BagOStuff.php',
'MediaWiki_I18N' => 'includes/SkinTemplate.php',
'MediaWiki' => 'includes/Wiki.php',
- 'memcached' => 'includes/memcached-client.php',
+ 'MemCachedClientforWiki' => 'includes/memcached-client.php',
'MessageCache' => 'includes/MessageCache.php',
'MimeMagic' => 'includes/MimeMagic.php',
'MWException' => 'includes/Exception.php',
+ 'MWMemcached' => 'includes/memcached-client.php',
'MWNamespace' => 'includes/Namespace.php',
'Namespace' => 'includes/NamespaceCompat.php', // Compat
'OldChangesList' => 'includes/ChangesList.php',
Modified: trunk/phase3/includes/ObjectCache.php
===================================================================
--- trunk/phase3/includes/ObjectCache.php 2009-11-20 14:35:03 UTC (rev 59288)
+++ trunk/phase3/includes/ObjectCache.php 2009-11-20 15:37:28 UTC (rev 59289)
@@ -52,13 +52,6 @@
if ( $type == CACHE_MEMCACHED ) {
if ( !array_key_exists( CACHE_MEMCACHED, $wgCaches ) ) {
- if ( !class_exists( 'MemCachedClientforWiki' ) ) {
- class MemCachedClientforWiki extends memcached {
- function _debugprint( $text ) {
- wfDebug( "memcached: $text" );
- }
- }
- }
$wgCaches[CACHE_MEMCACHED] = new MemCachedClientforWiki(
array('persistant' => $wgMemCachedPersistent, 'compress_threshold' => 1500 ) );
$wgCaches[CACHE_MEMCACHED]->set_servers( $wgMemCachedServers );
Modified: trunk/phase3/includes/memcached-client.php
===================================================================
--- trunk/phase3/includes/memcached-client.php 2009-11-20 14:35:03 UTC (rev 59288)
+++ trunk/phase3/includes/memcached-client.php 2009-11-20 15:37:28 UTC (rev 59289)
@@ -44,7 +44,7 @@
*
* require_once 'memcached.php';
*
- * $mc = new memcached(array(
+ * $mc = new MWMemcached(array(
* 'servers' => array('127.0.0.1:10000',
* array('192.0.0.1:10010', 2),
* '127.0.0.1:10020'),
@@ -63,14 +63,14 @@
// {{{ requirements
// }}}
-// {{{ class memcached
+// {{{ class MWMemcached
/**
* memcached client class implemented using (p)fsockopen()
*
* @author Ryan T. Dean <rtdean [at] cytherianage>
* @ingroup Cache
*/
-class memcached
+class MWMemcached
{
// {{{ properties
// {{{ public
@@ -1082,3 +1082,9 @@
// vim: sts=3 sw=3 et
// }}}
+
+class MemCachedClientforWiki extends MWMemcached {
+ function _debugprint( $text ) {
+ wfDebug( "memcached: $text" );
+ }
+}
Modified: trunk/phase3/maintenance/mcc.php
===================================================================
--- trunk/phase3/maintenance/mcc.php 2009-11-20 14:35:03 UTC (rev 59288)
+++ trunk/phase3/maintenance/mcc.php 2009-11-20 15:37:28 UTC (rev 59289)
@@ -10,7 +10,7 @@
/** */
require_once( dirname(__FILE__) . '/commandLine.inc' );
-$mcc = new memcached( array('persistant' => true/*, 'debug' => true*/) );
+$mcc = new MWMemcached( array('persistant' => true/*, 'debug' => true*/) );
$mcc->set_servers( $wgMemCachedServers );
#$mcc->set_debug( true );
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS [at] lists
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
