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

ext/standard/basic_functions.c

@@ -4962,7 +4962,7 @@ static int user_tick_function_compare(user_tick_function_entry * tick_fe1, user_
 }
 /* }}} */
 
-void php_call_shutdown_functions(TSRMLS_D) /* {{{ */
+PHPAPI void php_call_shutdown_functions(TSRMLS_D) /* {{{ */
 {
 	if (BG(user_shutdown_function_names)) {
 		zend_try {
@@ -4974,7 +4974,7 @@ void php_call_shutdown_functions(TSRMLS_D) /* {{{ */
 }
 /* }}} */
 
-void php_free_shutdown_functions(TSRMLS_D) /* {{{ */
+PHPAPI void php_free_shutdown_functions(TSRMLS_D) /* {{{ */
 {
 	if (BG(user_shutdown_function_names))
 		zend_try {

ext/standard/basic_functions.h

@@ -259,4 +259,8 @@ PHPAPI extern zend_bool register_user_shutdown_function(char *function_name, siz
 PHPAPI extern zend_bool remove_user_shutdown_function(char *function_name, size_t function_len TSRMLS_DC);
 PHPAPI extern zend_bool append_user_shutdown_function(php_shutdown_function_entry shutdown_function_entry TSRMLS_DC);
 
+PHPAPI void php_call_shutdown_functions(TSRMLS_D);
+PHPAPI void php_free_shutdown_functions(TSRMLS_D);
+
+
 #endif /* BASIC_FUNCTIONS_H */

main/output.c

@@ -35,7 +35,11 @@
 #include "zend_stack.h"
 #include "php_output.h"
 
-ZEND_DECLARE_MODULE_GLOBALS(output);
+#ifdef ZTS
+PHPAPI int output_globals_id;
+#else
+PHPAPI php_output_globals output_globals;
+#endif
 
 const char php_output_default_handler_name[sizeof("default output handler")] = "default output handler";
 const char php_output_devnull_handler_name[sizeof("null output handler")] = "null output handler";

main/php_main.h

@@ -50,9 +50,6 @@ PHPAPI int php_handle_auth_data(const char *auth TSRMLS_DC);
 PHPAPI void php_html_puts(const char *str, size_t siz TSRMLS_DC);
 PHPAPI int php_stream_open_for_zend_ex(const char *filename, zend_file_handle *handle, int mode TSRMLS_DC);
 
-extern void php_call_shutdown_functions(TSRMLS_D);
-extern void php_free_shutdown_functions(TSRMLS_D);
-
 /* environment module */
 extern int php_init_environ(void);
 extern int php_shutdown_environ(void);

main/php_output.h

@@ -151,6 +151,12 @@ ZEND_BEGIN_MODULE_GLOBALS(output)
 	int flags;
 ZEND_END_MODULE_GLOBALS(output)
 
+#ifdef ZTS
+PHPAPI extern int output_globals_id;
+#else
+PHPAPI extern php_output_globals output_globals;
+#endif
+
 /* there should not be a need to use OG() from outside of output.c */
 #ifdef ZTS
 # define OG(v) TSRMG(output_globals_id, zend_output_globals *, v)

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") {
+	if (PHP_PHPDBG_WEBHELPER == "yes") {
-		EXTENSION('phpdbg-webhelper', 'phpdbg_rinit_hook.c phpdbg_webdata_compress.c');
+		EXTENSION('phpdbg_webhelper', 'phpdbg_rinit_hook.c phpdbg_webdata_transfer.c');
 	}
 }
 

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];

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) /* {{{ */
 {

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

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;
 } /* }}} */