summaryrefslogtreecommitdiffstats
path: root/skywalking-php85.patch
diff options
context:
space:
mode:
Diffstat (limited to 'skywalking-php85.patch')
-rw-r--r--skywalking-php85.patch102
1 files changed, 102 insertions, 0 deletions
diff --git a/skywalking-php85.patch b/skywalking-php85.patch
new file mode 100644
index 0000000..aa14312
--- /dev/null
+++ b/skywalking-php85.patch
@@ -0,0 +1,102 @@
+From 7202ec37c4205b84b4df217436ab0e6a64a79d86 Mon Sep 17 00:00:00 2001
+From: Remi Collet <remi@remirepo.net>
+Date: Wed, 30 Jul 2025 14:35:24 +0200
+Subject: [PATCH] use Zend/zend_smart_string.h
+
+---
+ src/sky_core_log.c | 1 -
+ src/sky_core_segment.c | 2 +-
+ src/sky_core_span.c | 1 -
+ src/sky_core_tag.c | 3 +--
+ src/sky_plugin_redis.c | 1 -
+ src/sky_util_php.h | 5 +++++
+ 6 files changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/sky_core_log.c b/src/sky_core_log.c
+index cff9081..8b43c2d 100644
+--- a/src/sky_core_log.c
++++ b/src/sky_core_log.c
+@@ -20,7 +20,6 @@
+ #include "php.h"
+ #include <sys/time.h>
+ #include "sky_util_php.h"
+-#include "ext/standard/php_smart_string.h"
+
+ sky_core_log_t *sky_core_log_new() {
+ sky_core_log_t *log = (sky_core_log_t *) emalloc(sizeof(sky_core_log_t));
+diff --git a/src/sky_core_segment.c b/src/sky_core_segment.c
+index fd5d9dc..5503cec 100644
+--- a/src/sky_core_segment.c
++++ b/src/sky_core_segment.c
+@@ -23,7 +23,7 @@
+ #include "sky_core_cross_process.h"
+ #include "sky_core_segment_reference.h"
+ #include "sky_core_report.h"
+-#include "ext/standard/php_smart_string.h"
++#include "sky_util_php.h"
+
+ sky_core_segment_t *sky_core_segment_new(char *protocol) {
+ sky_core_segment_t *segment = (sky_core_segment_t *) emalloc(sizeof(sky_core_segment_t));
+diff --git a/src/sky_core_span.c b/src/sky_core_span.c
+index dba3c63..0abbb88 100644
+--- a/src/sky_core_span.c
++++ b/src/sky_core_span.c
+@@ -22,7 +22,6 @@
+ #include <string.h>
+ #include <sys/time.h>
+ #include "sky_util_php.h"
+-#include "ext/standard/php_smart_string.h"
+
+ sky_core_span_t *sky_core_span_new(sky_core_span_type type, sky_core_span_layer layer, int componentId) {
+ sky_core_span_t *span = (sky_core_span_t *) emalloc(sizeof(sky_core_span_t));
+diff --git a/src/sky_core_tag.c b/src/sky_core_tag.c
+index 228afa6..62559df 100644
+--- a/src/sky_core_tag.c
++++ b/src/sky_core_tag.c
+@@ -20,7 +20,6 @@
+ #include <stdlib.h>
+ #include <stdio.h>
+ #include "sky_util_php.h"
+-#include "ext/standard/php_smart_string.h"
+
+ sky_core_tag_t *sky_core_tag_new(char *key, char *value) {
+ sky_core_tag_t *tag = (sky_core_tag_t *) emalloc(sizeof(sky_core_tag_t));
+@@ -44,4 +43,4 @@ int sky_core_tag_to_json(char **json, sky_core_tag_t *tag) {
+ efree(tag);
+ *json = str.c;
+ return str.len;
+-}
+\ No newline at end of file
++}
+diff --git a/src/sky_plugin_redis.c b/src/sky_plugin_redis.c
+index bd3838b..5918d2e 100644
+--- a/src/sky_plugin_redis.c
++++ b/src/sky_plugin_redis.c
+@@ -19,7 +19,6 @@
+ #include "sky_plugin_redis.h"
+ #include "sky_util_php.h"
+ #include "sky_utils.h"
+-#include "ext/standard/php_smart_string.h"
+
+ // strings
+ zif_handler origin_redis_append = NULL;
+diff --git a/src/sky_util_php.h b/src/sky_util_php.h
+index aeb2694..ffc5503 100644
+--- a/src/sky_util_php.h
++++ b/src/sky_util_php.h
+@@ -27,7 +27,12 @@ typedef void (*zif_handler)(INTERNAL_FUNCTION_PARAMETERS);
+
+ #endif
+
++
++#if PHP_VERSION_ID < 70200
+ #include "ext/standard/php_smart_string.h"
++#else
++#include "Zend/zend_smart_string.h"
++#endif
+
+ void *sky_util_find_obj_func(const char *obj, const char *name);
+
+--
+2.50.1
+