releasing 2.1.2

#32 #33 releasing
longxinH · Dec 6, 2019 · cd80641 · cd80641
1 parent 13336d8
commit cd80641
Show file tree

Hide file tree

Showing 3 changed files with 222 additions and 150 deletions.
diff --git a/extension/php_xhprof.h b/extension/php_xhprof.h
@@ -39,7 +39,7 @@ extern zend_module_entry xhprof_module_entry;
  */
 
 /* XHProf version                           */
-#define XHPROF_VERSION       "2.1.2-dev"
+#define XHPROF_VERSION       "2.1.2"
 
 /* Fictitious function name to represent top of the call tree. The paranthesis
  * in the name is to ensure we don't conflict with user function names.  */

diff --git a/extension/xhprof.c b/extension/xhprof.c
@@ -1602,19 +1602,19 @@ char* hp_trace_callback_curl_exec(char *symbol, zend_execute_data *data)
     ZVAL_STRING(&func, "curl_getinfo");
 
     zend_fcall_info fci = {
-            size: sizeof(zend_fcall_info),
+            sizeof(fci),
 #if PHP_VERSION_ID < 70100
-            function_table: EG(function_table),
+            EG(function_table),
 #endif
-            function_name: func,
+            func,
 #if PHP_VERSION_ID < 70100
-            symbol_table: NULL,
+            NULL,
 #endif
-            retval: &retval,
-            params: &params,
-            object: NULL,
-            no_separation: 1,
-            param_count: 1
+            &retval,
+            params,
+            NULL,
+            1,
+            1
     };
 
     if (zend_call_function(&fci, NULL) == FAILURE) {