diff options
| author | Christoph M. Becker <cmb@php.net> | 2015-07-13 17:50:26 +0200 |
|---|---|---|
| committer | Christoph M. Becker <cmb@php.net> | 2015-07-13 17:50:26 +0200 |
| commit | 2a2d3e88e6722d9277097d8e6a39f2e40a8befb9 (patch) | |
| tree | 684de0f08249b8219c6e8984faedd1cb7d18a5dd /sapi/phpdbg | |
| parent | bccbd2df218f5a36650581506c4306a58a157cb2 (diff) | |
| parent | 54b288ad922e8c86bf42e867a7603096326fb9b6 (diff) | |
| download | php-git-2a2d3e88e6722d9277097d8e6a39f2e40a8befb9.tar.gz | |
Merge branch 'master' of http://git.php.net/repository/php-src
# By Christoph M. Becker (3) and Bob Weinand (2)
* 'master' of http://git.php.net/repository/php-src:
updated NEWS
updated NEWS
Fix #69024: imagescale segfault with palette based image
Fix weird asm instruction order with gcc by marking as volatile in phpdbg
Preserve return value in zend_vm_call_opcode_handler with global opline/ex registers enabled
Diffstat (limited to 'sapi/phpdbg')
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sapi/phpdbg/phpdbg.c b/sapi/phpdbg/phpdbg.c index 31dab3f274..85a085b26e 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -1169,7 +1169,7 @@ int main(int argc, char **argv) /* {{{ */ char *php_optarg; int php_optind, opt, show_banner = 1; long cleaning = -1; - zend_bool quit_immediately = 0; + volatile zend_bool quit_immediately = 0; /* somehow some gcc release builds will play a bit around with order in combination with setjmp..., hence volatile */ zend_bool remote = 0; zend_phpdbg_globals *settings = NULL; char *bp_tmp = NULL; |