Merge branch 'hotfix/smtp-auth-does-not-reset-at-quit' of https://git…

…hub.com/mwillbanks/zf2 into develop PR zendframework#4690
mshilov · Jun 20, 2013 · 5482d00 · 5482d00
2 parents 8ccf970 + a22bcd4
commit 5482d00
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/library/Zend/Mail/Protocol/Smtp.php b/library/Zend/Mail/Protocol/Smtp.php
@@ -348,6 +348,7 @@ public function vrfy($user)
     public function quit()
     {
         if ($this->sess) {
+            $this->auth = false;
             $this->_send('QUIT');
             $this->_expect(221, 300); // Timeout set for 5 minutes as per RFC 2821 4.5.3.2
             $this->_stopSession();

diff --git a/tests/ZendTest/Mail/Protocol/SmtpTest.php b/tests/ZendTest/Mail/Protocol/SmtpTest.php
@@ -66,4 +66,14 @@ public function testDisconnectCallsQuit()
         $this->connection->disconnect();
         $this->assertTrue($this->connection->calledQuit);
     }
+
+    public function testDisconnectResetsAuthFlag()
+    {
+        $this->connection->connect();
+        $this->connection->setSessionStatus(true);
+        $this->connection->setAuth(true);
+        $this->assertTrue($this->connection->getAuth());
+        $this->connection->disconnect();
+        $this->assertFalse($this->connection->getAuth());
+    }
 }
diff --git a/tests/ZendTest/Mail/TestAsset/SmtpProtocolSpy.php b/tests/ZendTest/Mail/TestAsset/SmtpProtocolSpy.php
@@ -29,6 +29,7 @@ class SmtpProtocolSpy extends Smtp
     public function connect()
     {
         $this->connect = true;
+
         return true;
     }
 
@@ -107,4 +108,50 @@ public function getRecipients()
     {
         return $this->rcptTest;
     }
+
+    /**
+     * Get Auth Status
+     *
+     * @return bool
+     */
+    public function getAuth()
+    {
+        return $this->auth;
+    }
+
+    /**
+     * Set Auth Status
+     *
+     * @param  bool $status
+     * @return self
+     */
+    public function setAuth($status)
+    {
+        $this->auth = (bool) $status;
+
+        return $this;
+    }
+
+    /**
+     * Get Session Status
+     *
+     * @return bool
+     */
+    public function getSessionStatus()
+    {
+        return $this->sess;
+    }
+
+    /**
+     * Set Session Status
+     *
+     * @param  bool $status
+     * @return self
+     */
+    public function setSessionStatus($status)
+    {
+        $this->sess = (bool) $status;
+
+        return $this;
+    }
 }