felipe Mon, 20 Jun 2011 23:36:25 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=312351
Log: - Fixed hardcoded INI Changed paths: U php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c U php/php-src/trunk/sapi/cli/php_cli.c Modified: php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c =================================================================== --- php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-20 22:59:55 UTC (rev 312350) +++ php/php-src/branches/PHP_5_4/sapi/cli/php_cli.c 2011-06-20 23:36:25 UTC (rev 312351) @@ -1327,7 +1327,7 @@ if (sapi_module == &cli_sapi_module) { if (ini_entries) { ini_entries = realloc(ini_entries, ini_entries_len + sizeof(HARDCODED_INI)); - memmove(ini_entries, ini_entries + sizeof(HARDCODED_INI) - 2, ini_entries_len + 1); + memmove(ini_entries + sizeof(HARDCODED_INI) - 2, ini_entries, ini_entries_len + 1); memcpy(ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI) - 2); } else { ini_entries = malloc(sizeof(HARDCODED_INI)); Modified: php/php-src/trunk/sapi/cli/php_cli.c =================================================================== --- php/php-src/trunk/sapi/cli/php_cli.c 2011-06-20 22:59:55 UTC (rev 312350) +++ php/php-src/trunk/sapi/cli/php_cli.c 2011-06-20 23:36:25 UTC (rev 312351) @@ -1327,7 +1327,7 @@ if (sapi_module == &cli_sapi_module) { if (ini_entries) { ini_entries = realloc(ini_entries, ini_entries_len + sizeof(HARDCODED_INI)); - memmove(ini_entries, ini_entries + sizeof(HARDCODED_INI) - 2, ini_entries_len + 1); + memmove(ini_entries + sizeof(HARDCODED_INI) - 2, ini_entries, ini_entries_len + 1); memcpy(ini_entries, HARDCODED_INI, sizeof(HARDCODED_INI) - 2); } else { ini_entries = malloc(sizeof(HARDCODED_INI));
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php