Merge branch 'develop' of github.com:EllisLab/CodeIgniter into develop

2 files changed, 48 insertions, 2 deletions

diff --git a/system/helpers/form_helper.php b/system/helpers/form_helper.php
index d6e3e85fa..692909c79 100644
--- a/system/helpers/form_helper.php
+++ b/system/helpers/form_helper.php
@@ -228,7 +228,7 @@ if ( ! function_exists('form_upload'))
 	 */
 	function form_upload($data = '', $value = '', $extra = '')
 	{
-		$default = array('type' => 'file', 'name' => '');
+		$defaults = array('type' => 'file', 'name' => '');
 		is_array($data) OR $data = array('name' => $data);
 		$data['type'] = 'file';
 		return '<input '._parse_form_attributes($data, $defaults).$extra." />\n";
diff --git a/system/libraries/Email.php b/system/libraries/Email.php
index 997757b0a..1bf1da15e 100644
--- a/system/libraries/Email.php
+++ b/system/libraries/Email.php
@@ -94,6 +94,13 @@ class CI_Email {
 	 * @var	int
 	 */
 	public $smtp_timeout	= 5;
+	
+	/**
+	 * SMTP persistent connection
+	 *
+	 * @var	bool
+	 */
+	public $smtp_keepalive	= FALSE;
 
 	/**
 	 * SMTP Encryption
@@ -401,6 +408,21 @@ class CI_Email {
 	}
 
 	// --------------------------------------------------------------------
+	
+	/**
+	 * Destructor - Releases Resources
+	 *
+	 * @return	void
+	 */
+	public function __destruct()
+	{
+		if (is_resource($this->_smtp_connect))
+		{
+			$this->_send_command('quit');
+		}
+	}
+
+	// --------------------------------------------------------------------
 
 	/**
 	 * Initialize preferences
@@ -1824,7 +1846,15 @@ class CI_Email {
 			return FALSE;
 		}
 
-		$this->_send_command('quit');
+		if ($this->smtp_keepalive)
+		{
+			$this->_send_command('reset');
+		}
+		else
+		{
+			$this->_send_command('quit');
+		}
+
 		return TRUE;
 	}
 
@@ -1837,6 +1867,11 @@ class CI_Email {
 	 */
 	protected function _smtp_connect()
 	{
+		if (is_resource($this->_smtp_connect))
+		{
+			return TRUE;
+		}
+
 		$ssl = ($this->smtp_crypto === 'ssl') ? 'ssl://' : NULL;
 
 		$this->_smtp_connect = fsockopen($ssl.$this->smtp_host,
@@ -1851,6 +1886,7 @@ class CI_Email {
 			return FALSE;
 		}
 
+		stream_set_timeout($this->_smtp_connect, $this->smtp_timeout);
 		$this->_set_error_message($this->_get_smtp_data());
 
 		if ($this->smtp_crypto === 'tls')
@@ -1924,6 +1960,11 @@ class CI_Email {
 						$this->_send_data('DATA');
 						$resp = 354;
 			break;
+			case 'reset':
+
+						$this->_send_data('RSET');
+						$resp = 250;
+			break;
 			case 'quit'	:
 
 						$this->_send_data('QUIT');
@@ -1973,6 +2014,11 @@ class CI_Email {
 
 		$reply = $this->_get_smtp_data();
 
+		if (strpos($reply, '503') !== 0)	// Already authenticated
+		{
+			return TRUE;
+		}
+			
 		if (strpos($reply, '334') !== 0)
 		{
 			$this->_set_error_message('lang:email_failed_smtp_login', $reply);