Merge branch 'patch-1' of /~https://github.com/stealth35/zf2 into hotfi…

…x/php-53-updates

src/EmailAddress.php

@@ -242,18 +242,6 @@ public function setHostnameValidator(Hostname $hostnameValidator = null, $allow
         return $this;
     }
 
-    /**
-     * Whether MX checking via getmxrr is supported or not
-     *
-     * This currently only works on UNIX systems
-     *
-     * @return boolean
-     */
-    public function validateMxSupported()
-    {
-        return function_exists('getmxrr');
-    }
-
     /**
      * Returns the set validateMx option
      *
@@ -274,10 +262,6 @@ public function getValidateMx()
      */
     public function setValidateMx($mx)
     {
-        if ((bool) $mx && !$this->validateMxSupported()) {
-            throw new Exception\InvalidArgumentException('MX checking not available on this system');
-        }
-
         $this->_options['mx'] = (bool) $mx;
         return $this;
     }
@@ -441,7 +425,7 @@ private function _validateMXRecords()
         $result = getmxrr($this->_hostname, $mxHosts);
         if (!$result) {
             $this->_error(self::INVALID_MX_RECORD);
-        } else if ($this->_options['deep'] && function_exists('checkdnsrr')) {
+        } else if ($this->_options['deep']) {
             $validAddress = false;
             $reserved     = true;
             foreach ($mxHosts as $hostname) {