Merge branch 'PHP-7.0'

diff --cc Zend/zend_API.c
Simple merge

diff --cc ext/openssl/openssl.c
Simple merge

diff --cc ext/zip/php_zip.c
Simple merge

diff --cc main/php.h
Simple merge

diff --cc main/php_streams.h
index e2dda520b6f5eff218147780711391c9e626558a,de7c280050888122719070a1e78026ad5b3b7e66..92abaebf13d1d814ab465615d6050d35caab7a95
--- 1/main/php_streams.h
--- 2/main/php_streams.h
+++ b/main/php_streams.h
@@@ -573,17 -569,13 +569,13 @@@ PHPAPI const char *php_stream_locate_eo
  #define php_stream_open_wrapper_ex(path, mode, options, opened, context)      _php_stream_open_wrapper_ex((path), (mode), (options), (opened), (context) STREAMS_CC)
  
  #define php_stream_get_from_zval(stream, zstream, mode, options, opened, context) \
 -              if (Z_TYPE_PP((zstream)) == IS_RESOURCE) { \
 +              if (Z_TYPE_P((zstream)) == IS_RESOURCE) { \
                        php_stream_from_zval((stream), (zstream)); \
 -              } else (stream) = Z_TYPE_PP((zstream)) == IS_STRING ?  \
 -                      php_stream_open_wrapper_ex(Z_STRVAL_PP((zstream)), (mode), (options), (opened), (context)) : NULL
 +              } else (stream) = Z_TYPE_P((zstream)) == IS_STRING ?  \
 +                      php_stream_open_wrapper_ex(Z_STRVAL_P((zstream)), (mode), (options), (opened), (context)) : NULL
  
  /* pushes an error message onto the stack for a wrapper instance */
- #ifdef ZTS
- PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 4, 5);
- #else
  PHPAPI void php_stream_wrapper_log_error(php_stream_wrapper *wrapper, int options, const char *fmt, ...) PHP_ATTRIBUTE_FORMAT(printf, 3, 4);
- #endif
  
  #define PHP_STREAM_UNCHANGED  0 /* orig stream was seekable anyway */
  #define PHP_STREAM_RELEASED           1 /* newstream should be used; origstream is no longer valid */

diff --cc sapi/phpdbg/phpdbg_opcode.c
Simple merge

diff --cc sapi/phpdbg/phpdbg_prompt.c
Simple merge