From: Anatol Belski <ab@php.net>
Date: Tue, 18 Nov 2014 20:18:52 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/master' into native-tls
X-Git-Tag: POST_NATIVE_TLS_MERGE^2~46
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c6bad96f306df8e8b656472e618283ced5083cdb;p=php

Merge remote-tracking branch 'origin/master' into native-tls

* origin/master: (398 commits)
  NEWS
  add test for bug #68381
  Fixed bug #68381 Set FPM log level earlier during init
  proper dllexport
  move to size_t where zend_string is used internally
  fix some datatype mismatches
  return after the warning, to fix uninitialized salt usage
  fix datatype mismatches
  add missing type specifier
  fix datatype mismatches
  fix unsigned check
  "extern" shouldn't be used for definitions
  joined identical conditional blocks
  simplify fpm tests
  SEND_VAR_NO_REF optimization
  Add test for bug #68442
  Add various tests for FPM - covering recent bugs (68420, 68421, 68423, 68428) - for UDS - for ping and status URI - for multi pool and multi mode
  Include small MIT FastCGI client library from https://github.com/adoy/PHP-FastCGI-Client
  Get rid of zend_free_op structure (use zval* instead). Get rid of useless TSRMLS arguments.
  Add new FPM test for IPv4/IPv6
  ...

Conflicts:
	win32/build/config.w32
---

c6bad96f306df8e8b656472e618283ced5083cdb
diff --cc main/php_output.h
index 17cec92e53,535b09b46c..bf756de5ce
--- a/main/php_output.h
+++ b/main/php_output.h
@@@ -102,13 -102,15 +102,13 @@@ typedef struct _php_output_context 
  	int op;
  	php_output_buffer in;
  	php_output_buffer out;
 -#ifdef ZTS
 -	void ***tsrm_ls;
 -#endif
  } php_output_context;
  
 -#define PHP_OUTPUT_TSRMLS(ctx) TSRMLS_FETCH_FROM_CTX((ctx)->tsrm_ls)
 +/* XXX remove this after TLS branch merge */
 +#define PHP_OUTPUT_TSRMLS(ctx)
  
  /* old-style, stateless callback */
- typedef void (*php_output_handler_func_t)(char *output, uint output_len, char **handled_output, uint *handled_output_len, int mode TSRMLS_DC);
+ typedef void (*php_output_handler_func_t)(char *output, size_t output_len, char **handled_output, size_t *handled_output_len, int mode TSRMLS_DC);
  /* new-style, opaque context callback */
  typedef int (*php_output_handler_context_func_t)(void **handler_context, php_output_context *output_context);
  /* output handler context dtor */
@@@ -149,9 -151,11 +149,11 @@@ ZEND_BEGIN_MODULE_GLOBALS(output
  	int flags;
  ZEND_END_MODULE_GLOBALS(output)
  
+ PHPAPI ZEND_EXTERN_MODULE_GLOBALS(output);
+ 
  /* 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)
 +# define OG(v) ZEND_TSRMG(output_globals_id, zend_output_globals *, v)
  #else
  # define OG(v) (output_globals.v)
  #endif
diff --cc win32/build/config.w32
index d618ccb3bc,7ca0293f3f..47773dcffb
--- a/win32/build/config.w32
+++ b/win32/build/config.w32
@@@ -368,9 -132,8 +132,10 @@@ ADD_SOURCES("Zend", "zend_language_pars
  	zend_float.c zend_string.c zend_generators.c zend_virtual_cwd.c zend_ast.c \
  	zend_inheritance.c");
  
 +ADD_FLAG("CFLAGS_BD_ZEND", "/D ZEND_ENABLE_STATIC_TSRMLS_CACHE=1");
 +
- if (VCVERS == 1200) {
+ /* XXX inspect this for other toolsets */
+ if (VS_TOOLSET && VCVERS == 1200) {
  	AC_DEFINE('ZEND_DVAL_TO_LVAL_CAST_OK', 1);
  }