brion at svn
Jul 8, 2008, 6:07 PM
Views: 33
Permalink
|
|
SVN: [37360] trunk/phase3
|
|
Revision: 37360
Author: brion
Date: 2008-07-09 01:07:49 +0000 (Wed, 09 Jul 2008)
Log Message:
-----------
Revert r37295 "(bug 14159) Use of MEMCACHE_COMPRESSED constant causes an E_NOTICE on PHP installs with the Memcache module installed. Renamed to MEMCACHE_MCOMPRESSED."
No such constant is modified here... there's a class constant instead which is being renamed, apparently for no reason.
Modified Paths:
--------------
trunk/phase3/RELEASE-NOTES
trunk/phase3/includes/memcached-client.php
Modified: trunk/phase3/RELEASE-NOTES
===================================================================
--- trunk/phase3/RELEASE-NOTES 2008-07-08 23:38:56 UTC (rev 37359)
+++ trunk/phase3/RELEASE-NOTES 2008-07-09 01:07:49 UTC (rev 37360)
@@ -425,8 +425,6 @@
* (bug 14709) Fix login success message formatting when using cookie check
* (bug 14710) Remove "donate" link from default sidebar
* (bug 14745) Image moving works on sites that transform thumbnails via 404
-* (bug 14159) Use of MEMCACHE_COMPRESSED constant no longer causes E_NOTICE
- on PHP installs with the Memcache module installed.
* (bug 2186) Document.write() in wikibits caused failures when using
application/xhtml+xml. The calls to this have been removed.
Modified: trunk/phase3/includes/memcached-client.php
===================================================================
--- trunk/phase3/includes/memcached-client.php 2008-07-08 23:38:56 UTC (rev 37359)
+++ trunk/phase3/includes/memcached-client.php 2008-07-09 01:07:49 UTC (rev 37360)
@@ -86,7 +86,7 @@
/**
* Flag: indicates data is compressed
*/
- const MCOMPRESSED = 2;
+ const COMPRESSED = 2;
// }}}
@@ -908,7 +908,7 @@
return false;
}
- if ($this->_have_zlib && $flags & memcached::MCOMPRESSED)
+ if ($this->_have_zlib && $flags & memcached::COMPRESSED)
$ret[$rkey] = gzuncompress($ret[$rkey]);
$ret[$rkey] = rtrim($ret[$rkey]);
@@ -973,7 +973,7 @@
$this->_debugprint(sprintf("client: compressing data; was %d bytes is now %d bytes\n", $len, $c_len));
$val = $c_val;
$len = $c_len;
- $flags |= memcached::MCOMPRESSED;
+ $flags |= memcached::COMPRESSED;
}
}
if (!$this->_safe_fwrite($sock, "$cmd $key $flags $exp $len\r\n$val\r\n"))
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS[at]lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
|
SVN: [37360] trunk/phase3