cvs: php4(PHP_4_3) /ext/mysql php_mysql.c
| From: | Georg Richter | Date: | Fri, 30 May 2003 13:00:17 +0000 |
| Subject: | cvs: php4(PHP_4_3) /ext/mysql php_mysql.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-21351@lists.php.net to get a copy of this message | ||
georg Fri May 30 09:00:17 2003 EDT
Modified files: (Branch: PHP_4_3)
/php4/ext/mysql php_mysql.c
Log:
fixed #23779 (CLIENT_LOCAL_FILES with open_basedir)
Index: php4/ext/mysql/php_mysql.c
diff -u php4/ext/mysql/php_mysql.c:1.174.2.13 php4/ext/mysql/php_mysql.c:1.174.2.14
--- php4/ext/mysql/php_mysql.c:1.174.2.13 Wed May 28 12:18:14 2003
+++ php4/ext/mysql/php_mysql.c Fri May 30 09:00:17 2003
@@ -18,7 +18,7 @@
+----------------------------------------------------------------------+
*/
-/* $Id: php_mysql.c,v 1.174.2.13 2003/05/28 16:18:14 rasmus Exp $ */
+/* $Id: php_mysql.c,v 1.174.2.14 2003/05/30 13:00:17 georg Exp $ */
/* TODO:
*
@@ -557,6 +557,11 @@
WRONG_PARAM_COUNT;
break;
}
+ /* disable local infile option for open_basedir */
+ if (strlen(PG(open_basedir))) {
+ client_flags ^= CLIENT_LOCAL_FILES;
+ }
+
if (z_host) {
SEPARATE_ZVAL(z_host); /* We may modify z_host if it contains a port, separate */
convert_to_string_ex(z_host);