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 | |
| 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')
| -rw-r--r-- | sapi/phpdbg/config.w32 | 6 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg.c | 2 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_frame.c | 1 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_prompt.c | 1 | ||||
| -rw-r--r-- | sapi/phpdbg/phpdbg_wait.c | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sapi/phpdbg/config.w32 b/sapi/phpdbg/config.w32 index 651c7e6d16..8a685d3347 100644 --- a/sapi/phpdbg/config.w32 +++ b/sapi/phpdbg/config.w32 @@ -1,6 +1,6 @@ ARG_ENABLE('phpdbg', 'Build phpdbg', 'no'); ARG_ENABLE('phpdbgs', 'Build phpdbg shared', 'no'); -ARG_ENABLE('phpdbgwebhelper', 'Build phpdbg webhelper', 'yes'); +ARG_ENABLE('phpdbg-webhelper', 'Build phpdbg webhelper', 'yes'); PHPDBG_SOURCES='phpdbg.c phpdbg_prompt.c phpdbg_cmd.c phpdbg_info.c phpdbg_help.c phpdbg_break.c ' + 'phpdbg_print.c phpdbg_bp.c phpdbg_opcode.c phpdbg_list.c phpdbg_utils.c ' + @@ -16,8 +16,8 @@ if (PHP_PHPDBG == "yes") { ADD_FLAG("CFLAGS_PHPDBG", "/D YY_NO_UNISTD_H"); ADD_FLAG("LDFLAGS_PHPDBG", "/stack:8388608"); - if (PHP_PHPDBGWEBHELPER == "yes") { - EXTENSION('phpdbg-webhelper', 'phpdbg_rinit_hook.c phpdbg_webdata_compress.c'); + if (PHP_PHPDBG_WEBHELPER == "yes") { + EXTENSION('phpdbg_webhelper', 'phpdbg_rinit_hook.c phpdbg_webdata_transfer.c'); } } 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]; diff --git a/sapi/phpdbg/phpdbg_frame.c b/sapi/phpdbg/phpdbg_frame.c index 08a6bec994..f42fc659f1 100644 --- a/sapi/phpdbg/phpdbg_frame.c +++ b/sapi/phpdbg/phpdbg_frame.c @@ -25,7 +25,6 @@ #include "phpdbg_list.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg); -ZEND_EXTERN_MODULE_GLOBALS(output); void phpdbg_restore_frame(TSRMLS_D) /* {{{ */ { diff --git a/sapi/phpdbg/phpdbg_prompt.c b/sapi/phpdbg/phpdbg_prompt.c index 60c9a2e0a0..aa431a8ae0 100644 --- a/sapi/phpdbg/phpdbg_prompt.c +++ b/sapi/phpdbg/phpdbg_prompt.c @@ -42,7 +42,6 @@ #include "phpdbg_eol.h" ZEND_EXTERN_MODULE_GLOBALS(phpdbg); -ZEND_EXTERN_MODULE_GLOBALS(output); extern int phpdbg_startup_run; #ifdef HAVE_LIBDL diff --git a/sapi/phpdbg/phpdbg_wait.c b/sapi/phpdbg/phpdbg_wait.c index a8cf7491c4..a76dda88e4 100644 --- a/sapi/phpdbg/phpdbg_wait.c +++ b/sapi/phpdbg/phpdbg_wait.c @@ -344,6 +344,7 @@ void phpdbg_webdata_decompress(char *msg, int len TSRMLS_DC) { PHPDBG_COMMAND(wait) /* {{{ */ { +#ifndef PHP_WIN32 struct sockaddr_un local, remote; int rlen, sr, sl; unlink(PHPDBG_G(socket_path)); @@ -393,6 +394,7 @@ PHPDBG_COMMAND(wait) /* {{{ */ efree(data); phpdbg_notice("wait", "import=\"success\"", "Successfully imported request data, stopped before executing"); +#endif return SUCCESS; } /* }}} */ |