diff options
Diffstat (limited to 'www/freenginx-devel/files')
| -rw-r--r-- | www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp | 14 | ||||
| -rw-r--r-- | www/freenginx-devel/files/nginx.in | 3 |
2 files changed, 17 insertions, 0 deletions
diff --git a/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp b/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp new file mode 100644 index 000000000000..0024171deaec --- /dev/null +++ b/www/freenginx-devel/files/extra-patch-ngx_otel_module.cpp @@ -0,0 +1,14 @@ +--- ../nginx-otel-3a655df/src/ngx_otel_module.cpp.orig 2024-12-19 17:07:23.000000000 -0500 ++++ ../nginx-otel-3a655df/src/ngx_otel_module.cpp 2025-10-31 11:50:12.604868000 -0400 +@@ -512,7 +512,11 @@ + try { + BatchExporter::SpanInfo info{ + getSpanName(r), ctx->current, ctx->parent.spanId, ++#if defined freenginx ++ (toNanoSec(now->sec, now->msec) - ((ngx_current_msec - r->start_time) * 1000000)), ++#else + toNanoSec(r->start_sec, r->start_msec), ++#endif + toNanoSec(now->sec, now->msec)}; + + bool ok = gExporter->add(info, [r](BatchExporter::Span& span) { diff --git a/www/freenginx-devel/files/nginx.in b/www/freenginx-devel/files/nginx.in index 7da8670ba17e..4ebb8e3886ae 100644 --- a/www/freenginx-devel/files/nginx.in +++ b/www/freenginx-devel/files/nginx.in @@ -47,6 +47,8 @@ _tmpprefix="%%NGINX_TMPDIR%%" required_files=%%PREFIX%%/etc/freenginx/nginx.conf extra_commands="reload configtest upgrade gracefulstop" +: ${nginx_svcj_options:="net_basic"} + [ -z "$nginx_enable" ] && nginx_enable="NO" [ -z "$nginxlimits_enable" ] && nginxlimits_enable="NO" [ -z "$nginxlimits_args" ] && nginxlimits_args="-e -U %%WWWOWN%%" @@ -67,6 +69,7 @@ if [ -n "$2" ]; then required_files="${nginx_configfile}" eval nginx_enable="\${nginx_${profile}_enable:-${nginx_enable}}" eval nginx_flags="\${nginx_${profile}_flags:-${nginx_flags}}" + eval nginx_svcj_options="\${nginx_${profile}_svcj_options:-${nginx_svcj_options}}" eval nginxlimits_enable="\${nginxlimits_${profile}_enable:-${nginxlimits_enable}}" eval nginxlimits_args="\${nginxlimits_${profile}_args:-${nginxlimits_args}}" nginx_flags="-c ${nginx_configfile} -g \"pid ${pidfile};\" ${nginx_flags}" |