archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-17 06:28:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

- remove magic_quotes_gpc, magic_quotes_runtime, magic_quotes_sybase

Browse source 
(calling ini_set('magic_....') returns 0|false
- get_magic_quotes_gpc, get_magic_quotes_runtime are kept but always return false
- set_magic_quotes_runtime raises an E_CORE_ERROR
This commit is contained in:
Pierre Joye 2006-03-08 00:43:32 +00:00
parent b7d6d705f1
commit bb1ec86f9d
44 changed files with 105 additions and 525 deletions
Download patch file Download diff file Expand all files Collapse all files

16
ext/mysql/php_mysql.c
View file

@ -1841,13 +1841,8 @@ PHP_FUNCTION(mysql_result)
if (sql_row[field_offset]) {
Z_TYPE_P(return_value) = IS_STRING;
if (PG(magic_quotes_runtime)) {
Z_STRVAL_P(return_value) = php_addslashes(sql_row[field_offset], sql_row_lengths[field_offset],&Z_STRLEN_P(return_value), 0 TSRMLS_CC);
} else {
Z_STRLEN_P(return_value) = sql_row_lengths[field_offset];
Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value));
}
Z_STRLEN_P(return_value) = sql_row_lengths[field_offset];
Z_STRVAL_P(return_value) = (char *) safe_estrndup(sql_row[field_offset], Z_STRLEN_P(return_value));
} else {
Z_TYPE_P(return_value) = IS_NULL;
}
@ -1970,12 +1965,7 @@ static void php_mysql_fetch_hash(INTERNAL_FUNCTION_PARAMETERS, int result_type,
MAKE_STD_ZVAL(data);
if (PG(magic_quotes_runtime)) {
Z_TYPE_P(data) = IS_STRING;
Z_STRVAL_P(data) = php_addslashes(mysql_row[i], mysql_row_lengths[i], &Z_STRLEN_P(data), 0 TSRMLS_CC);
} else {
ZVAL_STRINGL(data, mysql_row[i], mysql_row_lengths[i], 1);
}
ZVAL_STRINGL(data, mysql_row[i], mysql_row_lengths[i], 1);
if (result_type & MYSQL_NUM) {
add_index_zval(return_value, i, data);