iliaa           Fri Oct  3 09:03:48 2003 EDT

  Modified files:              (Branch: PHP_4_3)
    /php-src/ext/sybase php_sybase_db.c 
    /php-src    NEWS 
  Log:
  MFH: Fixed bug #25744 (make ZTS build of ext/sybase compile)
  
  
Index: php-src/ext/sybase/php_sybase_db.c
diff -u php-src/ext/sybase/php_sybase_db.c:1.38.2.11 
php-src/ext/sybase/php_sybase_db.c:1.38.2.12
--- php-src/ext/sybase/php_sybase_db.c:1.38.2.11        Thu Aug 28 16:27:53 2003
+++ php-src/ext/sybase/php_sybase_db.c  Fri Oct  3 09:03:46 2003
@@ -20,7 +20,7 @@
    +----------------------------------------------------------------------+
  */
  
-/* $Id: php_sybase_db.c,v 1.38.2.11 2003/08/28 20:27:53 andrey Exp $ */
+/* $Id: php_sybase_db.c,v 1.38.2.12 2003/10/03 13:03:46 iliaa Exp $ */
 
 
 #ifdef HAVE_CONFIG_H
@@ -144,6 +144,7 @@
                                                                                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 @@
                                                                                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);
Index: php-src/NEWS
diff -u php-src/NEWS:1.1247.2.420 php-src/NEWS:1.1247.2.421
--- php-src/NEWS:1.1247.2.420   Thu Oct  2 18:22:15 2003
+++ php-src/NEWS        Fri Oct  3 09:03:47 2003
@@ -3,6 +3,7 @@
 ?? 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)

-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to