From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 3 Oct 2003 13:03:47 +0000 (+0000)
Subject: MFH: Fixed bug #25744 (make ZTS build of ext/sybase compile)
X-Git-Tag: php-4.3.4RC2~58
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3a867aad644dfe2e7b530fb18a1ed7bb6f012f95;p=php

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

diff --git a/NEWS b/NEWS
index a469441dac..444d079bbd 100644
--- 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 96fa74bbbf..fb8a8fb69a 100644
--- 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);