Adds zend_fiber_startup at the right stage, moves setting of switch hooks

to correct stage

In a threaded environment, these ought to be set before any threads are
created, and they ought to be set once.

Author: krakjoe

Zend/zend.c

@@ -1010,6 +1010,8 @@ void zend_startup(zend_utility_functions *utility_functions) /* {{{ */
 	tsrm_set_new_thread_end_handler(zend_new_thread_end_handler);
 	tsrm_set_shutdown_handler(zend_interned_strings_dtor);
 #endif
+
+    zend_fiber_startup();
 }
 /* }}} */
 

Zend/zend_fibers.c

@@ -798,6 +798,13 @@ void zend_register_fiber_ce(void)
 	zend_ce_fiber_error->create_object = zend_ce_error->create_object;
 }
 
+void zend_fiber_startup(void)
+{
+	zend_fiber_switch_block = fiber_switch_block;
+	zend_fiber_switch_unblock = fiber_switch_unblock;
+	zend_fiber_switch_blocked = fiber_switch_blocked;
+}
+
 void zend_fiber_init(void)
 {
 	zend_fiber_context *context = ecalloc(1, sizeof(zend_fiber_context));
@@ -813,10 +820,6 @@ void zend_fiber_init(void)
 	EG(current_fiber_context) = context;
 	EG(active_fiber) = NULL;
 
-	zend_fiber_switch_block = fiber_switch_block;
-	zend_fiber_switch_unblock = fiber_switch_unblock;
-	zend_fiber_switch_blocked = fiber_switch_blocked;
-
 	zend_fiber_switch_blocking = 0;
 }
 

Zend/zend_fibers.h

@@ -48,6 +48,7 @@ typedef enum {
 } zend_fiber_transfer_flag;
 
 void zend_register_fiber_ce(void);
+void zend_fiber_startup();
 void zend_fiber_init(void);
 void zend_fiber_shutdown(void);