MFH: Fixed bug #25744 (make ZTS build of ext/sybase compile)

diff --git a/NEWS b/NEWS
index a469441dac25d0db8fd97166861a4c7011d64a49..444d079bbde50e022774fcab396d369c3d2bbb92 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -3,6 +3,7 @@ PHP 4                                                                      NEWS
 ?? Oct 2003, Version 4.3.4RC2
 - Fixed multibyte regex engine to properly handle ".*" pattern under
   POSIX compatible mode. (K.Kosako <kosako at sofnec.co.jp>, Moriyoshi)
+- Fixed bug #25744 (make ZTS build of ext/sybase compile). (Ilia)
 - Fixed bug #25708 (extract($GLOBALS, EXTR_REFS) mangles $GLOBALS). (Moriyoshi)
 - Fixed bug #25707 (html_entity_decode() over-decodes &amp;lt;). (Moriyoshi)
 - Fixed bug #25703 (openssl configure check failed). (Jani)

diff --git a/ext/sybase/php_sybase_db.c b/ext/sybase/php_sybase_db.c
index 96fa74bbbfcf26f4d194a13dc50ae1d8d3b85669..fb8a8fb69a044fb279c995bdd7dd83cc24ecd078 100644 (file)
--- a/ext/sybase/php_sybase_db.c
+++ b/ext/sybase/php_sybase_db.c
@@ -144,6 +144,7 @@ static int php_sybase_error_handler(DBPROCESS *dbproc,int severity,int dberr,
                                                                                int oserr,char *dberrstr,char *oserrstr)
 {
        if (severity >= php_sybase_module.min_error_severity) {
+               TSRMLS_FETCH();
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase error:  %s (severity %d)",dberrstr,severity);
        }
        return INT_CANCEL;  
@@ -155,6 +156,7 @@ static int php_sybase_message_handler(DBPROCESS *dbproc,DBINT msgno,int msgstate
                                                                                char *procname,DBUSMALLINT line)
 {
        if (severity >= php_sybase_module.min_message_severity) {
+               TSRMLS_FETCH();
                php_error_docref(NULL TSRMLS_CC, E_WARNING, "Sybase message:  %s (severity %d)",msgtext,severity);
        }
        STR_FREE(php_sybase_module.server_message);