cvs: php-src(PHP_5_0) /ext/odbc php_odbc.c
| From: | Dmitry Stogov | Date: | Thu, 08 Sep 2005 06:19:22 +0000 |
| Subject: | cvs: php-src(PHP_5_0) /ext/odbc php_odbc.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-33851@lists.php.net to get a copy of this message | ||
dmitry Thu Sep 8 02:19:22 2005 EDT
Modified files: (Branch: PHP_5_0)
/php-src/ext/odbc php_odbc.c
Log:
Fixed crash on AIX
http://cvs.php.net/diff.php/php-src/ext/odbc/php_odbc.c?r1=1.179.2.5&r2=1.179.2.6&ty=u
Index: php-src/ext/odbc/php_odbc.c
diff -u php-src/ext/odbc/php_odbc.c:1.179.2.5 php-src/ext/odbc/php_odbc.c:1.179.2.6
--- php-src/ext/odbc/php_odbc.c:1.179.2.5 Sat Jul 2 18:50:01 2005
+++ php-src/ext/odbc/php_odbc.c Thu Sep 8 02:19:21 2005
@@ -20,7 +20,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_odbc.c,v 1.179.2.5 2005/07/02 22:50:01 edink Exp $ */
+/* $Id: php_odbc.c,v 1.179.2.6 2005/09/08 06:19:21 dmitry Exp $ */
#ifdef HAVE_CONFIG_H
#include "config.h"
@@ -504,6 +504,12 @@
REGISTER_LONG_CONSTANT("SQL_QUICK", SQL_QUICK, CONST_PERSISTENT | CONST_CS);
#endif
+#if defined(HAVE_IBMDB2) && defined(_AIX)
+ /* atexit() handler in the DB2/AIX library segfaults in PHP CLI */
+ /* DB2NOEXITLIST env variable prevents DB2 from invoking atexit() */
+ putenv("DB2NOEXITLIST=TRUE");
+#endif
+
return SUCCESS;
}
/* }}} */