PHP mysqlnd svn commit: r708 - in trunk: php5/ext/mysqli php6/ext/mysqli

Author: ahristov
Date: 2007-07-11 15:05:38 +0200 (Wed, 11 Jul 2007) New Revision: 708

Modified:

   trunk/php5/ext/mysqli/mysqli_api.c
   trunk/php6/ext/mysqli/mysqli_api.c
Log:
Fixing also mysqli_real_connect() agains LOCAL INFILE attacks

Modified: trunk/php5/ext/mysqli/mysqli_api.c

• trunk/php5/ext/mysqli/mysqli_api.c 2007-07-11 12:54:35 UTC (rev 707) +++ trunk/php5/ext/mysqli/mysqli_api.c 2007-07-11 13:05:38 UTC (rev 708) @@ -1645,6 +1645,8 @@ php_set_local_infile_handler_default(mysql);
  #endif
  

+ mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, &MyG(allow_local_infile)); +

 	/* change status */
 	MYSQLI_SET_STATUS(&mysql_link, MYSQLI_STATUS_VALID);
 

Modified: trunk/php6/ext/mysqli/mysqli_api.c

• trunk/php6/ext/mysqli/mysqli_api.c 2007-07-11 12:54:35 UTC (rev 707) +++ trunk/php6/ext/mysqli/mysqli_api.c 2007-07-11 13:05:38 UTC (rev 708) @@ -1683,6 +1683,10 @@ flags ^= CLIENT_LOCAL_FILES; }

+	if (UG(unicode)) {
+		mysql_options(mysql->mysql, MYSQL_SET_CHARSET_NAME, "utf8");
+	}
+

 #if !defined(HAVE_MYSQLND)

 	if (mysql_real_connect(mysql->mysql, hostname, username, passwd, dbname ,port, socket ,flags) == NULL) 

 		RETURN_FALSE;
 	}
 
+	/* when PHP runs in unicode, set default character set to utf8 */
+	if (UG(unicode)) {
+		mysql->conv = UG(utf8_conv);
+	}
+
+	/* clear error */
 	php_mysqli_set_error(mysql_errno(mysql->mysql), (char *)mysql_error(mysql->mysql) TSRMLS_CC);
 

#if !defined(HAVE_MYSQLND)

@@ -1708,6 +1718,8 @@

         php_set_local_infile_handler_default(mysql);
#endif
 

Do you need help?

In addition to our free technical library, Pantek provides professional IT services to companies who utilize Open Source software: Learn more about Pantek's Technical Support offerings Place an order for 24/7/365 Technical Support here Learn more about Pantek, who we are, and what we do Chat with a Live Operator Related lists.mysql.com Links announce benchmarks bugs certification cluster commits dotnet gui-tools internals java maxdb myodbc mysql mysqldoc packagers perl plusplus replication win32 Request more information about Pantek

+ mysql_options(mysql->mysql, MYSQL_OPT_LOCAL_INFILE, (char *)&MyG(allow_local_infile)); +

 	/* change status */
 	MYSQLI_SET_STATUS(&mysql_link, MYSQLI_STATUS_VALID);
 

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com