From af13e722a2f33e4abf8f12ba66135716f3ac1350 Mon Sep 17 00:00:00 2001
From: Gleb Goncharov <gongled@gongled.ru>
Date: Wed, 19 Sep 2018 01:37:44 +0400
Subject: [PATCH 1/3] Use apache/incubator-pagespeed-ngx instead of
 pagespeed/ngx_pagespeed (#71)

---
 .../incubator-pagespeed-ngx-build-force.patch  | 12 ++++++++++++
 SOURCES/ngx_pagespeed-build-force.patch        | 12 ------------
 webkaos.spec                                   | 18 +++++++++---------
 3 files changed, 21 insertions(+), 21 deletions(-)
 create mode 100644 SOURCES/incubator-pagespeed-ngx-build-force.patch
 delete mode 100644 SOURCES/ngx_pagespeed-build-force.patch

diff --git a/SOURCES/incubator-pagespeed-ngx-build-force.patch b/SOURCES/incubator-pagespeed-ngx-build-force.patch
new file mode 100644
index 0000000..92d0ca5
--- /dev/null
+++ b/SOURCES/incubator-pagespeed-ngx-build-force.patch
@@ -0,0 +1,12 @@
+diff -urN incubator-pagespeed-ngx-1.12.34.3-stable-orig/config incubator-pagespeed-ngx-1.12.34.3-stable/config
+--- incubator-pagespeed-ngx-1.12.34.3-stable-orig/config	2017-09-28 16:48:58.000000000 +0400
++++ incubator-pagespeed-ngx-1.12.34.3-stable/config	2018-09-18 13:59:50.000000000 +0400
+@@ -76,7 +76,7 @@
+ fi
+ 
+ if [ "$NGX_DEBUG" = "YES" ]; then
+-  buildtype=Debug
++  buildtype=Release
+   # If we're using a psol tarball that doesn't contain Debug/ (which is the case
+   # from 1.12 onward) then this will be overriden to buildtype=Release below.
+ else
diff --git a/SOURCES/ngx_pagespeed-build-force.patch b/SOURCES/ngx_pagespeed-build-force.patch
deleted file mode 100644
index c45107d..0000000
--- a/SOURCES/ngx_pagespeed-build-force.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ngx_pagespeed-1.12.34.3-stable-orig/config ngx_pagespeed-1.12.34.3-stable/config
---- ngx_pagespeed-1.12.34.3-stable-orig/config	2018-01-22 01:45:10.174446297 +0300
-+++ ngx_pagespeed-1.12.34.3-stable/config	2018-01-22 01:47:34.000000000 +0300
-@@ -76,7 +76,7 @@
- fi
- 
- if [ "$NGX_DEBUG" = "YES" ]; then
--  buildtype=Debug
-+  buildtype=Release
-   # If we're using a psol tarball that doesn't contain Debug/ (which is the case
-   # from 1.12 onward) then this will be overriden to buildtype=Release below.
- else
diff --git a/webkaos.spec b/webkaos.spec
index 8d463f8..6ee97a7 100644
--- a/webkaos.spec
+++ b/webkaos.spec
@@ -39,7 +39,7 @@
 
 ################################################################################
 
-# Fixed bug with ngx_pagespeed comilation on i386
+# Fixed bug with incubator-pagespeed-ngx comilation on i386
 %ifarch %ix86
   %define optflags -O2 -g -march=i686
 %endif
@@ -89,7 +89,7 @@ Source26:             bots.conf
 
 Source30:             %{name}-index.html
 
-Source50:             https://github.com/pagespeed/ngx_pagespeed/archive/v%{pagespeed_ver}.tar.gz
+Source50:             https://github.com/apache/incubator-pagespeed-ngx/archive/v%{pagespeed_ver}.tar.gz
 Source51:             https://dl.google.com/dl/page-speed/psol/%{psol_ver}-x64.tar.gz
 Source52:             https://github.com/openresty/lua-nginx-module/archive/v%{lua_module_ver}.tar.gz
 Source53:             https://boringssl.googlesource.com/boringssl/+archive/%{boring_commit}.tar.gz
@@ -107,7 +107,7 @@ Patch3:               boringssl.patch
 Patch4:               %{name}-http2-spdy.patch
 Patch5:               boringssl-tls13-support.patch
 # Patch for forcing build with --with-debug
-Patch6:               ngx_pagespeed-build-force.patch
+Patch6:               incubator-pagespeed-ngx-build-force.patch
 
 BuildRoot:            %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -168,7 +168,7 @@ Links for nginx compatibility.
 mkdir boringssl
 
 tar xzvf %{SOURCE50}
-tar xzvf %{SOURCE51} -C ngx_pagespeed-%{pagespeed_ver}
+tar xzvf %{SOURCE51} -C incubator-pagespeed-ngx-%{pagespeed_ver}
 tar xzvf %{SOURCE52}
 tar xzvf %{SOURCE53} -C boringssl
 tar xzvf %{SOURCE54}
@@ -185,7 +185,7 @@ pushd boringssl
 %patch5 -p1
 popd
 
-pushd ngx_pagespeed-%{pagespeed_ver}
+pushd incubator-pagespeed-ngx-%{pagespeed_ver}
 %patch6 -p1
 popd
 
@@ -197,8 +197,8 @@ mv CHANGES.ru NGINX-CHANGES.ru
 mv LICENSE    NGINX-LICENSE
 mv README     NGINX-README
 
-mv ngx_pagespeed-%{pagespeed_ver}/LICENSE    ./PAGESPEED-LICENSE
-mv ngx_pagespeed-%{pagespeed_ver}/README.md  ./PAGESPEED-README.md
+mv incubator-pagespeed-ngx-%{pagespeed_ver}/LICENSE    ./PAGESPEED-LICENSE
+mv incubator-pagespeed-ngx-%{pagespeed_ver}/README.md  ./PAGESPEED-README.md
 
 mv lua-nginx-module-%{lua_module_ver}/README.markdown ./LUAMODULE-README.markdown
 
@@ -270,7 +270,7 @@ cp boringssl/build/crypto/libcrypto.a boringssl/build/ssl/libssl.a boringssl/.op
         --with-pcre-jit \
         --with-pcre=pcre-%{pcre_ver} \
         --with-openssl=boringssl \
-        --add-module=ngx_pagespeed-%{pagespeed_ver} \
+        --add-module=incubator-pagespeed-ngx-%{pagespeed_ver} \
         --add-module=lua-nginx-module-%{lua_module_ver} \
         --add-module=headers-more-nginx-module-%{mh_module_ver} \
         --with-cc-opt="-g -O2 -fPIE -fstack-protector-all -DTCP_FASTOPEN=23 -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -I ../boringssl/.openssl/include/" \
@@ -328,7 +328,7 @@ mv %{_builddir}/nginx-%{version}/objs/nginx \
         --with-pcre-jit \
         --with-pcre=pcre-%{pcre_ver} \
         --with-openssl=boringssl \
-        --add-module=ngx_pagespeed-%{pagespeed_ver} \
+        --add-module=incubator-pagespeed-ngx-%{pagespeed_ver} \
         --add-module=lua-nginx-module-%{lua_module_ver} \
         --add-module=headers-more-nginx-module-%{mh_module_ver} \
         --with-cc-opt="-g -O2 -fPIE -fstack-protector-all -DTCP_FASTOPEN=23 -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -I ../boringssl/.openssl/include/" \

From 77509744e0dd2bddfb437a0f2aeb3870da1e60e9 Mon Sep 17 00:00:00 2001
From: Anton Novojilov <andy@essentialkaos.com>
Date: Thu, 27 Sep 2018 14:30:00 +0300
Subject: [PATCH 2/3] Version 1.15.4

---
 SOURCES/boringssl.patch                   |  16 +-
 SOURCES/ngx_pagespeed-build-force.patch   |  12 --
 SOURCES/pagespeed-access.pswd             |   1 -
 SOURCES/pagespeed-enabled.conf            |  29 ---
 SOURCES/pagespeed.conf                    |  27 ---
 SOURCES/webkaos-dynamic-tls-records.patch |  47 +++--
 SOURCES/webkaos.conf                      |   9 -
 SOURCES/webkaos.init                      |  36 ----
 SOURCES/webkaos.patch                     | 238 ++++++++++------------
 SOURCES/webkaos.sysconfig                 |   1 -
 webkaos.spec                              |  72 ++-----
 11 files changed, 152 insertions(+), 336 deletions(-)
 delete mode 100644 SOURCES/ngx_pagespeed-build-force.patch
 delete mode 100644 SOURCES/pagespeed-access.pswd
 delete mode 100644 SOURCES/pagespeed-enabled.conf
 delete mode 100644 SOURCES/pagespeed.conf

diff --git a/SOURCES/boringssl.patch b/SOURCES/boringssl.patch
index 9b98581..8256fa1 100644
--- a/SOURCES/boringssl.patch
+++ b/SOURCES/boringssl.patch
@@ -1,17 +1,17 @@
-diff -ur nginx-1.11.6/src/event/ngx_event_openssl.c nginx-1.11.6-patched/src/event/ngx_event_openssl.c
---- nginx-1.11.6/src/event/ngx_event_openssl.c	2016-11-15 15:11:47.000000000 +0000
-+++ nginx-1.11.6-patched/src/event/ngx_event_openssl.c	2016-11-16 23:39:22.792289533 +0000
-@@ -2016,7 +2016,9 @@
- 
-             /* handshake failures */
-         if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC                        /*  103 */
+diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.c nginx-1.15.4-boring/src/event/ngx_event_openssl.c
+--- nginx-1.15.4-orig/src/event/ngx_event_openssl.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4-boring/src/event/ngx_event_openssl.c	2018-09-27 14:21:12.000000000 +0300
+@@ -2591,7 +2591,9 @@
+ #ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM
+             || n == SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM            /*  118 */
+ #endif
 +#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
              || n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG                  /*  129 */
 +#endif
              || n == SSL_R_DIGEST_CHECK_FAILED                        /*  149 */
              || n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST              /*  151 */
              || n == SSL_R_EXCESSIVE_MESSAGE_SIZE                     /*  152 */
-@@ -2024,7 +2026,9 @@
+@@ -2601,7 +2603,9 @@
  #ifdef SSL_R_NO_CIPHERS_PASSED
              || n == SSL_R_NO_CIPHERS_PASSED                          /*  182 */
  #endif
diff --git a/SOURCES/ngx_pagespeed-build-force.patch b/SOURCES/ngx_pagespeed-build-force.patch
deleted file mode 100644
index c45107d..0000000
--- a/SOURCES/ngx_pagespeed-build-force.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN ngx_pagespeed-1.12.34.3-stable-orig/config ngx_pagespeed-1.12.34.3-stable/config
---- ngx_pagespeed-1.12.34.3-stable-orig/config	2018-01-22 01:45:10.174446297 +0300
-+++ ngx_pagespeed-1.12.34.3-stable/config	2018-01-22 01:47:34.000000000 +0300
-@@ -76,7 +76,7 @@
- fi
- 
- if [ "$NGX_DEBUG" = "YES" ]; then
--  buildtype=Debug
-+  buildtype=Release
-   # If we're using a psol tarball that doesn't contain Debug/ (which is the case
-   # from 1.12 onward) then this will be overriden to buildtype=Release below.
- else
diff --git a/SOURCES/pagespeed-access.pswd b/SOURCES/pagespeed-access.pswd
deleted file mode 100644
index 3c718e1..0000000
--- a/SOURCES/pagespeed-access.pswd
+++ /dev/null
@@ -1 +0,0 @@
-pagespeed:$apr1$6L8zF4FF$ykDpiC1J.023q5MyPFaKG1
diff --git a/SOURCES/pagespeed-enabled.conf b/SOURCES/pagespeed-enabled.conf
deleted file mode 100644
index 899748f..0000000
--- a/SOURCES/pagespeed-enabled.conf
+++ /dev/null
@@ -1,29 +0,0 @@
-###############################################################################
-#                   PAGESPEED ACCESS RESTRICTIONS CONFIG                      #
-###############################################################################
-#                                                                             #
-# Include this file in server context                                         #
-#                                                                             #
-# User: pagespeed                                                             #
-# Password: IHave369MagicKeys (we STRONGLY recommend change this password to  #
-# your own)                                                                   #
-#                                                                             #
-###############################################################################
-
-pagespeed on;
-
-location ~ "\.pagespeed\.([a-z]\.)?[a-z]{2}\.[^.]{10}\.[^.]+" { add_header "" ""; }
-location ~ "^/pagespeed_static/" { }
-location ~ "^/ngx_pagespeed_beacon$" { }
-
-location /pagespeed {
-  satisfy any;
-
-  allow 127.0.0.1; 
-  deny all; 
-
-  auth_basic           "PageSpeed Private Area";
-  auth_basic_user_file xtra/pagespeed-access.pswd;
-}
-
-###############################################################################
diff --git a/SOURCES/pagespeed.conf b/SOURCES/pagespeed.conf
deleted file mode 100644
index ad9ba12..0000000
--- a/SOURCES/pagespeed.conf
+++ /dev/null
@@ -1,27 +0,0 @@
-###############################################################################
-#                              PAGESPEED CONFIG                               #
-###############################################################################
-#                                                                             #
-#       https://developers.google.com/speed/pagespeed/module/system           #
-#                                                                             #
-###############################################################################
-
-pagespeed  off;
-
-pagespeed  MessageBufferSize           4096;
-
-pagespeed  FileCachePath               "/var/cache/webkaos/pagespeed";
-
-pagespeed  CacheFlushFilename          "cache.flush";
-pagespeed  CacheFlushPollIntervalSec   30;
-
-pagespeed  StatisticsPath              /pagespeed/statistics;
-pagespeed  GlobalStatisticsPath        /pagespeed/global_statistics;
-pagespeed  MessagesPath                /pagespeed/message;
-pagespeed  ConsolePath                 /pagespeed/console;
-pagespeed  AdminPath                   /pagespeed/admin;
-pagespeed  GlobalAdminPath             /pagespeed/global_admin;
-
-pagespeed  XHeaderValue                "Yes";
-
-###############################################################################
diff --git a/SOURCES/webkaos-dynamic-tls-records.patch b/SOURCES/webkaos-dynamic-tls-records.patch
index e325200..bc05bda 100644
--- a/SOURCES/webkaos-dynamic-tls-records.patch
+++ b/SOURCES/webkaos-dynamic-tls-records.patch
@@ -1,7 +1,7 @@
-diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event/ngx_event_openssl.c
---- nginx-1.15.3-orig/src/event/ngx_event_openssl.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/event/ngx_event_openssl.c	2018-09-02 01:18:43.000000000 +0300
-@@ -1239,6 +1239,7 @@
+diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.c nginx-1.15.4-dyntls/src/event/ngx_event_openssl.c
+--- nginx-1.15.4-orig/src/event/ngx_event_openssl.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4-dyntls/src/event/ngx_event_openssl.c	2018-09-27 14:01:16.000000000 +0300
+@@ -1267,6 +1267,7 @@
  
      sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
      sc->buffer_size = ssl->buffer_size;
@@ -9,7 +9,7 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event
  
      sc->session_ctx = ssl->ctx;
  
-@@ -1806,6 +1807,41 @@
+@@ -2115,6 +2116,41 @@
  
      for ( ;; ) {
  
@@ -51,7 +51,7 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event
          while (in && buf->last < buf->end && send < limit) {
              if (in->buf->last_buf || in->buf->flush) {
                  flush = 1;
-@@ -1907,6 +1943,9 @@
+@@ -2222,6 +2258,9 @@
  
      if (n > 0) {
  
@@ -61,10 +61,10 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event
          if (c->ssl->saved_read_handler) {
  
              c->read->handler = c->ssl->saved_read_handler;
-diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event/ngx_event_openssl.h
---- nginx-1.15.3-orig/src/event/ngx_event_openssl.h	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/event/ngx_event_openssl.h	2018-09-02 01:20:39.000000000 +0300
-@@ -58,6 +58,13 @@
+diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.h nginx-1.15.4-dyntls/src/event/ngx_event_openssl.h
+--- nginx-1.15.4-orig/src/event/ngx_event_openssl.h	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4-dyntls/src/event/ngx_event_openssl.h	2018-09-27 14:05:40.000000000 +0300
+@@ -58,6 +58,12 @@
  #define ngx_ssl_session_t       SSL_SESSION
  #define ngx_ssl_conn_t          SSL
  
@@ -74,11 +74,10 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event
 +    size_t                      size_lo;
 +    size_t                      size_hi;
 +} ngx_ssl_dyn_rec_t;
-+
  
  #if (OPENSSL_VERSION_NUMBER < 0x10002000L)
  #define SSL_is_server(s)        (s)->server
-@@ -68,6 +75,7 @@
+@@ -68,6 +74,7 @@
      SSL_CTX                    *ctx;
      ngx_log_t                  *log;
      size_t                      buffer_size;
@@ -86,10 +85,10 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event
  };
  
  
-@@ -93,6 +101,10 @@
-     unsigned                    no_wait_shutdown:1;
-     unsigned                    no_send_shutdown:1;
-     unsigned                    handshake_buffer_set:1;
+@@ -98,6 +105,10 @@
+     unsigned                    try_early_data:1;
+     unsigned                    in_early:1;
+     unsigned                    early_preread:1;
 +
 +    ngx_ssl_dyn_rec_t           dyn_rec;
 +    ngx_msec_t                  dyn_rec_last_write;
@@ -97,7 +96,7 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event
  };
  
  
-@@ -102,7 +114,7 @@
+@@ -107,7 +118,7 @@
  #define NGX_SSL_DFLT_BUILTIN_SCACHE  -5
  
  
@@ -106,9 +105,9 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event
  
  typedef struct ngx_ssl_sess_id_s  ngx_ssl_sess_id_t;
  
-diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.15.3/src/http/modules/ngx_http_ssl_module.c
---- nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/http/modules/ngx_http_ssl_module.c	2018-09-02 01:24:26.000000000 +0300
+diff -urN nginx-1.15.4-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.15.4-dyntls/src/http/modules/ngx_http_ssl_module.c
+--- nginx-1.15.4-orig/src/http/modules/ngx_http_ssl_module.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4-dyntls/src/http/modules/ngx_http_ssl_module.c	2018-09-27 14:08:12.000000000 +0300
 @@ -246,6 +246,41 @@
        offsetof(ngx_http_ssl_srv_conf_t, early_data),
        NULL },
@@ -208,14 +207,14 @@ diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.15.3/
 +
 +    } else {
 +        conf->ssl.dyn_rec.timeout = 0;
-+    }
++    }   
 +
      return NGX_CONF_OK;
  }
  
-diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.h nginx-1.15.3/src/http/modules/ngx_http_ssl_module.h
---- nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.h	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/http/modules/ngx_http_ssl_module.h	2018-09-02 01:25:11.000000000 +0300
+diff -urN nginx-1.15.4-orig/src/http/modules/ngx_http_ssl_module.h nginx-1.15.4-dyntls/src/http/modules/ngx_http_ssl_module.h
+--- nginx-1.15.4-orig/src/http/modules/ngx_http_ssl_module.h	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4-dyntls/src/http/modules/ngx_http_ssl_module.h	2018-09-27 14:09:20.000000000 +0300
 @@ -58,6 +58,12 @@
  
      u_char                         *file;
diff --git a/SOURCES/webkaos.conf b/SOURCES/webkaos.conf
index 1282364..261f51a 100644
--- a/SOURCES/webkaos.conf
+++ b/SOURCES/webkaos.conf
@@ -6,9 +6,6 @@
 # most cases, but not for all. Check all configuration values before webkaos   #
 # usage.                                                                       #
 #                                                                              #
-# More information about pagespeed configuration you may find on this page:    #
-# https://developers.google.com/speed/pagespeed/                               #
-#                                                                              #
 ################################################################################
 
 user  webkaos;
@@ -134,12 +131,6 @@ http {
   # Header with unique request identifier.
   add_header X-Request-ID "$request_id";
 
-  ##############################################################################
-  
-  # Main configuration for pagespeed. Pagespeed globally disabled, include
-  # xtra/pagespeed-enabled.conf in your server block to enable pagespeed.
-  include xtra/pagespeed.conf;
-
   ##############################################################################
 
   server {
diff --git a/SOURCES/webkaos.init b/SOURCES/webkaos.init
index 7f8ab90..72054a2 100644
--- a/SOURCES/webkaos.init
+++ b/SOURCES/webkaos.init
@@ -39,7 +39,6 @@ binary=${BINARY:-/usr/sbin/webkaos}
 conf_file=${CONF_FILE:-/etc/webkaos/webkaos.conf}
 cache_dir=${CACHE_DIR:-/var/cache/webkaos}
 log_dir=${LOG_DIR:-/var/log/webkaos}
-pagespeed_cache=${PAGESPEED_CACHE:-/var/cache/webkaos/pagespeed}
 ssl_dir=${SSL_DIR:-/etc/webkaos/ssl}
 dh_param=${DH_PARAM:-/etc/webkaos/ssl/dhparam.pem}
 
@@ -70,8 +69,6 @@ kv.addCommandAlias "check"   "configtest"
 kv.addCommandAlias "restart" "condrestart"
 kv.addCommandAlias "config"  "conf"
 
-[[ $pagespeed_cache ]] && kv.addCommand "clean" "Clean pagespeed cache" "clean"
-
 kv.addHandler "start"   "startServiceHandler"
 kv.addHandler "start"   "preStartServiceHandler" "pre"
 kv.addHandler "stop"    "stopServiceHandler"
@@ -93,7 +90,6 @@ prepare() {
 
   if kv.isRoot ; then
     [[ ! -w $cache_dir ]] && has_errors=true && kv.error "<CACHE_DIR> must be writable directory"
-    [[ ! -w $pagespeed_cache ]] && has_errors=true && kv.error "<PAGESPEED_CACHE> must be writable directory"
   fi
 
   [[ $has_errors ]] && kv.exit $ACTION_ERROR
@@ -233,20 +229,6 @@ reload() {
   return $status
 }
 
-clean() {
-  kv.showProcessMessage "Cleaning pagespeed cache"
-
-  cleanPagespeedCache
-
-  local status=$?
-
-  kv.showStatusMessage "$status"
-
-  [[ $status -eq $ACTION_OK ]] && kv.log "pagespeed cache cleaned by ${kv[real_user]}."
-
-  return $status
-}
-
 ###############################################################################
 
 preStartServiceHandler() {
@@ -348,20 +330,6 @@ testServiceConfig() {
   [[ $status -eq $ACTION_OK ]] && return $ACTION_OK || return $ACTION_ERROR
 }
 
-cleanPagespeedCache() {
-  if [[ -d $pagespeed_cache ]] ; then
-    if kv.statusIs "$STATUS_WORKS" ; then
-      touch $pagespeed_cache/cache.flush
-    else
-      rm -rf $pagespeed_cache/* &> /dev/null
-    fi
-
-    [[ $? -eq $ACTION_OK ]] && return $ACTION_OK || $ACTION_ERROR
-  fi
-
-  return $ACTION_ERROR
-}
-
 updateOwner() {
   local user=$(getUserFromConfig)
 
@@ -371,10 +339,6 @@ updateOwner() {
     chown -R $user: $cache_dir -R
   fi
 
-  if [[ $pagespeed_cache && -d $pagespeed_cache ]] ; then
-    chown -R $user: $pagespeed_cache -R
-  fi
-
   if [[ $log_dir && -d $log_dir ]] ; then
     chown -R $user: $log_dir -R
   fi
diff --git a/SOURCES/webkaos.patch b/SOURCES/webkaos.patch
index 6ea5cf1..85b7258 100644
--- a/SOURCES/webkaos.patch
+++ b/SOURCES/webkaos.patch
@@ -1,6 +1,6 @@
-diff -urN nginx-1.15.3-orig/auto/lib/openssl/make nginx-1.15.3/auto/lib/openssl/make
---- nginx-1.15.3-orig/auto/lib/openssl/make	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/auto/lib/openssl/make	2018-09-02 00:48:50.264903067 +0300
+diff -urN nginx-1.15.4-orig/auto/lib/openssl/make nginx-1.15.4/auto/lib/openssl/make
+--- nginx-1.15.4-orig/auto/lib/openssl/make	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/auto/lib/openssl/make	2018-09-27 13:23:21.120335717 +0300
 @@ -45,18 +45,18 @@
              /*) ngx_prefix="$OPENSSL/.openssl" ;;
              *)  ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.15.3-orig/auto/lib/openssl/make nginx-1.15.3/auto/lib/openssl/
      ;;
  
  esac
-diff -urN nginx-1.15.3-orig/src/core/nginx.c nginx-1.15.3/src/core/nginx.c
---- nginx-1.15.3-orig/src/core/nginx.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/core/nginx.c	2018-09-02 00:48:50.270903019 +0300
+diff -urN nginx-1.15.4-orig/src/core/nginx.c nginx-1.15.4/src/core/nginx.c
+--- nginx-1.15.4-orig/src/core/nginx.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/core/nginx.c	2018-09-27 13:23:21.126335672 +0300
 @@ -389,13 +389,13 @@
  static void
  ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.15.3-orig/src/core/nginx.c nginx-1.15.3/src/core/nginx.c
              "Options:" NGX_LINEFEED
              "  -?,-h         : this help" NGX_LINEFEED
              "  -v            : show version and exit" NGX_LINEFEED
-diff -urN nginx-1.15.3-orig/src/core/nginx.h nginx-1.15.3/src/core/nginx.h
---- nginx-1.15.3-orig/src/core/nginx.h	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/core/nginx.h	2018-09-02 00:50:26.000000000 +0300
+diff -urN nginx-1.15.4-orig/src/core/nginx.h nginx-1.15.4/src/core/nginx.h
+--- nginx-1.15.4-orig/src/core/nginx.h	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/core/nginx.h	2018-09-27 13:27:25.000000000 +0300
 @@ -11,7 +11,7 @@
  
- #define nginx_version      1015003
- #define NGINX_VERSION      "1.15.3"
+ #define nginx_version      1015004
+ #define NGINX_VERSION      "1.15.4"
 -#define NGINX_VER          "nginx/" NGINX_VERSION
 +#define NGINX_VER          "webkaos/" NGINX_VERSION
  
@@ -66,9 +66,9 @@ diff -urN nginx-1.15.3-orig/src/core/nginx.h nginx-1.15.3/src/core/nginx.h
  #define NGX_OLDPID_EXT     ".oldbin"
  
  
-diff -urN nginx-1.15.3-orig/src/core/ngx_log.c nginx-1.15.3/src/core/ngx_log.c
---- nginx-1.15.3-orig/src/core/ngx_log.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/core/ngx_log.c	2018-09-02 00:48:50.278902954 +0300
+diff -urN nginx-1.15.4-orig/src/core/ngx_log.c nginx-1.15.4/src/core/ngx_log.c
+--- nginx-1.15.4-orig/src/core/ngx_log.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/core/ngx_log.c	2018-09-27 13:23:21.134335611 +0300
 @@ -202,9 +202,9 @@
          return;
      }
@@ -99,9 +99,9 @@ diff -urN nginx-1.15.3-orig/src/core/ngx_log.c nginx-1.15.3/src/core/ngx_log.c
          return NGX_CONF_ERROR;
  #endif
  
-diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.3/src/http/modules/ngx_http_autoindex_module.c
---- nginx-1.15.3-orig/src/http/modules/ngx_http_autoindex_module.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/http/modules/ngx_http_autoindex_module.c	2018-09-02 00:48:50.283902913 +0300
+diff -urN nginx-1.15.4-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.4/src/http/modules/ngx_http_autoindex_module.c
+--- nginx-1.15.4-orig/src/http/modules/ngx_http_autoindex_module.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/http/modules/ngx_http_autoindex_module.c	2018-09-27 13:24:23.000000000 +0300
 @@ -451,9 +451,11 @@
      ;
  
@@ -110,7 +110,7 @@ diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
 +        "</title>" CRLF
 +        "<style>html,body{background-color:#FFF;color:#666;font-family:'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Sawasdee,Helvetica,Trebuchet,sans-serif;margin:12px}pre{font:300 .9em/1.4em 'Consolas','Droid Sans Mono','Menlo','Courier New',Courier,monospace}hr{border:none;background-color:#CCC;height:1px}h1{font-weight:100;color:#888;font-size:2.2em}a{color:#333}a:hover{color:#666}#dir{font-weight:bold}h1 span{color:#444}</style>" CRLF
 +        "</head>" CRLF
-         "<body bgcolor=\"white\">" CRLF
+         "<body>" CRLF
 -        "<h1>Index of "
 +        "<h1>Index of <span>"
      ;
@@ -177,9 +177,9 @@ diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
                                tm.ngx_tm_mday,
                                months[tm.ngx_tm_mon - 1],
                                tm.ngx_tm_year,
-diff -urN nginx-1.15.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.3/src/http/ngx_http_header_filter_module.c
---- nginx-1.15.3-orig/src/http/ngx_http_header_filter_module.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/http/ngx_http_header_filter_module.c	2018-09-02 00:48:50.288902873 +0300
+diff -urN nginx-1.15.4-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.4/src/http/ngx_http_header_filter_module.c
+--- nginx-1.15.4-orig/src/http/ngx_http_header_filter_module.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/http/ngx_http_header_filter_module.c	2018-09-27 13:23:21.143335542 +0300
 @@ -46,7 +46,7 @@
  };
  
@@ -230,9 +230,9 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
  
      ngx_string("500 Internal Server Error"),
-diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/src/http/ngx_http_special_response.c
---- nginx-1.15.3-orig/src/http/ngx_http_special_response.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/http/ngx_http_special_response.c	2018-09-02 00:48:50.293902833 +0300
+diff -urN nginx-1.15.4-orig/src/http/ngx_http_special_response.c nginx-1.15.4/src/http/ngx_http_special_response.c
+--- nginx-1.15.4-orig/src/http/ngx_http_special_response.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/http/ngx_http_special_response.c	2018-08-28 18:36:00.000000000 +0300
 @@ -19,21 +19,21 @@
  
  
@@ -263,11 +263,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_301_page[] =
  "<html>" CRLF
 -"<head><title>301 Moved Permanently</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>301 Moved Permanently</h1></center>" CRLF
 +"<head><title>301 Moved Permanently</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>301 Moved Permanently</h1></center>" CRLF
 +"<div><h1>301 Moved Permanently</h1>" CRLF
  ;
  
@@ -275,11 +274,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_302_page[] =
  "<html>" CRLF
 -"<head><title>302 Found</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>302 Found</h1></center>" CRLF
 +"<head><title>302 Found</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>302 Found</h1></center>" CRLF
 +"<div><h1>302 Found</h1>" CRLF
  ;
  
@@ -287,11 +285,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_303_page[] =
  "<html>" CRLF
 -"<head><title>303 See Other</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>303 See Other</h1></center>" CRLF
 +"<head><title>303 See Other</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>303 See Other</h1></center>" CRLF
 +"<div><h1>303 See Other</h1>" CRLF
  ;
  
@@ -299,11 +296,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_307_page[] =
  "<html>" CRLF
 -"<head><title>307 Temporary Redirect</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>307 Temporary Redirect</h1></center>" CRLF
 +"<head><title>307 Temporary Redirect</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>307 Temporary Redirect</h1></center>" CRLF
 +"<div><h1>307 Temporary Redirect</h1>" CRLF
  ;
  
@@ -311,11 +307,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_308_page[] =
  "<html>" CRLF
 -"<head><title>308 Permanent Redirect</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>308 Permanent Redirect</h1></center>" CRLF
 +"<head><title>308 Permanent Redirect</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>308 Permanent Redirect</h1></center>" CRLF
 +"<div><h1>308 Permanent Redirect</h1>" CRLF
  ;
  
@@ -323,11 +318,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_400_page[] =
  "<html>" CRLF
 -"<head><title>400 Bad Request</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>400 Bad Request</h1></center>" CRLF
 +"<head><title>400 Bad Request</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>400 Bad Request</h1></center>" CRLF
 +"<div><h1>400 Bad Request</h1>" CRLF
  ;
  
@@ -335,11 +329,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_401_page[] =
  "<html>" CRLF
 -"<head><title>401 Authorization Required</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>401 Authorization Required</h1></center>" CRLF
 +"<head><title>401 Authorization Required</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>401 Authorization Required</h1></center>" CRLF
 +"<div><h1>401 Authorization Required</h1>" CRLF
  ;
  
@@ -347,11 +340,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_402_page[] =
  "<html>" CRLF
 -"<head><title>402 Payment Required</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>402 Payment Required</h1></center>" CRLF
 +"<head><title>402 Payment Required</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>402 Payment Required</h1></center>" CRLF
 +"<div><h1>402 Payment Required</h1>" CRLF
  ;
  
@@ -359,11 +351,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_403_page[] =
  "<html>" CRLF
 -"<head><title>403 Forbidden</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>403 Forbidden</h1></center>" CRLF
 +"<head><title>403 Forbidden</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>403 Forbidden</h1></center>" CRLF
 +"<div><h1>403 Forbidden</h1>" CRLF
  ;
  
@@ -371,11 +362,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_404_page[] =
  "<html>" CRLF
 -"<head><title>404 Not Found</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>404 Not Found</h1></center>" CRLF
 +"<head><title>404 Not Found</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>404 Not Found</h1></center>" CRLF
 +"<div><h1>404 Not Found</h1>" CRLF
  ;
  
@@ -383,11 +373,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_405_page[] =
  "<html>" CRLF
 -"<head><title>405 Not Allowed</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>405 Not Allowed</h1></center>" CRLF
 +"<head><title>405 Not Allowed</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>405 Not Allowed</h1></center>" CRLF
 +"<div><h1>405 Not Allowed</h1>" CRLF
  ;
  
@@ -395,11 +384,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_406_page[] =
  "<html>" CRLF
 -"<head><title>406 Not Acceptable</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>406 Not Acceptable</h1></center>" CRLF
 +"<head><title>406 Not Acceptable</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>406 Not Acceptable</h1></center>" CRLF
 +"<div><h1>406 Not Acceptable</h1>" CRLF
  ;
  
@@ -407,11 +395,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_408_page[] =
  "<html>" CRLF
 -"<head><title>408 Request Time-out</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>408 Request Time-out</h1></center>" CRLF
 +"<head><title>408 Request Time-out</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>408 Request Time-out</h1></center>" CRLF
 +"<div><h1>408 Request Time-out</h1>" CRLF
  ;
  
@@ -419,11 +406,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_409_page[] =
  "<html>" CRLF
 -"<head><title>409 Conflict</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>409 Conflict</h1></center>" CRLF
 +"<head><title>409 Conflict</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>409 Conflict</h1></center>" CRLF
 +"<div><h1>409 Conflict</h1>" CRLF
  ;
  
@@ -431,11 +417,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_410_page[] =
  "<html>" CRLF
 -"<head><title>410 Gone</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>410 Gone</h1></center>" CRLF
 +"<head><title>410 Gone</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>410 Gone</h1></center>" CRLF
 +"<div><h1>410 Gone</h1>" CRLF
  ;
  
@@ -443,11 +428,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_411_page[] =
  "<html>" CRLF
 -"<head><title>411 Length Required</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>411 Length Required</h1></center>" CRLF
 +"<head><title>411 Length Required</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>411 Length Required</h1></center>" CRLF
 +"<div><h1>411 Length Required</h1>" CRLF
  ;
  
@@ -455,11 +439,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_412_page[] =
  "<html>" CRLF
 -"<head><title>412 Precondition Failed</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>412 Precondition Failed</h1></center>" CRLF
 +"<head><title>412 Precondition Failed</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>412 Precondition Failed</h1></center>" CRLF
 +"<div><h1>412 Precondition Failed</h1>" CRLF
  ;
  
@@ -467,11 +450,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_413_page[] =
  "<html>" CRLF
 -"<head><title>413 Request Entity Too Large</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>413 Request Entity Too Large</h1></center>" CRLF
 +"<head><title>413 Request Entity Too Large</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>413 Request Entity Too Large</h1></center>" CRLF
 +"<div><h1>413 Request Entity Too Large</h1>" CRLF
  ;
  
@@ -479,11 +461,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_414_page[] =
  "<html>" CRLF
 -"<head><title>414 Request-URI Too Large</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>414 Request-URI Too Large</h1></center>" CRLF
 +"<head><title>414 Request-URI Too Large</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>414 Request-URI Too Large</h1></center>" CRLF
 +"<div><h1>414 Request-URI Too Large</h1>" CRLF
  ;
  
@@ -491,11 +472,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_415_page[] =
  "<html>" CRLF
 -"<head><title>415 Unsupported Media Type</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>415 Unsupported Media Type</h1></center>" CRLF
 +"<head><title>415 Unsupported Media Type</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>415 Unsupported Media Type</h1></center>" CRLF
 +"<div><h1>415 Unsupported Media Type</h1>" CRLF
  ;
  
@@ -503,11 +483,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_416_page[] =
  "<html>" CRLF
 -"<head><title>416 Requested Range Not Satisfiable</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>416 Requested Range Not Satisfiable</h1></center>" CRLF
 +"<head><title>416 Requested Range Not Satisfiable</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>416 Requested Range Not Satisfiable</h1></center>" CRLF
 +"<div><h1>416 Requested Range Not Satisfiable</h1>" CRLF
 +;
 +
@@ -524,11 +503,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_421_page[] =
  "<html>" CRLF
 -"<head><title>421 Misdirected Request</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>421 Misdirected Request</h1></center>" CRLF
 +"<head><title>421 Misdirected Request</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>421 Misdirected Request</h1></center>" CRLF
 +"<div><h1>421 Misdirected Request</h1>" CRLF
  ;
  
@@ -536,8 +514,6 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_429_page[] =
  "<html>" CRLF
 -"<head><title>429 Too Many Requests</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>429 Too Many Requests</h1></center>" CRLF
 +"<head><title>429 Too Many Requests</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
 +"<body>" CRLF
@@ -549,7 +525,8 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
 +"<html>" CRLF
 +"<head><title>451 Unavailable For Legal Reasons</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>429 Too Many Requests</h1></center>" CRLF
 +"<div><h1>451 Unavailable For Legal Reasons</h1>" CRLF
  ;
  
@@ -558,12 +535,11 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  "<html>" CRLF
 -"<head><title>400 Request Header Or Cookie Too Large</title></head>"
 -CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>400 Bad Request</h1></center>" CRLF
--"<center>Request Header Or Cookie Too Large</center>" CRLF
 +"<head><title>400 Bad Request</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>400 Bad Request</h1></center>" CRLF
+-"<center>Request Header Or Cookie Too Large</center>" CRLF
 +"<div><h1>400 Bad Request</h1>" CRLF
 +"<h3>Request header or cookie too large</h3>" CRLF
  ;
@@ -573,12 +549,11 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  "<html>" CRLF
 -"<head><title>400 The SSL certificate error</title></head>"
 -CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>400 Bad Request</h1></center>" CRLF
--"<center>The SSL certificate error</center>" CRLF
 +"<head><title>400 Bad Request</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>400 Bad Request</h1></center>" CRLF
+-"<center>The SSL certificate error</center>" CRLF
 +"<div><h1>400 Bad Request</h1>" CRLF
 +"<h3>The SSL certificate error</h3>" CRLF
  ;
@@ -588,12 +563,11 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  "<html>" CRLF
 -"<head><title>400 No required SSL certificate was sent</title></head>"
 -CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>400 Bad Request</h1></center>" CRLF
--"<center>No required SSL certificate was sent</center>" CRLF
 +"<head><title>400 Bad Request</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>400 Bad Request</h1></center>" CRLF
+-"<center>No required SSL certificate was sent</center>" CRLF
 +"<div><h1>400 Bad Request</h1>" CRLF
 +"<h3>No required SSL certificate was sent</h3>" CRLF
  ;
@@ -603,12 +577,11 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  "<html>" CRLF
 -"<head><title>400 The plain HTTP request was sent to HTTPS port</title></head>"
 -CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>400 Bad Request</h1></center>" CRLF
--"<center>The plain HTTP request was sent to HTTPS port</center>" CRLF
 +"<head><title>400 Bad Request</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>400 Bad Request</h1></center>" CRLF
+-"<center>The plain HTTP request was sent to HTTPS port</center>" CRLF
 +"<div><h1>400 Bad Request</h1>" CRLF
 +"<h3>The plain HTTP request was sent to HTTPS port</h3>" CRLF
  ;
@@ -617,11 +590,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_500_page[] =
  "<html>" CRLF
 -"<head><title>500 Internal Server Error</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>500 Internal Server Error</h1></center>" CRLF
 +"<head><title>500 Internal Server Error</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>500 Internal Server Error</h1></center>" CRLF
 +"<div><h1>500 Internal Server Error</h1>" CRLF
  ;
  
@@ -629,11 +601,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_501_page[] =
  "<html>" CRLF
 -"<head><title>501 Not Implemented</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>501 Not Implemented</h1></center>" CRLF
 +"<head><title>501 Not Implemented</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>501 Not Implemented</h1></center>" CRLF
 +"<div><h1>501 Not Implemented</h1>" CRLF
  ;
  
@@ -641,11 +612,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_502_page[] =
  "<html>" CRLF
 -"<head><title>502 Bad Gateway</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>502 Bad Gateway</h1></center>" CRLF
 +"<head><title>502 Bad Gateway</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>502 Bad Gateway</h1></center>" CRLF
 +"<div><h1>502 Bad Gateway</h1>" CRLF
  ;
  
@@ -653,11 +623,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_503_page[] =
  "<html>" CRLF
 -"<head><title>503 Service Temporarily Unavailable</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>503 Service Temporarily Unavailable</h1></center>" CRLF
 +"<head><title>503 Service Temporarily Unavailable</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>503 Service Temporarily Unavailable</h1></center>" CRLF
 +"<div><h1>503 Service Temporarily Unavailable</h1>" CRLF
  ;
  
@@ -665,11 +634,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_504_page[] =
  "<html>" CRLF
 -"<head><title>504 Gateway Time-out</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>504 Gateway Time-out</h1></center>" CRLF
 +"<head><title>504 Gateway Time-out</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>504 Gateway Time-out</h1></center>" CRLF
 +"<div><h1>504 Gateway Time-out</h1>" CRLF
  ;
  
@@ -677,11 +645,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_505_page[] =
  "<html>" CRLF
 -"<head><title>505 HTTP Version Not Supported</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>505 HTTP Version Not Supported</h1></center>" CRLF
 +"<head><title>505 HTTP Version Not Supported</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>505 HTTP Version Not Supported</h1></center>" CRLF
 +"<div><h1>505 HTTP Version Not Supported</h1>" CRLF
  ;
  
@@ -689,11 +656,10 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  static char ngx_http_error_507_page[] =
  "<html>" CRLF
 -"<head><title>507 Insufficient Storage</title></head>" CRLF
--"<body bgcolor=\"white\">" CRLF
--"<center><h1>507 Insufficient Storage</h1></center>" CRLF
 +"<head><title>507 Insufficient Storage</title>" CRLF
 +"<style>html,body{background-color:#EEE;color:#AAA;font:100 1em/1em 'Segoe UI Light','Open Sans Light','Open Sans','Segoe UI','Helvetica Neue',Helvetica,Trebuchet,sans-serif;height:100%;margin:0;text-align:center}body:after{content:'';display:inline-block;height:100%;vertical-align:middle}div{display:inline-block}h1,h3{color:#333;font-weight:100}</style></head>" CRLF
-+"<body>" CRLF
+ "<body>" CRLF
+-"<center><h1>507 Insufficient Storage</h1></center>" CRLF
 +"<div><h1>507 Insufficient Storage</h1>" CRLF
  ;
  
@@ -739,9 +705,9 @@ diff -urN nginx-1.15.3-orig/src/http/ngx_http_special_response.c nginx-1.15.3/sr
  #define NGX_HTTP_OFF_5XX   (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
  
      ngx_string(ngx_http_error_494_page), /* 494, request header too large */
-diff -urN nginx-1.15.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.3/src/http/v2/ngx_http_v2_filter_module.c
---- nginx-1.15.3-orig/src/http/v2/ngx_http_v2_filter_module.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/http/v2/ngx_http_v2_filter_module.c	2018-09-02 00:48:50.299902784 +0300
+diff -urN nginx-1.15.4-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.4/src/http/v2/ngx_http_v2_filter_module.c
+--- nginx-1.15.4-orig/src/http/v2/ngx_http_v2_filter_module.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/http/v2/ngx_http_v2_filter_module.c	2018-09-27 13:23:21.152335473 +0300
 @@ -148,7 +148,7 @@
      ngx_http_core_srv_conf_t  *cscf;
      u_char                     addr[NGX_SOCKADDR_STRLEN];
@@ -760,9 +726,9 @@ diff -urN nginx-1.15.3-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.3
          }
  
          *pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
-diff -urN nginx-1.15.3-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.3/src/os/unix/ngx_setproctitle.c
---- nginx-1.15.3-orig/src/os/unix/ngx_setproctitle.c	2018-08-28 18:36:00.000000000 +0300
-+++ nginx-1.15.3/src/os/unix/ngx_setproctitle.c	2018-09-02 00:48:50.304902744 +0300
+diff -urN nginx-1.15.4-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.4/src/os/unix/ngx_setproctitle.c
+--- nginx-1.15.4-orig/src/os/unix/ngx_setproctitle.c	2018-09-25 18:11:39.000000000 +0300
++++ nginx-1.15.4/src/os/unix/ngx_setproctitle.c	2018-09-27 13:23:21.157335435 +0300
 @@ -89,7 +89,7 @@
  
      ngx_os_argv[1] = NULL;
diff --git a/SOURCES/webkaos.sysconfig b/SOURCES/webkaos.sysconfig
index 30bd5eb..6dc336e 100644
--- a/SOURCES/webkaos.sysconfig
+++ b/SOURCES/webkaos.sysconfig
@@ -4,4 +4,3 @@ BINARY=""
 CONF_FILE=""
 CACHE_DIR=""
 LOG_DIR=""
-PAGESPEED_CACHE=""
diff --git a/webkaos.spec b/webkaos.spec
index 8d463f8..2068e51 100644
--- a/webkaos.spec
+++ b/webkaos.spec
@@ -39,13 +39,6 @@
 
 ################################################################################
 
-# Fixed bug with ngx_pagespeed comilation on i386
-%ifarch %ix86
-  %define optflags -O2 -g -march=i686
-%endif
-
-################################################################################
-
 %define service_user         %{name}
 %define service_group        %{name}
 %define service_name         %{name}
@@ -58,14 +51,11 @@
 %define pcre_ver             8.42
 %define zlib_ver             1.2.11
 
-%define pagespeed_ver        1.12.34.3-stable
-%define pagespeed_cache_path %{service_home}/pagespeed
-
 ################################################################################
 
 Summary:              Superb high performance web server
 Name:                 webkaos
-Version:              1.15.3
+Version:              1.15.4
 Release:              0%{?dist}
 License:              2-clause BSD-like license
 Group:                System Environment/Daemons
@@ -79,23 +69,18 @@ Source4:              %{name}.conf
 Source5:              %{name}.service
 Source6:              %{name}-debug.service
 
-Source20:             pagespeed.conf
-Source21:             pagespeed-enabled.conf
-Source22:             pagespeed-access.pswd
-Source23:             ssl.conf
-Source24:             ssl-wildcard.conf
-Source25:             common.conf
-Source26:             bots.conf
+Source20:             ssl.conf
+Source21:             ssl-wildcard.conf
+Source22:             common.conf
+Source23:             bots.conf
 
 Source30:             %{name}-index.html
 
-Source50:             https://github.com/pagespeed/ngx_pagespeed/archive/v%{pagespeed_ver}.tar.gz
-Source51:             https://dl.google.com/dl/page-speed/psol/%{psol_ver}-x64.tar.gz
-Source52:             https://github.com/openresty/lua-nginx-module/archive/v%{lua_module_ver}.tar.gz
-Source53:             https://boringssl.googlesource.com/boringssl/+archive/%{boring_commit}.tar.gz
-Source54:             https://github.com/openresty/headers-more-nginx-module/archive/v%{mh_module_ver}.tar.gz
-Source55:             https://ftp.pcre.org/pub/pcre/pcre-%{pcre_ver}.tar.gz
-Source56:             https://zlib.net/zlib-%{zlib_ver}.tar.gz
+Source50:             https://github.com/openresty/lua-nginx-module/archive/v%{lua_module_ver}.tar.gz
+Source51:             https://boringssl.googlesource.com/boringssl/+archive/%{boring_commit}.tar.gz
+Source52:             https://github.com/openresty/headers-more-nginx-module/archive/v%{mh_module_ver}.tar.gz
+Source53:             https://ftp.pcre.org/pub/pcre/pcre-%{pcre_ver}.tar.gz
+Source54:             https://zlib.net/zlib-%{zlib_ver}.tar.gz
 
 Patch0:               %{name}.patch
 Patch1:               mime.patch
@@ -106,8 +91,6 @@ Patch3:               boringssl.patch
 # https://github.com/cloudflare/sslconfig/blob/master/patches/nginx__1.13.0_http2_spdy.patch
 Patch4:               %{name}-http2-spdy.patch
 Patch5:               boringssl-tls13-support.patch
-# Patch for forcing build with --with-debug
-Patch6:               ngx_pagespeed-build-force.patch
 
 BuildRoot:            %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -168,12 +151,10 @@ Links for nginx compatibility.
 mkdir boringssl
 
 tar xzvf %{SOURCE50}
-tar xzvf %{SOURCE51} -C ngx_pagespeed-%{pagespeed_ver}
+tar xzvf %{SOURCE51} -C boringssl
 tar xzvf %{SOURCE52}
-tar xzvf %{SOURCE53} -C boringssl
+tar xzvf %{SOURCE53}
 tar xzvf %{SOURCE54}
-tar xzvf %{SOURCE55}
-tar xzvf %{SOURCE56}
 
 %patch0 -p1
 %patch1 -p1
@@ -185,10 +166,6 @@ pushd boringssl
 %patch5 -p1
 popd
 
-pushd ngx_pagespeed-%{pagespeed_ver}
-%patch6 -p1
-popd
-
 %build
 
 # Renaming and moving docs
@@ -197,9 +174,6 @@ mv CHANGES.ru NGINX-CHANGES.ru
 mv LICENSE    NGINX-LICENSE
 mv README     NGINX-README
 
-mv ngx_pagespeed-%{pagespeed_ver}/LICENSE    ./PAGESPEED-LICENSE
-mv ngx_pagespeed-%{pagespeed_ver}/README.md  ./PAGESPEED-README.md
-
 mv lua-nginx-module-%{lua_module_ver}/README.markdown ./LUAMODULE-README.markdown
 
 mv headers-more-nginx-module-%{mh_module_ver}/README.markdown ./HEADERSMORE-README.markdown
@@ -270,7 +244,6 @@ cp boringssl/build/crypto/libcrypto.a boringssl/build/ssl/libssl.a boringssl/.op
         --with-pcre-jit \
         --with-pcre=pcre-%{pcre_ver} \
         --with-openssl=boringssl \
-        --add-module=ngx_pagespeed-%{pagespeed_ver} \
         --add-module=lua-nginx-module-%{lua_module_ver} \
         --add-module=headers-more-nginx-module-%{mh_module_ver} \
         --with-cc-opt="-g -O2 -fPIE -fstack-protector-all -DTCP_FASTOPEN=23 -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -I ../boringssl/.openssl/include/" \
@@ -328,7 +301,6 @@ mv %{_builddir}/nginx-%{version}/objs/nginx \
         --with-pcre-jit \
         --with-pcre=pcre-%{pcre_ver} \
         --with-openssl=boringssl \
-        --add-module=ngx_pagespeed-%{pagespeed_ver} \
         --add-module=lua-nginx-module-%{lua_module_ver} \
         --add-module=headers-more-nginx-module-%{mh_module_ver} \
         --with-cc-opt="-g -O2 -fPIE -fstack-protector-all -DTCP_FASTOPEN=23 -D_FORTIFY_SOURCE=2 -Wformat -Werror=format-security -I ../boringssl/.openssl/include/" \
@@ -362,7 +334,6 @@ install -dm 755 %{buildroot}%{_logdir}/%{name}
 install -dm 755 %{buildroot}%{_rundir}/%{name}
 install -dm 755 %{buildroot}%{_cachedir}/%{name}
 install -dm 755 %{buildroot}%{_datadir}/%{name}/html
-install -dm 755 %{buildroot}%{pagespeed_cache_path}
 
 # Install modules dirs
 install -dm 755 %{buildroot}%{_libdir}/%{name}/modules
@@ -407,7 +378,7 @@ install -dm 755 %{buildroot}%{_sysconfdir}/%{name}/xtra
 install -pm 644 %{SOURCE4} \
                 %{buildroot}%{_sysconfdir}/%{name}/%{name}.conf
 
-# Install XTRA configs
+# Install extra configs
 install -pm 644 %{SOURCE20} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
 install -pm 644 %{SOURCE21} \
@@ -416,12 +387,6 @@ install -pm 644 %{SOURCE22} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
 install -pm 644 %{SOURCE23} \
                 %{buildroot}%{_sysconfdir}/%{name}/xtra/
-install -pm 644 %{SOURCE24} \
-                %{buildroot}%{_sysconfdir}/%{name}/xtra/
-install -pm 644 %{SOURCE25} \
-                %{buildroot}%{_sysconfdir}/%{name}/xtra/
-install -pm 644 %{SOURCE26} \
-                %{buildroot}%{_sysconfdir}/%{name}/xtra/
 
 install -dm 755 %{buildroot}%{_sysconfdir}/sysconfig
 
@@ -525,7 +490,6 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root)
 %doc NGINX-CHANGES NGINX-CHANGES.ru NGINX-LICENSE NGINX-README
-%doc PAGESPEED-LICENSE PAGESPEED-README.md
 %doc LUAMODULE-README.markdown
 %doc HEADERSMORE-README.markdown
 
@@ -537,9 +501,6 @@ rm -rf %{buildroot}
 %dir %{_sysconfdir}/%{name}/stream.conf.d
 
 %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf
-%config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed-access.pswd
-%config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed.conf
-%config(noreplace) %{_sysconfdir}/%{name}/xtra/pagespeed-enabled.conf
 %config %{_sysconfdir}/%{name}/xtra/common.conf
 %config %{_sysconfdir}/%{name}/xtra/ssl.conf
 %config %{_sysconfdir}/%{name}/xtra/ssl-wildcard.conf
@@ -574,7 +535,6 @@ rm -rf %{buildroot}
 %{_logdir}/%{name}
 
 %attr(0755,%{service_user},%{service_group}) %dir %{_cachedir}/%{name}
-%attr(0755,%{service_user},%{service_group}) %dir %{pagespeed_cache_path}
 %attr(0755,%{service_user},%{service_group}) %dir %{_libdir}/%{name}/modules
 
 %files debug
@@ -599,6 +559,12 @@ rm -rf %{buildroot}
 ################################################################################
 
 %changelog
+* Thu Sep 27 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.4-0
+- Nginx updated to 1.15.4
+- PageSpeed removed
+- Updated dynamic TLS records patch for compatibility with latest version
+- Updated BoringSSL patch for compatibility with latest version
+
 * Sun Sep 02 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.3-0
 - Nginx updated to 1.15.3
 - BoringSSL updated to latest version

From 2a22474f5eaf2b7a572276b92ddcc57e0f4d0d6e Mon Sep 17 00:00:00 2001
From: Anton Novojilov <andy@essentialkaos.com>
Date: Thu, 27 Sep 2018 14:35:41 +0300
Subject: [PATCH 3/3] Changelog fixes

---
 webkaos.spec | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webkaos.spec b/webkaos.spec
index 2068e51..55a133a 100644
--- a/webkaos.spec
+++ b/webkaos.spec
@@ -562,17 +562,17 @@ rm -rf %{buildroot}
 * Thu Sep 27 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.4-0
 - Nginx updated to 1.15.4
 - PageSpeed removed
-- Updated dynamic TLS records patch for compatibility with latest version
-- Updated BoringSSL patch for compatibility with latest version
+- Updated dynamic TLS records patch for compatibility with the latest version
+- Updated BoringSSL patch for compatibility with the latest version
 
 * Sun Sep 02 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.3-0
 - Nginx updated to 1.15.3
 - BoringSSL updated to latest version
-- Updated dynamic TLS records patch for compatibility with latest version
+- Updated dynamic TLS records patch for compatibility with the latest version
 
 * Thu Jul 26 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.2-0
 - Nginx updated to 1.15.2
-- BoringSSL updated to latest version
+- BoringSSL updated to the latest version
 
 * Wed Jul 04 2018 Anton Novojilov <andy@essentialkaos.com> - 1.15.1-1
 - Dropped TLSv1 support