Merge php-src into phpdbg

krakjoe · Nov 4, 2014 · ae1e559 · ae1e559
2 parents 5b8b6e3 + e9e1acb
commit ae1e559
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/config.w32 b/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/phpdbg.c b/phpdbg.c
@@ -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];

diff --git a/phpdbg_frame.c b/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/phpdbg_prompt.c b/phpdbg_prompt.c
@@ -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