From 9982ec2a2a2d47d5122a1eca15f9e9d9cd1a3950 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Wed, 3 Jun 2020 10:28:40 +0200
Subject: update to 0.46.0 open
 https://github.com/DataDog/dd-trace-php/issues/912   failed test and segfault
 in test suite open https://github.com/DataDog/dd-trace-php/issues/913  
 missing file for 5.4

---
 PHPINFO                     |  2 +-
 REFLECTION                  | 10 ++++++++--
 handlers_internal.c         | 15 +++++++++++++++
 php-pecl-datadog-trace.spec | 16 +++++++++++++++-
 4 files changed, 39 insertions(+), 4 deletions(-)
 create mode 100644 handlers_internal.c

diff --git a/PHPINFO b/PHPINFO
index de5b1d4..28e46f0 100644
--- a/PHPINFO
+++ b/PHPINFO
@@ -7,7 +7,7 @@ For help, check out the documentation at https://docs.datadoghq.com/tracing/lang
 (c) Datadog 2019
 
 Datadog tracing support => enabled
-Version => 0.45.0
+Version => 0.46.0
 
 Directive => Local Value => Master Value
 ddtrace.disable => Off => Off
diff --git a/REFLECTION b/REFLECTION
index 6f9bcda..f9be1cc 100644
--- a/REFLECTION
+++ b/REFLECTION
@@ -1,4 +1,4 @@
-Extension [ <persistent> extension #114 ddtrace version 0.45.0 ] {
+Extension [ <persistent> extension #114 ddtrace version 0.46.0 ] {
 
   - INI {
     Entry [ ddtrace.disable <SYSTEM> ]
@@ -13,7 +13,7 @@ Extension [ <persistent> extension #114 ddtrace version 0.45.0 ] {
   }
 
   - Constants [1] {
-    Constant [ string DD_TRACE_VERSION ] { 0.45.0 }
+    Constant [ string DD_TRACE_VERSION ] { 0.46.0 }
   }
 
   - Functions {
@@ -140,6 +140,12 @@ Extension [ <persistent> extension #114 ddtrace version 0.45.0 ] {
       - Parameters [0] {
       }
     }
+    Function [ <internal:ddtrace> function ddtrace_init ] {
+
+      - Parameters [1] {
+        Parameter #0 [ <required> $dir ]
+      }
+    }
   }
 
   - Classes [1] {
diff --git a/handlers_internal.c b/handlers_internal.c
new file mode 100644
index 0000000..ad09ba1
--- /dev/null
+++ b/handlers_internal.c
@@ -0,0 +1,15 @@
+#include "handlers_internal.h"
+
+#include "compatibility.h"
+
+void ddtrace_replace_internal_function(const HashTable *ht, ddtrace_string fname) { PHP5_UNUSED(ht, fname); }
+void ddtrace_replace_internal_functions(const HashTable *ht, size_t functions_len, ddtrace_string functions[]) {
+    PHP5_UNUSED(ht, functions_len, functions);
+}
+void ddtrace_replace_internal_methods(ddtrace_string Class, size_t methods_len, ddtrace_string methods[]) {
+    PHP5_UNUSED(Class, methods_len, methods);
+}
+
+void ddtrace_internal_handlers_startup(void) {}
+void ddtrace_internal_handlers_shutdown(void) {}
+void ddtrace_internal_handlers_rshutdown(void) {}
diff --git a/php-pecl-datadog-trace.spec b/php-pecl-datadog-trace.spec
index dc2838f..2ff8626 100644
--- a/php-pecl-datadog-trace.spec
+++ b/php-pecl-datadog-trace.spec
@@ -34,7 +34,7 @@
 
 Summary:        APM and distributed tracing for PHP
 Name:           %{?sub_prefix}php-pecl-datadog-trace
-Version:        0.45.0
+Version:        0.46.0
 Release:        1%{?dist}%{!?scl:%{!?nophptag:%(%{__php} -r 'echo ".".PHP_MAJOR_VERSION.".".PHP_MINOR_VERSION;')}}
 # extension is dual-licensed under Apache 2.0 or BSD3.
 # mpack is MIT
@@ -42,6 +42,8 @@ License:        (ASL 2.0 or BSD) and MIT
 URL:            https://pecl.php.net/package/%{proj_name}
 Source0:        https://pecl.php.net/get/%{proj_name}-%{version}.tgz
 
+Source1:        https://raw.githubusercontent.com/DataDog/dd-trace-php/0.46.0/src/ext/php5_4/handlers_internal.c
+
 %if 0%{?rhel} == 6
 BuildRequires:  devtoolset-6-toolchain
 %else
@@ -107,6 +109,7 @@ sed -e 's/role="test"/role="src"/' \
     -i package.xml
 
 cd NTS
+cp %{SOURCE1} src/ext/php5_4/handlers_internal.c
 cp src/ext/mpack/LICENSE LICENSE.mpack
 : Sanity check, really often broken
 extver=$(sed -n '/#define PHP_DDTRACE_VERSION /{s/.* "//;s/".*$//;p}' src/ext/version.h)
@@ -185,6 +188,7 @@ done
 %check
 # Erratic results
 rm ?TS/tests/ext/segfault_backtrace_*.phpt
+rm ?TS/tests/ext/sandbox/memory_limit_graceful_bailout.phpt
 %if %{__isa_bits} < 64
 # see https://github.com/DataDog/dd-trace-php/issues/394
 rm ?TS/tests/ext/circuit_breaker_info.phpt
@@ -268,6 +272,16 @@ fi
 
 
 %changelog
+* Wed Jun  3 2020 Remi Collet <remi@remirepo.net> - 0.46.0-1
+- update to 0.46.0
+- open https://github.com/DataDog/dd-trace-php/issues/912
+  failed test and segfault in test suite
+- open https://github.com/DataDog/dd-trace-php/issues/913
+  missing file for 5.4
+
+* Tue May 19 2020 Remi Collet <remi@remirepo.net> - 0.45.1-1
+- update to 0.45.1
+
 * Wed May 13 2020 Remi Collet <remi@remirepo.net> - 0.45.0-1
 - update to 0.45.0
 
-- 
cgit