archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-7.0' into PHP-7.1

Browse source
This commit is contained in:
Bob Weinand 2016-11-30 02:57:16 +01:00
commit 7aaa1a876e
4 changed files with 24 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
sapi/phpdbg/phpdbg.c
View file

@ -1893,9 +1893,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

@ -348,7 +348,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;
@ -381,8 +383,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