From 69ba372de0156cbc1bd90894d84b9bc546ae852c Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Fri, 8 Jul 2016 17:24:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=8D=95=E5=85=83=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 library/think/cache/driver/Memcached.php         | 16 +++++++++++-----
 .../library/think/cache/driver/memcachedTest.php |  4 ++++
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/library/think/cache/driver/Memcached.php b/library/think/cache/driver/Memcached.php
index 406f5855..50082a1e 100644
--- a/library/think/cache/driver/Memcached.php
+++ b/library/think/cache/driver/Memcached.php
@@ -17,11 +17,13 @@ class Memcached
 {
     protected $handler;
     protected $options = [
-        'host'    => '127.0.0.1',
-        'port'    => 11211,
-        'expire'  => 0,
-        'timeout' => 0, // 超时时间（单位：毫秒）
-        'prefix'  => '',
+        'host'     => '127.0.0.1',
+        'port'     => 11211,
+        'expire'   => 0,
+        'timeout'  => 0, // 超时时间（单位：毫秒）
+        'prefix'   => '',
+        'username' => '', //账号
+        'password' => '', //密码
     ];
 
     /**
@@ -54,6 +56,10 @@ class Memcached
             $servers[] = [$host, (isset($ports[$i]) ? $ports[$i] : $ports[0]), 1];
         }
         $this->handler->addServers($servers);
+        if ('' != $this->options['username']) {
+            $this->handler->setOption(\Memcached::OPT_BINARY_PROTOCOL, true);
+            $this->handler->setSaslAuthData($this->options['username'], $this->options['password']);
+        }
     }
 
     /**
diff --git a/tests/thinkphp/library/think/cache/driver/memcachedTest.php b/tests/thinkphp/library/think/cache/driver/memcachedTest.php
index 05b0877f..95435097 100644
--- a/tests/thinkphp/library/think/cache/driver/memcachedTest.php
+++ b/tests/thinkphp/library/think/cache/driver/memcachedTest.php
@@ -47,4 +47,8 @@ class memcachedTest extends cacheTestCase
     public function testExpire()
     {
     }
+
+    public function testStaticCall()
+    {
+    }
 }