fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pingos: update nginx to 1.19.6

Browse Source 
Signed-off-by: Tianling Shen <cnsztl@immortalwrt.org>
This commit is contained in:
Lienol 2021-03-05 22:16:00 +08:00 committed by Tianling Shen
parent 3fa68f1ff4
commit 47a93b16af
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
6 changed files with 31 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/lienol/luci-app-nginx-pingos/Makefile
View File

@ -3,12 +3,12 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-nginx-pingos
PKG_VERSION:=1.19.0
PKG_RELEASE:=4
PKG_VERSION:=1.19.6
PKG_RELEASE:=1
PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://nginx.org/download/
PKG_HASH:=44a616171fcd7d7ad7c6af3e6f3ad0879b54db5a5d21be874cd458b5691e36c8
PKG_HASH:=b11195a02b1d3285ddf2987e02c6b6d28df41bb1b1dd25f33542848ef4fc33b5
PKG_DIR:=$(BUILD_DIR)/$(PKG_NAME)
PKG_BUILD_DIR:=$(PKG_DIR)/nginx-$(PKG_VERSION)
@ -77,6 +77,9 @@ define Package/$(PKG_NAME)/install
$(INSTALL_DIR) $(1)/etc/uci-defaults
$(INSTALL_CONF) ./root/etc/uci-defaults/* $(1)/etc/uci-defaults
$(INSTALL_DIR) $(1)/usr/share/rpcd/acl.d
cp -pR ./root/usr/share/rpcd/acl.d/* $(1)/usr/share/rpcd/acl.d
$(INSTALL_DIR) $(1)/usr/share/pingos
cp -pR $(PKG_INSTALL_DIR)/usr/share/pingos/conf $(1)/usr/share/pingos
$(INSTALL_DATA) ./root/resource/conf-template/nginx.conf $(1)/usr/share/pingos/conf/nginx.conf

1
package/lienol/luci-app-nginx-pingos/modules/nginx-rtmp-module/ngx_rtmp.h
View File

@ -360,6 +360,7 @@ struct ngx_rtmp_session_s {
unsigned published:1;
unsigned closed:1;
unsigned publishing:1;
unsigned finalized:1;
/* live type: 0- RTMP 1- http-flv 2- hls */
unsigned live_type:2;

20
package/lienol/luci-app-nginx-pingos/modules/nginx-rtmp-module/ngx_rtmp_init.c
View File

@ -374,6 +374,11 @@ ngx_rtmp_async_finalize_http_request(ngx_event_t *ev)
ngx_log_error(NGX_LOG_INFO, s->log, 0, "asyn finalize http request");
if (!r) {
ngx_log_error(NGX_LOG_ERR, s->log, 0, "Http request is null");
return;
}
if (r->header_sent) {
ngx_http_finalize_request(r, NGX_HTTP_CLIENT_CLOSED_REQUEST);
ngx_http_run_posted_requests(r->connection);
@ -407,6 +412,13 @@ ngx_rtmp_finalize_session(ngx_rtmp_session_t *s)
return;
}
if (s->finalized) {
ngx_log_error(NGX_LOG_WARN, s->log, 0, "The session has been finalized.");
return;
}
s->finalized = 1;
if (s->live_type != NGX_RTMP_LIVE) {
e = &s->close;
e->data = s;
@ -437,6 +449,14 @@ ngx_rtmp_finalize_fake_session(ngx_rtmp_session_t *s)
{
ngx_log_error(NGX_LOG_INFO, s->log, 0, "finalize fake session");
if (s->finalized) {
ngx_log_error(NGX_LOG_WARN, s->log, 0, "The fake session has been finalized.");
return;
}
s->finalized = 1;
ngx_rtmp_fire_event(s, NGX_RTMP_DISCONNECT, NULL, NULL);
ngx_rtmp_close_session(s);

0
package/lienol/luci-app-nginx-pingos/root/etc/init.d/pingos Normal file → Executable file
View File

0
package/lienol/luci-app-nginx-pingos/root/etc/uci-defaults/luci-app-nginx-pingos Normal file → Executable file
View File

8
package/lienol/luci-app-nginx-pingos/root/resource/conf-template/nginx.conf
View File

@ -1,7 +1,7 @@
user root;
daemon on;
master_process on;
worker_processes 4;
worker_processes 1;
#worker_rlimit 4g;
#error_log logs/error.log;
@ -109,9 +109,9 @@ http {
hash $arg_session consistent;
# 这里需要注意，你要开几个进程，就要按这个规则写几条记录
server unix:/tmp/http.0;
server unix:/tmp/http.1;
server unix:/tmp/http.2;
server unix:/tmp/http.3;
# server unix:/tmp/http.1;
# server unix:/tmp/http.2;
# server unix:/tmp/http.3;
}
server {