Improve exception handling for socket errors

Per suggestion by @stof
EvanDotPro · Sep 18, 2012 · 0a337d0 · 0a337d0
1 parent a8280ef
commit 0a337d0
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/src/Sslurp/MozillaCertData.php b/src/Sslurp/MozillaCertData.php
@@ -79,13 +79,18 @@ protected function fetchLatestCertData($until = false)
  {
  $ctx = $this->getStreamContext();
 
- set_error_handler(function ($code, $msg) {
- throw new \RuntimeException($msg, $code);
+ set_error_handler(function ($code, $message, $filename, $lineno, $context) {
+ if ($error_reporting() & $level) {
+ throw new \ErrorException(sprintf('%s: %s in %s line %d', $code, $message, $filename, $lineno), $code, 0, $filename, $lineno);
+ }
+
+ return false;
  });
 
  try {
  $fp = stream_socket_client('ssl:https://mxr.mozilla.org:443', $errNo, $errStr, 30, STREAM_CLIENT_CONNECT, $ctx);
- } catch (\RuntimeException $e) {
+ } catch (\ErrorException $e) {
+ restore_error_handler();
  throw new \RuntimeException($errStr, $errNo, $e);
  }