diff --git a/404.html b/404.html index c6014a7c357fc3376f76badf47f8097bf46b3c26..6f174d4e53f489b1d012e296fc08c24c5285368f 100644 --- a/404.html +++ b/404.html @@ -27,7 +27,7 @@ text-align: center; margin: 0; padding: 0.6em 2em 0.4em; - background-color: #900; + background-color: #f73; color: #fff; font-weight: normal; font-size: 1.75em; @@ -39,7 +39,7 @@ } h2 { text-align: center; - background-color: #900; + background-color: #f73; font-size: 1.1em; font-weight: bold; color: #fff; @@ -49,7 +49,7 @@ } h3 { text-align: center; - background-color: #ff0000; + background-color: #8B6969; padding: 0.5em; color: #fff; } @@ -92,7 +92,7 @@

Something has triggered missing webpage on your website. This is the default 404 error page for nginx that is distributed with - Red Hat Enterprise Linux. It is located + Anolis OS. It is located /usr/share/nginx/html/404.html

You should customize this error page for your own @@ -100,7 +100,7 @@ the nginx configuration file /etc/nginx/nginx.conf.

-

For information on Red Hat Enterprise Linux, please visit the Red Hat, Inc. website. The documentation for Red Hat Enterprise Linux is available on the Red Hat, Inc. website.

+

For information on Anolis OS, please visit the OpenAnolis Community. The documentation for Anolis OS is available on the OpenAnolis Community website.

@@ -110,9 +110,9 @@ src="nginx-logo.png" alt="[ Powered by nginx ]" width="121" height="32" /> - [ Powered by Red Hat Enterprise Linux ] diff --git a/50x.html b/50x.html index 5d8d957762b8c40c56482b42b8617065e8a0cff9..aa6d6a3f70577562af00a1387b72ac1a4893008f 100644 --- a/50x.html +++ b/50x.html @@ -27,7 +27,7 @@ text-align: center; margin: 0; padding: 0.6em 2em 0.4em; - background-color: #900; + background-color: #f73; color: #fff; font-weight: normal; font-size: 1.75em; @@ -39,7 +39,7 @@ } h2 { text-align: center; - background-color: #900; + background-color: #f73; font-size: 1.1em; font-weight: bold; color: #fff; @@ -49,7 +49,7 @@ } h3 { text-align: center; - background-color: #ff0000; + background-color: #8B6969; padding: 0.5em; color: #fff; } @@ -92,7 +92,7 @@

Something has triggered missing webpage on your website. This is the default error page for nginx that is distributed with - Red Hat Enterprise Linux. It is located + Anolis OS. It is located /usr/share/nginx/html/50x.html

You should customize this error page for your own @@ -100,7 +100,7 @@ the nginx configuration file /etc/nginx/nginx.conf.

-

For information on Red Hat Enterprise Linux, please visit the Red Hat, Inc. website. The documentation for Red Hat Enterprise Linux is available on the Red Hat, Inc. website.

+

For information on Anolis OS, please visit the OpenAnolis Community. The documentation for Anolis OS is available on the OpenAnolis Community website.

@@ -110,9 +110,9 @@ src="nginx-logo.png" alt="[ Powered by nginx ]" width="121" height="32" /> - [ Powered by Red Hat Enterprise Linux ] diff --git a/nginx.spec b/nginx.spec index 7e5bdd56c7a0fd31dc391d79ce9d8952cb121e6f..3b53cb0b2411c3ca945a351f07e2ce32b6543ed7 100644 --- a/nginx.spec +++ b/nginx.spec @@ -1,3 +1,4 @@ +%define anolis_release .0.1 %global _hardened_build 1 %global nginx_user nginx @@ -19,8 +20,7 @@ Name: nginx Epoch: 1 Version: 1.20.1 -Release: 1%{?dist} - +Release: 1%{anolis_release}%{?dist} Summary: A high performance web server and reverse proxy server Group: System Environment/Daemons # BSD License (two clause) @@ -260,7 +260,7 @@ export DESTDIR=%{buildroot} --with-google_perftools_module \ %endif --with-debug \ - --with-cc-opt="%{optflags} $(pcre-config --cflags)" \ + --with-cc-opt="%{optflags} $(pcre-config --cflags) -floop-unroll-and-jam -ftree-loop-distribution --param early-inlining-insns=160 --param inline-heuristics-hint-percent=800 --param inline-min-speedup=50 --param inline-unit-growth=256 --param max-average-unrolled-insns=500 --param max-completely-peel-times=32 --param max-completely-peeled-insns=800 --param max-inline-insns-auto=128 --param max-inline-insns-small=128 --param max-unroll-times=16 --param max-unrolled-insns=16" \ --with-compat \ --with-ld-opt="$RPM_LD_FLAGS -Wl,-E" # so the perl module finds its symbols @@ -474,6 +474,10 @@ fi %changelog +* Fri Feb 11 2022 Renbo - 1:1.20.1-1.0.1 +- Add acops tuning options (liangbin.mj@alibaba-inc.com) +- Update html pages (geliwei@openanolis.org) + * Tue Dec 21 2021 Joe Orton - 1:1.20.1-1 - rebase to 1.20.1 (addressing CVE-2021-23017)