mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup)

Browse Source
This commit is contained in:
Bob Weinand 2016-11-30 02:56:47 +01:00
parent 9a9ad56af0
commit b73a3afff3
5 changed files with 28 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
NEWS
View File

@ -13,6 +13,10 @@ PHP NEWS
. Fixed bug #73586 (php_user_filter::$stream is not set to the stream the
filter is working on). (Dmitry)
- Phpdbg:
. Fixed bug #73615 (phpdbg without option never load .phpdbginit at startup).
(Bob)
08 Dec 2016 PHP 7.0.14
- Core:

4
sapi/phpdbg/phpdbg.c
View File

@ -1874,9 +1874,7 @@ phpdbg_main:
/* initialize from file */
PHPDBG_G(flags) |= PHPDBG_IS_INITIALIZING;
zend_try {
if (init_file) {
phpdbg_init(init_file, init_file_len, init_file_default);
}
phpdbg_init(init_file, init_file_len, init_file_default);
} zend_end_try();
PHPDBG_G(flags) &= ~PHPDBG_IS_INITIALIZING;

6
sapi/phpdbg/phpdbg_prompt.c
View File

@ -349,7 +349,9 @@ void phpdbg_try_file_init(char *init_file, size_t init_file_len, zend_bool free_
void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default) /* {{{ */
{
if (!init_file && use_default) {
if (init_file) {
phpdbg_try_file_init(init_file, init_file_len, 1);
} else if (use_default) {
char *scan_dir = getenv("PHP_INI_SCAN_DIR");
char *sys_ini;
int i;
@ -382,8 +384,6 @@ void phpdbg_init(char *init_file, size_t init_file_len, zend_bool use_default) /
}
phpdbg_try_file_init(PHPDBG_STRL(PHPDBG_INIT_FILENAME), 0);
} else {
phpdbg_try_file_init(init_file, init_file_len, 1);
}
}
/* }}} */

18
sapi/phpdbg/tests/bug73615.phpt Normal file
View File

@ -0,0 +1,18 @@
--TEST--
Bug #73615 (phpdbg without option never load .phpdbginit at startup)
--SKIPIF--
<?php
if (!getenv('TEST_PHPDBG_EXECUTABLE')) die("No TEST_PHPDBG_EXECUTABLE specified");
?>
--FILE--
<?php
$phpdbg = getenv('TEST_PHPDBG_EXECUTABLE');
chdir(__DIR__."/bug73615");
print `$phpdbg -qn`;
?>
--EXPECT--
Executed .phpdbginit

2
sapi/phpdbg/tests/bug73615/.phpdbginit Normal file
View File

@ -0,0 +1,2 @@
ev "Executed .phpdbginit"
q