diff options
| author | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2014-10-29 20:04:56 +0100 |
| commit | d77ce317636919a87daa7f8ffb2979474f9cade7 (patch) | |
| tree | c9ebe2c7ad01661e7696a8f15d6d4842870f03ea /sapi/phpdbg/phpdbg.c | |
| parent | 23f089a6b3586d524e8709d75262029bc8fa7ad4 (diff) | |
| parent | fc904569ea5c5513925a69bf43820845eb3db104 (diff) | |
| download | php-git-d77ce317636919a87daa7f8ffb2979474f9cade7.tar.gz | |
Merge branch 'PHP-5.6'
* PHP-5.6:
fix output globals importing
export output globals
use portable strndup implementation
unix sockets aren't available on windows
dll export APIs needed by phpdbg
fix sapi/phpdbg/config.w32
Don't treat warnings as failures in the junit output
Diffstat (limited to 'sapi/phpdbg/phpdbg.c')
| -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 6e7e4ece34..ec65a22f12 100644 --- a/sapi/phpdbg/phpdbg.c +++ b/sapi/phpdbg/phpdbg.c @@ -546,7 +546,7 @@ static int php_sapi_phpdbg_deactivate(TSRMLS_D) /* {{{ */ php_phpdbg_globals_ctor(pg); - pg->exec = strndup(PHPDBG_G(exec), PHPDBG_G(exec_len)); + pg->exec = zend_strndup(PHPDBG_G(exec), PHPDBG_G(exec_len)); pg->exec_len = PHPDBG_G(exec_len); pg->oplog = PHPDBG_G(oplog); pg->prompt[0] = PHPDBG_G(prompt)[0]; |