Permalink
Browse files

Merge branch 'hotfix/3340' into develop

Forward port #3340
  • Loading branch information...
2 parents 79b5c8b + cef9a62 commit 4e2376ff234b3cb23cbe67fb2009f01284e2aab7 @weierophinney weierophinney committed Jan 4, 2013
Showing with 4 additions and 2 deletions.
  1. +4 −2 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();

0 comments on commit 4e2376f

Please sign in to comment.