Skip to content

Commit c7e6765

Browse files
andyoneandyone
authored
Merge pull request #72 from essentialkaos/develop
 Version 1.15.4
2 parents 672a2a5 + 2a22474 commit c7e6765

11 files changed

+154
-338
lines changed

‎SOURCES/boringssl.patch‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
1-
diff -ur nginx-1.11.6/src/event/ngx_event_openssl.c nginx-1.11.6-patched/src/event/ngx_event_openssl.c
2-
--- nginx-1.11.6/src/event/ngx_event_openssl.c 2016-11-15 15:11:47.000000000 +0000
3-
+++ nginx-1.11.6-patched/src/event/ngx_event_openssl.c 2016-11-16 23:39:22.792289533 +0000
4-
@@ -2016,7 +2016,9 @@
5-
6-
/* handshake failures */
7-
if (n == SSL_R_BAD_CHANGE_CIPHER_SPEC /* 103 */
1+
diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.c nginx-1.15.4-boring/src/event/ngx_event_openssl.c
2+
--- nginx-1.15.4-orig/src/event/ngx_event_openssl.c 2018-09-25 18:11:39.000000000 +0300
3+
+++ nginx-1.15.4-boring/src/event/ngx_event_openssl.c 2018-09-27 14:21:12.000000000 +0300
4+
@@ -2591,7 +2591,9 @@
5+
#ifdef SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM
6+
|| n == SSL_R_NO_SUITABLE_SIGNATURE_ALGORITHM /* 118 */
7+
#endif
88
+#ifdef SSL_R_BLOCK_CIPHER_PAD_IS_WRONG
99
|| n == SSL_R_BLOCK_CIPHER_PAD_IS_WRONG /* 129 */
1010
+#endif
1111
|| n == SSL_R_DIGEST_CHECK_FAILED /* 149 */
1212
|| n == SSL_R_ERROR_IN_RECEIVED_CIPHER_LIST /* 151 */
1313
|| n == SSL_R_EXCESSIVE_MESSAGE_SIZE /* 152 */
14-
@@ -2024,7 +2026,9 @@
14+
@@ -2601,7 +2603,9 @@
1515
#ifdef SSL_R_NO_CIPHERS_PASSED
1616
|| n == SSL_R_NO_CIPHERS_PASSED /* 182 */
1717
#endif

‎SOURCES/ngx_pagespeed-build-force.patch‎

Lines changed: 0 additions & 12 deletions
This file was deleted.

‎SOURCES/pagespeed-access.pswd‎

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎SOURCES/pagespeed-enabled.conf‎

Lines changed: 0 additions & 29 deletions
This file was deleted.

‎SOURCES/pagespeed.conf‎

Lines changed: 0 additions & 27 deletions
This file was deleted.

‎SOURCES/webkaos-dynamic-tls-records.patch‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event/ngx_event_openssl.c
2-
--- nginx-1.15.3-orig/src/event/ngx_event_openssl.c 2018-08-28 18:36:00.000000000 +0300
3-
+++ nginx-1.15.3/src/event/ngx_event_openssl.c 2018-09-02 01:18:43.000000000 +0300
4-
@@ -1239,6 +1239,7 @@
1+
diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.c nginx-1.15.4-dyntls/src/event/ngx_event_openssl.c
2+
--- nginx-1.15.4-orig/src/event/ngx_event_openssl.c 2018-09-25 18:11:39.000000000 +0300
3+
+++ nginx-1.15.4-dyntls/src/event/ngx_event_openssl.c 2018-09-27 14:01:16.000000000 +0300
4+
@@ -1267,6 +1267,7 @@
55

66
sc->buffer = ((flags & NGX_SSL_BUFFER) != 0);
77
sc->buffer_size = ssl->buffer_size;
88
+ sc->dyn_rec = ssl->dyn_rec;
99

1010
sc->session_ctx = ssl->ctx;
1111

12-
@@ -1806,6 +1807,41 @@
12+
@@ -2115,6 +2116,41 @@
1313

1414
for ( ;; ) {
1515

@@ -51,7 +51,7 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event
5151
while (in && buf->last < buf->end && send < limit) {
5252
if (in->buf->last_buf || in->buf->flush) {
5353
flush = 1;
54-
@@ -1907,6 +1943,9 @@
54+
@@ -2222,6 +2258,9 @@
5555

5656
if (n > 0) {
5757

@@ -61,10 +61,10 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.c nginx-1.15.3/src/event
6161
if (c->ssl->saved_read_handler) {
6262

6363
c->read->handler = c->ssl->saved_read_handler;
64-
diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event/ngx_event_openssl.h
65-
--- nginx-1.15.3-orig/src/event/ngx_event_openssl.h 2018-08-28 18:36:00.000000000 +0300
66-
+++ nginx-1.15.3/src/event/ngx_event_openssl.h 2018-09-02 01:20:39.000000000 +0300
67-
@@ -58,6 +58,13 @@
64+
diff -urN nginx-1.15.4-orig/src/event/ngx_event_openssl.h nginx-1.15.4-dyntls/src/event/ngx_event_openssl.h
65+
--- nginx-1.15.4-orig/src/event/ngx_event_openssl.h 2018-09-25 18:11:39.000000000 +0300
66+
+++ nginx-1.15.4-dyntls/src/event/ngx_event_openssl.h 2018-09-27 14:05:40.000000000 +0300
67+
@@ -58,6 +58,12 @@
6868
#define ngx_ssl_session_t SSL_SESSION
6969
#define ngx_ssl_conn_t SSL
7070

@@ -74,30 +74,29 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event
7474
+ size_t size_lo;
7575
+ size_t size_hi;
7676
+} ngx_ssl_dyn_rec_t;
77-
+
7877

7978
#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
8079
#define SSL_is_server(s) (s)->server
81-
@@ -68,6 +75,7 @@
80+
@@ -68,6 +74,7 @@
8281
SSL_CTX *ctx;
8382
ngx_log_t *log;
8483
size_t buffer_size;
8584
+ ngx_ssl_dyn_rec_t dyn_rec;
8685
};
8786

8887

89-
@@ -93,6 +101,10 @@
90-
unsigned no_wait_shutdown:1;
91-
unsigned no_send_shutdown:1;
92-
unsigned handshake_buffer_set:1;
88+
@@ -98,6 +105,10 @@
89+
unsigned try_early_data:1;
90+
unsigned in_early:1;
91+
unsigned early_preread:1;
9392
+
9493
+ ngx_ssl_dyn_rec_t dyn_rec;
9594
+ ngx_msec_t dyn_rec_last_write;
9695
+ ngx_uint_t dyn_rec_records_sent;
9796
};
9897

9998

100-
@@ -102,7 +114,7 @@
99+
@@ -107,7 +118,7 @@
101100
#define NGX_SSL_DFLT_BUILTIN_SCACHE -5
102101

103102

@@ -106,9 +105,9 @@ diff -urN nginx-1.15.3-orig/src/event/ngx_event_openssl.h nginx-1.15.3/src/event
106105

107106
typedef struct ngx_ssl_sess_id_s ngx_ssl_sess_id_t;
108107

109-
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
110-
--- nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.c 2018-08-28 18:36:00.000000000 +0300
111-
+++ nginx-1.15.3/src/http/modules/ngx_http_ssl_module.c 2018-09-02 01:24:26.000000000 +0300
108+
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
109+
--- nginx-1.15.4-orig/src/http/modules/ngx_http_ssl_module.c 2018-09-25 18:11:39.000000000 +0300
110+
+++ nginx-1.15.4-dyntls/src/http/modules/ngx_http_ssl_module.c 2018-09-27 14:08:12.000000000 +0300
112111
@@ -246,6 +246,41 @@
113112
offsetof(ngx_http_ssl_srv_conf_t, early_data),
114113
NULL },
@@ -208,14 +207,14 @@ diff -urN nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.15.3/
208207
+
209208
+ } else {
210209
+ conf->ssl.dyn_rec.timeout = 0;
211-
+ }
210+
+ }
212211
+
213212
return NGX_CONF_OK;
214213
}
215214

216-
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
217-
--- nginx-1.15.3-orig/src/http/modules/ngx_http_ssl_module.h 2018-08-28 18:36:00.000000000 +0300
218-
+++ nginx-1.15.3/src/http/modules/ngx_http_ssl_module.h 2018-09-02 01:25:11.000000000 +0300
215+
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
216+
--- nginx-1.15.4-orig/src/http/modules/ngx_http_ssl_module.h 2018-09-25 18:11:39.000000000 +0300
217+
+++ nginx-1.15.4-dyntls/src/http/modules/ngx_http_ssl_module.h 2018-09-27 14:09:20.000000000 +0300
219218
@@ -58,6 +58,12 @@
220219

221220
u_char *file;

‎SOURCES/webkaos.conf‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@
66
# most cases, but not for all. Check all configuration values before webkaos #
77
# usage. #
88
# #
9-
# More information about pagespeed configuration you may find on this page: #
10-
# https://developers.google.com/speed/pagespeed/ #
11-
# #
129
################################################################################
1310

1411
user webkaos;
@@ -134,12 +131,6 @@ http {
134131
# Header with unique request identifier.
135132
add_header X-Request-ID "$request_id";
136133

137-
##############################################################################
138-
139-
# Main configuration for pagespeed. Pagespeed globally disabled, include
140-
# xtra/pagespeed-enabled.conf in your server block to enable pagespeed.
141-
include xtra/pagespeed.conf;
142-
143134
##############################################################################
144135

145136
server {

‎SOURCES/webkaos.init‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ binary=${BINARY:-/usr/sbin/webkaos}
3939
conf_file=${CONF_FILE:-/etc/webkaos/webkaos.conf}
4040
cache_dir=${CACHE_DIR:-/var/cache/webkaos}
4141
log_dir=${LOG_DIR:-/var/log/webkaos}
42-
pagespeed_cache=${PAGESPEED_CACHE:-/var/cache/webkaos/pagespeed}
4342
ssl_dir=${SSL_DIR:-/etc/webkaos/ssl}
4443
dh_param=${DH_PARAM:-/etc/webkaos/ssl/dhparam.pem}
4544

@@ -70,8 +69,6 @@ kv.addCommandAlias "check" "configtest"
7069
kv.addCommandAlias "restart" "condrestart"
7170
kv.addCommandAlias "config" "conf"
7271

73-
[[ $pagespeed_cache ]] && kv.addCommand "clean" "Clean pagespeed cache" "clean"
74-
7572
kv.addHandler "start" "startServiceHandler"
7673
kv.addHandler "start" "preStartServiceHandler" "pre"
7774
kv.addHandler "stop" "stopServiceHandler"
@@ -93,7 +90,6 @@ prepare() {
9390

9491
if kv.isRoot ; then
9592
[[ ! -w $cache_dir ]] && has_errors=true && kv.error "<CACHE_DIR> must be writable directory"
96-
[[ ! -w $pagespeed_cache ]] && has_errors=true && kv.error "<PAGESPEED_CACHE> must be writable directory"
9793
fi
9894

9995
[[ $has_errors ]] && kv.exit $ACTION_ERROR
@@ -233,20 +229,6 @@ reload() {
233229
return $status
234230
}
235231

236-
clean() {
237-
kv.showProcessMessage "Cleaning pagespeed cache"
238-
239-
cleanPagespeedCache
240-
241-
local status=$?
242-
243-
kv.showStatusMessage "$status"
244-
245-
[[ $status -eq $ACTION_OK ]] && kv.log "pagespeed cache cleaned by ${kv[real_user]}."
246-
247-
return $status
248-
}
249-
250232
###############################################################################
251233

252234
preStartServiceHandler() {
@@ -348,20 +330,6 @@ testServiceConfig() {
348330
[[ $status -eq $ACTION_OK ]] && return $ACTION_OK || return $ACTION_ERROR
349331
}
350332

351-
cleanPagespeedCache() {
352-
if [[ -d $pagespeed_cache ]] ; then
353-
if kv.statusIs "$STATUS_WORKS" ; then
354-
touch $pagespeed_cache/cache.flush
355-
else
356-
rm -rf $pagespeed_cache/* &> /dev/null
357-
fi
358-
359-
[[ $? -eq $ACTION_OK ]] && return $ACTION_OK || $ACTION_ERROR
360-
fi
361-
362-
return $ACTION_ERROR
363-
}
364-
365333
updateOwner() {
366334
local user=$(getUserFromConfig)
367335

@@ -371,10 +339,6 @@ updateOwner() {
371339
chown -R $user: $cache_dir -R
372340
fi
373341

374-
if [[ $pagespeed_cache && -d $pagespeed_cache ]] ; then
375-
chown -R $user: $pagespeed_cache -R
376-
fi
377-
378342
if [[ $log_dir && -d $log_dir ]] ; then
379343
chown -R $user: $log_dir -R
380344
fi

0 commit comments

Comments
 (0)