This simple patch resolves this issue in a clean way, without introducing complex sql pre-processing code that introduces mutex problems.
The only issue is that it requires a modification to libmysql.c, which provided that everyone here agrees with this fix, then I will post it to [EMAIL PROTECTED] to get there reaction. -Jason
Index: ext/mysql/config.m4 =================================================================== RCS file: /repository/php4/ext/mysql/config.m4,v retrieving revision 1.38 diff -u -r1.38 config.m4 --- ext/mysql/config.m4 30 Nov 2001 18:59:45 -0000 1.38 +++ ext/mysql/config.m4 27 Feb 2002 16:51:33 -0000 @@ -41,6 +41,9 @@ if test "$PHP_MYSQL" != "no"; then AC_DEFINE(HAVE_MYSQL, 1, [Whether you have MySQL]) + if test "$PHP_SAFE_MODE" = "yes"; then + AC_DEFINE(DISALLOW_MYSQL_LOAD_LOCAL, 1, [Whether to disable load local]) + fi PHP_EXTENSION(mysql,$ext_shared) fi Index: ext/mysql/libmysql/libmysql.c =================================================================== RCS file: /repository/php4/ext/mysql/libmysql/libmysql.c,v retrieving revision 1.9 diff -u -r1.9 libmysql.c --- ext/mysql/libmysql/libmysql.c 6 Nov 2001 16:59:07 -0000 1.9 +++ ext/mysql/libmysql/libmysql.c 27 Feb 2002 16:51:33 -0000 @@ -50,7 +50,11 @@ uint mysql_port=0; my_string mysql_unix_port=0; +#ifndef DISALLOW_MYSQL_LOAD_LOCAL #define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | CLIENT_LOCAL_FILES | CLIENT_TRANSACTIONS) +#else +#define CLIENT_CAPABILITIES (CLIENT_LONG_PASSWORD | CLIENT_LONG_FLAG | +CLIENT_TRANSACTIONS) +#endif #ifdef __WIN__ #define CONNECT_TIMEOUT 20
-- PHP Development Mailing List <http://www.php.net/> To unsubscribe, visit: http://www.php.net/unsub.php
