From 62609f1587b2e272dc8a2245e36ca6dc7d0c8820 Mon Sep 17 00:00:00 2001
From: Peter Stadler <peter.stadler@student.uibk.ac.at>
Date: Tue, 12 May 2020 11:00:00 +0200
Subject: [PATCH] nginx: do not reduce max processes

Use the upstream value for NGX_MAX_PROCESSES (=1024) again.
So it is safe to use `worker_processes auto;` (which sets it to
the number of CPUs). Also use this directive in the conf instead
of calculating the number in the init and passing it as argument.

Signed-off-by: Peter Stadler <peter.stadler@student.uibk.ac.at>
---
 net/nginx/Makefile                        |  2 +-
 net/nginx/files/nginx.conf                |  2 ++
 net/nginx/files/nginx.init                |  3 +--
 net/nginx/patches/300-max-processes.patch | 11 -----------
 4 files changed, 4 insertions(+), 14 deletions(-)
 delete mode 100644 net/nginx/patches/300-max-processes.patch

diff --git a/net/nginx/Makefile b/net/nginx/Makefile
index cfd6b47c0f..2be5c6e9b4 100644
--- a/net/nginx/Makefile
+++ b/net/nginx/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=nginx
 PKG_VERSION:=1.17.10
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_SOURCE:=nginx-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://nginx.org/download/
diff --git a/net/nginx/files/nginx.conf b/net/nginx/files/nginx.conf
index 65d37b5044..da1cbdf429 100644
--- a/net/nginx/files/nginx.conf
+++ b/net/nginx/files/nginx.conf
@@ -1,6 +1,8 @@
 # Please consider creating files in /etc/nginx/conf.d/ instead of editing this.
 # For details see https://openwrt.org/docs/guide-user/services/webserver/nginx
 
+worker_processes auto;
+
 user root;
 
 events {}
diff --git a/net/nginx/files/nginx.init b/net/nginx/files/nginx.init
index 57142950bf..fa189931c1 100644
--- a/net/nginx/files/nginx.init
+++ b/net/nginx/files/nginx.init
@@ -16,9 +16,8 @@ start_service() {
 	${NGINX_UTIL} init_lan
 
 	procd_open_instance
-	NCPUS="$(grep -c '^processor\s*:' /proc/cpuinfo)"
 	procd_set_param command /usr/sbin/nginx -c "${NGINX_CONF}" \
-		-g "daemon off; worker_processes $NCPUS;"
+		-g "daemon off;"
 	procd_set_param stdout 1
 	procd_set_param stderr 1
 	procd_set_param file "${LAN_LISTEN}" "${LAN_LISTEN}.default" \
diff --git a/net/nginx/patches/300-max-processes.patch b/net/nginx/patches/300-max-processes.patch
deleted file mode 100644
index f7465d4343..0000000000
--- a/net/nginx/patches/300-max-processes.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/os/unix/ngx_process.h
-+++ b/src/os/unix/ngx_process.h
-@@ -44,7 +44,7 @@ typedef struct {
- } ngx_exec_ctx_t;
- 
- 
--#define NGX_MAX_PROCESSES         1024
-+#define NGX_MAX_PROCESSES         8
- 
- #define NGX_PROCESS_NORESPAWN     -1
- #define NGX_PROCESS_JUST_SPAWN    -2