Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PDO: Fix partial error return when using a encrypted connection #327

Merged
merged 1 commit into from
Feb 22, 2023
Merged

PDO: Fix partial error return when using a encrypted connection #327

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 11 additions & 1 deletion library/Zend/Db/Adapter/Pdo/Abstract.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,17 @@ protected function _connect()
* @see Zend_Db_Adapter_Exception
*/
require_once 'Zend/Db/Adapter/Exception.php';
throw new Zend_Db_Adapter_Exception($e->getMessage(), $e->getCode(), $e);

$message = $e->getMessage();
if ($e->getPrevious() !== null && preg_match('~^SQLSTATE\[HY000\] \[\d{1,4}\]\s$~', $message)) {
// See https://bugs.php.net/bug.php?id=76604
$message .= $e->getPrevious()->getMessage();
}

/**
* @see Zend_Db_Adapter_Exception
*/
throw new Zend_Db_Adapter_Exception($message, $e->getCode(), $e);
}

}
Expand Down