Permalink
Browse files

Merge branch 'hotfix/3340' into develop

Forward port #3340
  • Loading branch information...
2 parents d213655 + 8cae878 commit 16d3b1f44722b4f76f89de3d70f50e4cc14f99b6 @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 16d3b1f

Please sign in to comment.