Skip to content

Loading…

Add root namespace character #3340

Closed
wants to merge 2 commits into from

2 participants

@iwalz

The backslash for the root namespace of openssl_error_string() is not defined. Should solve #3332

@iwalz

The first would simply stop to confuse with the error message. I guess it's not expected, that this extension is loaded, it simply clears the openssl error buffer and displays it. If the extension is not loaded, the loop is not executed and the user will get less of information on error (nothing else in this class relies on the openssl_* commands)

@weierophinney weierophinney added a commit that referenced this pull request
@weierophinney weierophinney Merge branch 'hotfix/3340' into develop
Forward port #3340
4e2376f
@weierophinney weierophinney was assigned
@weierophinney weierophinney added a commit that closed this pull request
@weierophinney weierophinney Merge branch 'hotfix/3340'
Close #3340
Fixes #3332
7753ee1
@ghost Unknown pushed a commit that referenced this pull request
@weierophinney weierophinney Merge branch 'hotfix/3340'
Close #3340
Fixes #3332
0eafb97
@ghost Unknown pushed a commit that referenced this pull request
@weierophinney weierophinney Merge branch 'hotfix/3340' into develop
Forward port #3340
16d3b1f
@weierophinney weierophinney added a commit to zendframework/zend-http that referenced this pull request
@weierophinney weierophinney Merge branch 'hotfix/3340' 4a9120e
@weierophinney weierophinney added a commit to zendframework/zend-http that referenced this pull request
@weierophinney weierophinney Merge branch 'hotfix/3340' into develop f970ff1
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 3, 2013
  1. @iwalz

    Add root namespace character

    iwalz committed
  2. @iwalz

    Check for openssl extension

    iwalz committed
Showing with 4 additions and 2 deletions.
  1. +4 −2 library/Zend/Http/Client/Adapter/Socket.php
View
6 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();
Something went wrong with that request. Please try again.