Permalink
Browse files

Merge php-src into phpdbg

  • Loading branch information...
2 parents 5b8b6e3 + e9e1acb commit ae1e559a7b1c87a7ae582ec14dbe313a3244172a @bwoebi bwoebi committed Nov 4, 2014
Showing with 4 additions and 6 deletions.
  1. +3 −3 config.w32
  2. +1 −1 phpdbg.c
  3. +0 −1 phpdbg_frame.c
  4. +0 −1 phpdbg_prompt.c
View
@@ -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');
}
}
View
@@ -549,7 +549,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];
View
@@ -25,7 +25,6 @@
#include "phpdbg_list.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
-ZEND_EXTERN_MODULE_GLOBALS(output);
void phpdbg_restore_frame(TSRMLS_D) /* {{{ */
{
View
@@ -41,7 +41,6 @@
#include "phpdbg_eol.h"
ZEND_EXTERN_MODULE_GLOBALS(phpdbg);
-ZEND_EXTERN_MODULE_GLOBALS(output);
extern int phpdbg_startup_run;
#ifdef HAVE_LIBDL

0 comments on commit ae1e559

Please sign in to comment.