pull from upstream

Author: RJ

ChangeLog

@@ -0,0 +1,11 @@
+memcached extension changelog
+
+Version 0.1.1
+-------------
+	* Add OPT_LIBKETAMA_COMPATIBLE option.
+	* Implement addServers() method.
+	* Swap internal compressed and serialized flags to be compatible with other clients.
+
+Version 0.1.0
+-------------
+	* Initial release

README

@@ -1,9 +1,12 @@
-This is a PHP extension for interfacing with memcached via libmemcached library.
+This extension uses libmemcached library to provide API for communicating with
+memcached servers.
 
+memcached is a high-performance, distributed memory object caching system,
+generic in nature, but intended for use in speeding up dynamic web applications
+by alleviating database load.
 
 Resources
 ---------
-
  libmemcached:
    http://tangent.org/552/libmemcached.html
 

manual/Makefile

@@ -36,7 +36,9 @@ class Memcached {
 
 	const OPT_DISTRIBUTION_CONSISTENT;
 
-	const OPT_BUFER_REQUESTS;
+	const OPT_LIBKETAMA_COMPATIBLE;
+
+	const OPT_BUFFER_REQUESTS;
 
 	const OPT_BINARY_PROTOCOL;
 
@@ -129,7 +131,9 @@ public function getOption( $option ) {}
 
 	public function setOption( $option, $value ) {}
 
-	public function addServer( $host, $port,  $weight = 0 );
+	public function addServer( $host, $port,  $weight = 0 ) {}
+
+	public function addServers( array $servers ) {}
 
 	public function getServerList( ) {}
 

manual/file-entities.ent

@@ -15,23 +15,28 @@ http://pear.php.net/dtd/package-2.0.xsd">
   <email>[email protected]</email>
   <active>yes</active>
  </lead>
- <date>2009-01-29</date>
+ <date>2009-02-02</date>
  <version>
-  <release>0.1.0</release>
-  <api>0.1.0</api>
+  <release>0.1.1</release>
+  <api>0.1.1</api>
  </version>
  <stability>
   <release>beta</release>
   <api>beta</api>
  </stability>
  <license uri="http://www.php.net/license">PHP</license>
- <notes>Initial PECL release</notes>
+ <notes>
+- Add OPT_LIBKETAMA_COMPATIBLE option.
+- Implement addServers() method.
+- Swap internal compressed and serialized flags to be compatible with other clients.
+ </notes>
  <contents>
   <dir name="/">
    <file role='doc' name='EXPERIMENTAL'/>
    <file role='doc' name='README'/>
    <file role='doc' name='CREDITS'/>
    <file role='doc' name='LICENSE'/>
+   <file role='doc' name='ChangeLog'/>
    <file role='doc' name='memcached-api.php'/>
    <file role='src' name='config.m4'/>
    <file role='src' name='config.w32'/>
@@ -54,6 +59,16 @@ http://pear.php.net/dtd/package-2.0.xsd">
  <providesextension>memcached</providesextension>
  <extsrcrelease/>
  <changelog>
+  <release>
+   <stability><release>beta</release><api>beta</api></stability>
+   <version><release>0.1.1</release><api>0.1.1</api></version>
+   <date>2009-02-02</date>
+   <notes>
+- Add OPT_LIBKETAMA_COMPATIBLE option.
+- Implement addServers() method.
+- Swap internal compressed and serialized flags to be compatible with other clients.
+   </notes>
+  </release>
   <release>
    <stability><release>beta</release><api>beta</api></stability>
    <version><release>0.1.0</release><api>0.1.0</api></version>