From: Marcus Boerger <helly@php.net>
Date: Thu, 6 Oct 2005 19:32:27 +0000 (+0000)
Subject: - MFB dynamic lookup of PDOException base
X-Git-Tag: RELEASE_0_9_1~219
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=93a27ebb60cfd999f2f996a8f0c5c1f37311bf8d;p=php

- MFB dynamic lookup of PDOException base
---

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 2a77257dd8..837697de3b 100755
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -33,9 +33,7 @@
 #include "php_pdo_int.h"
 #include "zend_exceptions.h"
 
-#if defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
-extern PHPAPI zend_class_entry *spl_ce_RuntimeException;
-#endif
+static zend_class_entry *spl_ce_RuntimeException;
 
 ZEND_DECLARE_MODULE_GLOBALS(pdo)
 
@@ -69,9 +67,18 @@ PDO_API char *php_pdo_str_tolower_dup(const char *src, int len)
 
 PDO_API zend_class_entry *php_pdo_get_exception_base(int root TSRMLS_DC)
 {
-#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL)
+#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL) && ((PHP_MAJOR_VERSION > 5) || (PHP_MAJOR_VERSION == 5 && PHP_MINOR_VERSION >= 1))
 	if (!root) {
-		return spl_ce_RuntimeException;
+		if (!spl_ce_RuntimeException) {
+			zend_class_entry **pce;
+
+			if (zend_hash_find(CG(class_table), "runtimeexception", sizeof("RuntimeException"), (void **) &pce) == SUCCESS) {
+				spl_ce_RuntimeException = *pce;
+				return *pce;
+			}
+		} else {
+			return spl_ce_RuntimeException;
+		}
 	}
 #endif
 #if (PHP_MAJOR_VERSION < 6)
@@ -304,6 +311,8 @@ PHP_MINIT_FUNCTION(pdo)
 {
 	zend_class_entry ce;
 
+	spl_ce_RuntimeException = NULL;
+
 	ZEND_INIT_MODULE_GLOBALS(pdo, php_pdo_init_globals, NULL);
 	REGISTER_INI_ENTRIES();
 
@@ -317,11 +326,9 @@ PHP_MINIT_FUNCTION(pdo)
 		"PDO persistent database", module_number);
 
 	INIT_CLASS_ENTRY(ce, "PDOException", NULL);
-#if can_handle_soft_dependency_on_SPL && defined(HAVE_SPL)
-	pdo_exception_ce = zend_register_internal_class_ex(&ce, spl_ce_RuntimeException, NULL TSRMLS_CC);
-#else
-	pdo_exception_ce = zend_register_internal_class_ex(&ce, zend_exception_get_default(TSRMLS_C), NULL TSRMLS_CC);
-#endif
+
+ 	pdo_exception_ce = zend_register_internal_class_ex(&ce, php_pdo_get_exception_base(0 TSRMLS_CC), NULL TSRMLS_CC);
+
 	zend_declare_property_null(pdo_exception_ce, "errorInfo", sizeof("errorInfo")-1, ZEND_ACC_PUBLIC TSRMLS_CC);
 
 	pdo_dbh_init(TSRMLS_C);