diff options
| -rw-r--r-- | PHPINFO | 2 | ||||
| -rw-r--r-- | REFLECTION | 2 | ||||
| -rw-r--r-- | php-pecl-datadog-trace.spec | 8 | ||||
| -rw-r--r-- | request_hooks.c | 101 | ||||
| -rw-r--r-- | request_hooks.h | 9 |
5 files changed, 6 insertions, 116 deletions
@@ -7,7 +7,7 @@ For help, check out the documentation at https://github.com/DataDog/dd-trace-php (c) Datadog 2018 Datadog tracing support => enabled -Version => 0.10.0-beta +Version => 0.11.0-beta Directive => Local Value => Master Value ddtrace.disable => 0 => 0 @@ -1,4 +1,4 @@ -Extension [ <persistent> extension #84 ddtrace version 0.10.0-beta ] { +Extension [ <persistent> extension #84 ddtrace version 0.11.0-beta ] { - INI { Entry [ ddtrace.disable <SYSTEM> ] diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec index 530e374..5246c81 100644 --- a/php-pecl-datadog-trace.spec +++ b/php-pecl-datadog-trace.spec @@ -34,13 +34,11 @@ Summary: APM and distributed tracing for PHP Name: %{?sub_prefix}php-pecl-datadog-trace -Version: 0.10.0 +Version: 0.11.0 Release: 1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}} License: MIT URL: http://pecl.php.net/package/%{proj_name} Source0: http://pecl.php.net/get/%{proj_name}-%{version}.tgz -Source1: https://raw.githubusercontent.com/DataDog/dd-trace-php/038957d286d6c9b65dd98d1c9a7893b66839bc98/src/ext/request_hooks.h -Source2: https://raw.githubusercontent.com/DataDog/dd-trace-php/038957d286d6c9b65dd98d1c9a7893b66839bc98/src/ext/request_hooks.c BuildRequires: %{?dtsprefix}gcc BuildRequires: %{?scl_prefix}php-devel @@ -91,7 +89,6 @@ Package built for PHP %(%{__php} -r 'echo PHP_MAJOR_VERSION.".".PHP_MINOR_VERSIO %prep %setup -q -c mv %{proj_name}-%{version} NTS -cp %{SOURCE1} %{SOURCE2} NTS/src/ext/ # Don't install tests sed -e 's/role="test"/role="src"/' \ @@ -232,6 +229,9 @@ fi %changelog +* Wed Jan 30 2019 Remi Collet <remi@remirepo.net> - 0.11.0-1 +- update to 0.11.0 + * Tue Jan 22 2019 Remi Collet <remi@remirepo.net> - 0.10.0-1 - update to 0.10.0 - open https://github.com/DataDog/dd-trace-php/issues/249 missing files diff --git a/request_hooks.c b/request_hooks.c deleted file mode 100644 index c4f5f53..0000000 --- a/request_hooks.c +++ /dev/null @@ -1,101 +0,0 @@ -#include "request_hooks.h" -#include "compat_zend_string.h" - -#include <Zend/zend.h> -#include <Zend/zend_compile.h> -#include <php_main.h> - -#if PHP_VERSION_ID < 70000 -int dd_execute_php_file(const char *filename TSRMLS_DC) { - int filename_len = strlen(filename); - if (filename_len == 0) { - return FAILURE; - } - int dummy = 1; - zend_file_handle file_handle; - zend_op_array *new_op_array; - zval *result = NULL; - int ret; - - ret = php_stream_open_for_zend_ex(filename, &file_handle, USE_PATH | STREAM_OPEN_FOR_INCLUDE TSRMLS_CC); - - if (ret == SUCCESS) { - if (!file_handle.opened_path) { - file_handle.opened_path = estrndup(filename, filename_len); - } - if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path) + 1, - (void *)&dummy, sizeof(int), NULL) == SUCCESS) { - new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE TSRMLS_CC); - zend_destroy_file_handle(&file_handle TSRMLS_CC); - } else { - new_op_array = NULL; - zend_file_handle_dtor(&file_handle TSRMLS_CC); - } - if (new_op_array) { - EG(return_value_ptr_ptr) = &result; - EG(active_op_array) = new_op_array; - if (!EG(active_symbol_table)) { - zend_rebuild_symbol_table(TSRMLS_C); - } - - zend_execute(new_op_array TSRMLS_CC); - - destroy_op_array(new_op_array TSRMLS_CC); - efree(new_op_array); - if (!EG(exception)) { - if (EG(return_value_ptr_ptr)) { - zval_ptr_dtor(EG(return_value_ptr_ptr)); - } - } - - return 1; - } - } - return 0; -} -#else - -int dd_execute_php_file(const char *filename TSRMLS_DC) { - int filename_len = strlen(filename); - if (filename_len == 0) { - return FAILURE; - } - zval dummy; - zend_file_handle file_handle; - zend_op_array *new_op_array; - zval result; - int ret; - - ret = php_stream_open_for_zend_ex(filename, &file_handle, USE_PATH | STREAM_OPEN_FOR_INCLUDE); - - if (ret == SUCCESS) { - zend_string *opened_path; - if (!file_handle.opened_path) { - file_handle.opened_path = zend_string_init(filename, filename_len, 0); - } - opened_path = zend_string_copy(file_handle.opened_path); - ZVAL_NULL(&dummy); - if (zend_hash_add(&EG(included_files), opened_path, &dummy)) { - new_op_array = zend_compile_file(&file_handle, ZEND_REQUIRE); - zend_destroy_file_handle(&file_handle); - } else { - new_op_array = NULL; - zend_file_handle_dtor(&file_handle); - } - zend_string_release(opened_path); - if (new_op_array) { - ZVAL_UNDEF(&result); - zend_execute(new_op_array, &result); - - destroy_op_array(new_op_array); - efree(new_op_array); - if (!EG(exception)) { - zval_ptr_dtor(&result); - } - - return 1; - } - } - return 0; -} -#endif diff --git a/request_hooks.h b/request_hooks.h deleted file mode 100644 index 449347b..0000000 --- a/request_hooks.h +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef REQUEST_HOOKS_H -#define REQUEST_HOOKS_H - -#include <Zend/zend_types.h> -#include <php.h> - -int dd_execute_php_file(const char *filename TSRMLS_DC); - -#endif // REQUEST_HOOKS_H |