Skip to content

Commit 3dc709b

Browse files
andyoneandyone
authored
Merge pull request #85 from essentialkaos/develop
Version 1.17.2
2 parents 906a667 + 2119bbe commit 3dc709b

File tree

3 files changed

+36
-32
lines changed

3 files changed

+36
-32
lines changed

‎SOURCES/webkaos.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ http {
123123
ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
124124
ssl_dhparam /etc/webkaos/ssl/dhparam.pem;
125125

126-
resolver 1.0.0.1 1.1.1.1 valid=300s;
126+
resolver 1.1.1.1 8.8.8.8 valid=300s;
127127
resolver_timeout 10s;
128128

129129
##############################################################################

‎SOURCES/webkaos.patch‎

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN nginx-1.17.1-orig/auto/lib/openssl/make nginx-1.17.1/auto/lib/openssl/make
2-
--- nginx-1.17.1-orig/auto/lib/openssl/make 2019-06-25 15:19:45.000000000 +0300
3-
+++ nginx-1.17.1/auto/lib/openssl/make 2019-06-29 01:59:04.850301918 +0300
1+
diff -urN nginx-1.17.2-orig/auto/lib/openssl/make nginx-1.17.2/auto/lib/openssl/make
2+
--- nginx-1.17.2-orig/auto/lib/openssl/make 2019-07-23 15:01:47.000000000 +0300
3+
+++ nginx-1.17.2/auto/lib/openssl/make 2019-07-24 00:04:56.852681937 +0300
44
@@ -45,18 +45,18 @@
55
/*) ngx_prefix="$OPENSSL/.openssl" ;;
66
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.17.1-orig/auto/lib/openssl/make nginx-1.17.1/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.17.1-orig/src/core/nginx.c nginx-1.17.1/src/core/nginx.c
28-
--- nginx-1.17.1-orig/src/core/nginx.c 2019-06-25 15:19:45.000000000 +0300
29-
+++ nginx-1.17.1/src/core/nginx.c 2019-06-29 01:59:04.856301870 +0300
27+
diff -urN nginx-1.17.2-orig/src/core/nginx.c nginx-1.17.2/src/core/nginx.c
28+
--- nginx-1.17.2-orig/src/core/nginx.c 2019-07-23 15:01:47.000000000 +0300
29+
+++ nginx-1.17.2/src/core/nginx.c 2019-07-24 00:04:56.859681879 +0300
3030
@@ -389,13 +389,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.17.1-orig/src/core/nginx.c nginx-1.17.1/src/core/nginx.c
4545
"Options:" NGX_LINEFEED
4646
" -?,-h : this help" NGX_LINEFEED
4747
" -v : show version and exit" NGX_LINEFEED
48-
diff -urN nginx-1.17.1-orig/src/core/nginx.h nginx-1.17.1/src/core/nginx.h
49-
--- nginx-1.17.1-orig/src/core/nginx.h 2019-06-25 15:19:45.000000000 +0300
50-
+++ nginx-1.17.1/src/core/nginx.h 2019-06-29 01:59:31.000000000 +0300
48+
diff -urN nginx-1.17.2-orig/src/core/nginx.h nginx-1.17.2/src/core/nginx.h
49+
--- nginx-1.17.2-orig/src/core/nginx.h 2019-07-23 15:01:47.000000000 +0300
50+
+++ nginx-1.17.2/src/core/nginx.h 2019-07-24 00:06:52.000000000 +0300
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1017001
54-
#define NGINX_VERSION "1.17.1"
53+
#define nginx_version 1017002
54+
#define NGINX_VERSION "1.17.2"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

@@ -66,9 +66,9 @@ diff -urN nginx-1.17.1-orig/src/core/nginx.h nginx-1.17.1/src/core/nginx.h
6666
#define NGX_OLDPID_EXT ".oldbin"
6767

6868

69-
diff -urN nginx-1.17.1-orig/src/core/ngx_log.c nginx-1.17.1/src/core/ngx_log.c
70-
--- nginx-1.17.1-orig/src/core/ngx_log.c 2019-06-25 15:19:45.000000000 +0300
71-
+++ nginx-1.17.1/src/core/ngx_log.c 2019-06-29 01:59:04.866301790 +0300
69+
diff -urN nginx-1.17.2-orig/src/core/ngx_log.c nginx-1.17.2/src/core/ngx_log.c
70+
--- nginx-1.17.2-orig/src/core/ngx_log.c 2019-07-23 15:01:47.000000000 +0300
71+
+++ nginx-1.17.2/src/core/ngx_log.c 2019-07-24 00:04:56.869681797 +0300
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.17.1-orig/src/core/ngx_log.c nginx-1.17.1/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.17.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.1/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.17.1-orig/src/http/modules/ngx_http_autoindex_module.c 2019-06-25 15:19:45.000000000 +0300
104-
+++ nginx-1.17.1/src/http/modules/ngx_http_autoindex_module.c 2019-06-29 01:59:04.871301750 +0300
102+
diff -urN nginx-1.17.2-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.17.2/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.17.2-orig/src/http/modules/ngx_http_autoindex_module.c 2019-07-23 15:01:47.000000000 +0300
104+
+++ nginx-1.17.2/src/http/modules/ngx_http_autoindex_module.c 2019-07-24 00:04:56.875681748 +0300
105105
@@ -449,9 +449,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.17.1-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
177177
tm.ngx_tm_mday,
178178
months[tm.ngx_tm_mon - 1],
179179
tm.ngx_tm_year,
180-
diff -urN nginx-1.17.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.1/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.17.1-orig/src/http/ngx_http_header_filter_module.c 2019-06-25 15:19:45.000000000 +0300
182-
+++ nginx-1.17.1/src/http/ngx_http_header_filter_module.c 2019-06-29 01:59:04.877301702 +0300
180+
diff -urN nginx-1.17.2-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.2/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.17.2-orig/src/http/ngx_http_header_filter_module.c 2019-07-23 15:01:47.000000000 +0300
182+
+++ nginx-1.17.2/src/http/ngx_http_header_filter_module.c 2019-07-24 00:04:56.881681698 +0300
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -230,9 +230,9 @@ diff -urN nginx-1.17.1-orig/src/http/ngx_http_header_filter_module.c nginx-1.17.
230230
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
231231

232232
ngx_string("500 Internal Server Error"),
233-
diff -urN nginx-1.17.1-orig/src/http/ngx_http_special_response.c nginx-1.17.1/src/http/ngx_http_special_response.c
234-
--- nginx-1.17.1-orig/src/http/ngx_http_special_response.c 2019-06-25 15:19:45.000000000 +0300
235-
+++ nginx-1.17.1/src/http/ngx_http_special_response.c 2019-06-29 01:59:04.882301662 +0300
233+
diff -urN nginx-1.17.2-orig/src/http/ngx_http_special_response.c nginx-1.17.2/src/http/ngx_http_special_response.c
234+
--- nginx-1.17.2-orig/src/http/ngx_http_special_response.c 2019-07-23 15:01:47.000000000 +0300
235+
+++ nginx-1.17.2/src/http/ngx_http_special_response.c 2019-07-24 00:04:56.887681649 +0300
236236
@@ -19,21 +19,21 @@
237237

238238

@@ -705,9 +705,9 @@ diff -urN nginx-1.17.1-orig/src/http/ngx_http_special_response.c nginx-1.17.1/sr
705705
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
706706

707707
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
708-
diff -urN nginx-1.17.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.1/src/http/v2/ngx_http_v2_filter_module.c
709-
--- nginx-1.17.1-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-06-25 15:19:45.000000000 +0300
710-
+++ nginx-1.17.1/src/http/v2/ngx_http_v2_filter_module.c 2019-06-29 01:59:04.888301614 +0300
708+
diff -urN nginx-1.17.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.2/src/http/v2/ngx_http_v2_filter_module.c
709+
--- nginx-1.17.2-orig/src/http/v2/ngx_http_v2_filter_module.c 2019-07-23 15:01:47.000000000 +0300
710+
+++ nginx-1.17.2/src/http/v2/ngx_http_v2_filter_module.c 2019-07-24 00:08:07.000000000 +0300
711711
@@ -148,7 +148,7 @@
712712
ngx_http_core_srv_conf_t *cscf;
713713
u_char addr[NGX_SOCKADDR_STRLEN];
@@ -726,9 +726,9 @@ diff -urN nginx-1.17.1-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.17.1
726726
}
727727

728728
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
729-
diff -urN nginx-1.17.1-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.1/src/os/unix/ngx_setproctitle.c
730-
--- nginx-1.17.1-orig/src/os/unix/ngx_setproctitle.c 2019-06-25 15:19:45.000000000 +0300
731-
+++ nginx-1.17.1/src/os/unix/ngx_setproctitle.c 2019-06-29 01:59:04.894301566 +0300
729+
diff -urN nginx-1.17.2-orig/src/os/unix/ngx_setproctitle.c nginx-1.17.2/src/os/unix/ngx_setproctitle.c
730+
--- nginx-1.17.2-orig/src/os/unix/ngx_setproctitle.c 2019-07-23 15:01:47.000000000 +0300
731+
+++ nginx-1.17.2/src/os/unix/ngx_setproctitle.c 2019-07-24 00:04:56.897681567 +0300
732732
@@ -89,7 +89,7 @@
733733

734734
ngx_os_argv[1] = NULL;

‎webkaos.spec‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
%define service_name %{name}
4545
%define service_home %{_cachedir}/%{service_name}
4646

47-
%define boring_commit d6f9c359d219055a89c676cb8886421b145a08da
47+
%define boring_commit ee4888c5ecde876d7a5609d1d7b9af8ce8f50338
4848
%define lua_module_ver 0.10.15
4949
%define mh_module_ver 0.33
5050
%define pcre_ver 8.43
@@ -55,7 +55,7 @@
5555

5656
Summary: Superb high performance web server
5757
Name: webkaos
58-
Version: 1.17.1
58+
Version: 1.17.2
5959
Release: 0%{?dist}
6060
License: 2-clause BSD-like license
6161
Group: System Environment/Daemons
@@ -573,6 +573,10 @@ rm -rf %{buildroot}
573573
################################################################################
574574

575575
%changelog
576+
* Wed Jul 24 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.2-0
577+
- Nginx updated to 1.17.2
578+
- BoringSSL updated to the latest version
579+
576580
* Sat Jun 29 2019 Anton Novojilov <andy@essentialkaos.com> - 1.17.1-0
577581
- Nginx updated to 1.17.1
578582
- BoringSSL updated to the latest version

0 commit comments

Comments
 (0)