Merge branch 'PHP-5.6'

* PHP-5.6:
  updated NEWS
  Fixed bug #68583 Crash in timeout thread

Conflicts:
	Zend/zend_execute.h
	Zend/zend_execute_API.c

diff --cc Zend/zend.c
index f429b2d2a4ce512c8349bef048e866fabb85fd88,a1d1053c76f274650e6d2d0a4171358ae3eb6353..89977e7734e31dba59d6f504f52344fa673efd0a
--- 1/Zend/zend.c
--- 2/Zend/zend.c
+++ b/Zend/zend.c
@@@ -727,11 -817,9 +727,8 @@@ void zend_shutdown(TSRMLS_D) /* {{{ *
  {
  #ifdef ZEND_SIGNALS
        zend_signal_shutdown(TSRMLS_C);
- #endif
- #ifdef ZEND_WIN32
-       zend_shutdown_timeout_thread();
  #endif
        zend_destroy_rsrc_list(&EG(persistent_list) TSRMLS_CC);
 -
        if (EG(active))
        {
                /*

diff --cc Zend/zend_execute.h
index 3eab9662dbee11492fa044749cb6d5248ff36625,346147e4729d2c481c98b48d735071faf9d9c721..a410f47edf38ca9042a506553dbcee495982904e
--- 1/Zend/zend_execute.h
--- 2/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@@ -225,23 -355,26 +225,16 @@@ ZEND_API const char *zend_get_executed_
  ZEND_API uint zend_get_executed_lineno(TSRMLS_D);
  ZEND_API zend_bool zend_is_executing(TSRMLS_D);
  
 -ZEND_API void zend_set_timeout(long seconds, int reset_signals);
 +ZEND_API void zend_set_timeout(zend_long seconds, int reset_signals);
  ZEND_API void zend_unset_timeout(TSRMLS_D);
  ZEND_API void zend_timeout(int dummy);
 -ZEND_API zend_class_entry *zend_fetch_class(const char *class_name, uint class_name_len, int fetch_type TSRMLS_DC);
 -ZEND_API zend_class_entry *zend_fetch_class_by_name(const char *class_name, uint class_name_len, const zend_literal *key, int fetch_type TSRMLS_DC);
 +ZEND_API zend_class_entry *zend_fetch_class(zend_string *class_name, int fetch_type TSRMLS_DC);
 +ZEND_API zend_class_entry *zend_fetch_class_by_name(zend_string *class_name, const zval *key, int fetch_type TSRMLS_DC);
  void zend_verify_abstract_class(zend_class_entry *ce TSRMLS_DC);
  
 -ZEND_API void zend_fetch_dimension_by_zval(zval **result, zval *container, zval *dim TSRMLS_DC);
 +ZEND_API void zend_fetch_dimension_by_zval(zval *result, zval *container, zval *dim TSRMLS_DC);
  
- #ifdef ZEND_WIN32
- void zend_init_timeout_thread(void);
- void zend_shutdown_timeout_thread(void);
- #define WM_REGISTER_ZEND_TIMEOUT              (WM_USER+1)
- #define WM_UNREGISTER_ZEND_TIMEOUT            (WM_USER+2)
- #endif
 -#define zendi_zval_copy_ctor(p) zval_copy_ctor(&(p))
 -#define zendi_zval_dtor(p) zval_dtor(&(p))
 -
 -#define active_opline (*EG(opline_ptr))
 -
 -/* The following tries to resolve the classname of a zval of type object.
 - * Since it is slow it should be only used in error messages.
 - */
 -#define Z_OBJ_CLASS_NAME_P(zval) ((zval) && Z_TYPE_P(zval) == IS_OBJECT && Z_OBJ_HT_P(zval)->get_class_entry != NULL && Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC) ? Z_OBJ_HT_P(zval)->get_class_entry(zval TSRMLS_CC)->name : "")
--
 -ZEND_API zval** zend_get_compiled_variable_value(const zend_execute_data *execute_data_ptr, zend_uint var);
 +ZEND_API zval* zend_get_compiled_variable_value(const zend_execute_data *execute_data_ptr, uint32_t var);
  
  #define ZEND_USER_OPCODE_CONTINUE   0 /* execute next opcode */
  #define ZEND_USER_OPCODE_RETURN     1 /* exit from executor (return from function) */

diff --cc Zend/zend_execute_API.c
Simple merge