mirror of
https://git.freebsd.org/ports.git
synced 2025-07-14 07:49:16 -04:00
78 lines
2.3 KiB
Text
78 lines
2.3 KiB
Text
diff --git a/ngx_rtmp.c b/ngx_rtmp.c
|
|
index c079c90..e525a93 100644
|
|
--- ../nginx-rtmp-module-1.1.5/ngx_rtmp.c.orig
|
|
+++ ../nginx-rtmp-module-1.1.5/ngx_rtmp.c
|
|
@@ -31,7 +31,11 @@ static char * ngx_rtmp_merge_applications(ngx_conf_t *cf,
|
|
ngx_uint_t ctx_index);
|
|
|
|
|
|
+#if (nginx_version >= 1007005)
|
|
+ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue;
|
|
+#else
|
|
ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue;
|
|
+#endif
|
|
|
|
|
|
ngx_uint_t ngx_rtmp_max_module;
|
|
diff --git a/ngx_rtmp.h b/ngx_rtmp.h
|
|
index d3648f7..b87e99e 100644
|
|
--- ../nginx-rtmp-module-1.1.5/ngx_rtmp.h
|
|
+++ ../nginx-rtmp-module-1.1.5/ngx_rtmp.h
|
|
@@ -12,6 +12,7 @@
|
|
#include <ngx_core.h>
|
|
#include <ngx_event.h>
|
|
#include <ngx_event_connect.h>
|
|
+#include <nginx.h>
|
|
|
|
#include "ngx_rtmp_amf.h"
|
|
#include "ngx_rtmp_bandwidth.h"
|
|
@@ -198,7 +199,11 @@ typedef struct {
|
|
ngx_str_t *addr_text;
|
|
int connected;
|
|
|
|
+#if (nginx_version >= 1007005)
|
|
+ ngx_queue_t posted_dry_events;
|
|
+#else
|
|
ngx_event_t *posted_dry_events;
|
|
+#endif
|
|
|
|
/* client buffer time in msec */
|
|
uint32_t buflen;
|
|
@@ -602,7 +607,11 @@ extern ngx_rtmp_bandwidth_t ngx_rtmp_bw_in;
|
|
|
|
|
|
extern ngx_uint_t ngx_rtmp_naccepted;
|
|
+#if (nginx_version >= 1007005)
|
|
+extern ngx_thread_volatile ngx_queue_t ngx_rtmp_init_queue;
|
|
+#else
|
|
extern ngx_thread_volatile ngx_event_t *ngx_rtmp_init_queue;
|
|
+#endif
|
|
|
|
extern ngx_uint_t ngx_rtmp_max_module;
|
|
extern ngx_module_t ngx_rtmp_core_module;
|
|
diff --git a/ngx_rtmp_play_module.c b/ngx_rtmp_play_module.c
|
|
index acaa46c..f6ea6c3 100644
|
|
--- ../nginx-rtmp-module-1.1.5/ngx_rtmp_play_module.c
|
|
+++ ../nginx-rtmp-module-1.1.5/ngx_rtmp_play_module.c
|
|
@@ -6,6 +6,7 @@
|
|
|
|
#include <ngx_config.h>
|
|
#include <ngx_core.h>
|
|
+#include <nginx.h>
|
|
#include "ngx_rtmp_play_module.h"
|
|
#include "ngx_rtmp_cmd_module.h"
|
|
#include "ngx_rtmp_netcall_module.h"
|
|
@@ -430,7 +431,12 @@ ngx_rtmp_play_do_stop(ngx_rtmp_session_t *s)
|
|
ngx_del_timer(&ctx->send_evt);
|
|
}
|
|
|
|
- if (ctx->send_evt.prev) {
|
|
+#if (nginx_version >= 1007005)
|
|
+ if (ctx->send_evt.posted)
|
|
+#else
|
|
+ if (ctx->send_evt.prev)
|
|
+#endif
|
|
+ {
|
|
ngx_delete_posted_event((&ctx->send_evt));
|
|
}
|
|
|