Merge branch 'hotfix/3340'

Close #3340 Fixes #3332
zendframework · Jan 4, 2013 · 7753ee1 · 7753ee1
2 parents 74daaa4 + cef9a62
commit 7753ee1
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/library/Zend/Http/Client/Adapter/Socket.php b/library/Zend/Http/Client/Adapter/Socket.php
@@ -283,8 +283,10 @@ public function connect($host, $port = 80, $secure = false)
                 if (!$test || $error) {
                     // Error handling is kind of difficult when it comes to SSL
                     $errorString = '';
-                    while (($sslError = openssl_error_string()) != false) {
-                        $errorString .= "; SSL error: $sslError";
+                    if (extension_loaded('openssl')) {
+                        while (($sslError = openssl_error_string()) != false) {
+                            $errorString .= "; SSL error: $sslError";
+                        }
                     }
                     $this->close();