Skip to content

Commit

Permalink
Merge pull request #69 from essentialkaos/develop
Browse files Browse the repository at this point in the history 
Version 1.15.3
  • Loading branch information
@andyone
andyone authored Sep 1, 2018
2 parents 10803ca + 1cd9846 commit 45a63b6
Show file tree
Hide file tree
Showing 3 changed files with 62 additions and 57 deletions.
52 changes: 26 additions & 26 deletions SOURCES/webkaos-dynamic-tls-records.patch
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.c nginx-1.13.0/src/event/ngx_event_openssl.c
--- nginx-1.13.0-orig/src/event/ngx_event_openssl.c 2017-04-25 17:13:00.633648942 -0400
+++ nginx-1.13.0/src/event/ngx_event_openssl.c 2017-04-25 17:39:34.000000000 -0400
@@ -1173,6 +1173,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 @@

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

sc->session_ctx = ssl->ctx;

@@ -1711,6 +1712,41 @@
@@ -1806,6 +1807,41 @@

for ( ;; ) {

Expand Down Expand Up @@ -51,7 +51,7 @@ diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.c nginx-1.13.0/src/event
while (in && buf->last < buf->end && send < limit) {
if (in->buf->last_buf || in->buf->flush) {
flush = 1;
@@ -1812,6 +1848,9 @@
@@ -1907,6 +1943,9 @@

if (n > 0) {

Expand All @@ -61,10 +61,10 @@ diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.c nginx-1.13.0/src/event
if (c->ssl->saved_read_handler) {

c->read->handler = c->ssl->saved_read_handler;
diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.h nginx-1.13.0/src/event/ngx_event_openssl.h
--- nginx-1.13.0-orig/src/event/ngx_event_openssl.h 2017-04-25 17:13:00.634648923 -0400
+++ nginx-1.13.0/src/event/ngx_event_openssl.h 2017-04-25 17:42:03.000000000 -0400
@@ -53,6 +53,13 @@
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 @@
#define ngx_ssl_session_t SSL_SESSION
#define ngx_ssl_conn_t SSL

Expand All @@ -78,15 +78,15 @@ diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.h nginx-1.13.0/src/event

#if (OPENSSL_VERSION_NUMBER < 0x10002000L)
#define SSL_is_server(s) (s)->server
@@ -63,6 +70,7 @@
@@ -68,6 +75,7 @@
SSL_CTX *ctx;
ngx_log_t *log;
size_t buffer_size;
+ ngx_ssl_dyn_rec_t dyn_rec;
};


@@ -85,6 +93,10 @@
@@ -93,6 +101,10 @@
unsigned no_wait_shutdown:1;
unsigned no_send_shutdown:1;
unsigned handshake_buffer_set:1;
Expand All @@ -97,7 +97,7 @@ diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.h nginx-1.13.0/src/event
};


@@ -94,7 +106,7 @@
@@ -102,7 +114,7 @@
#define NGX_SSL_DFLT_BUILTIN_SCACHE -5


Expand All @@ -106,11 +106,11 @@ diff -urN nginx-1.13.0-orig/src/event/ngx_event_openssl.h nginx-1.13.0/src/event

typedef struct ngx_ssl_sess_id_s ngx_ssl_sess_id_t;

diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.13.0/src/http/modules/ngx_http_ssl_module.c
--- nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.c 2017-04-25 17:13:00.643648755 -0400
+++ nginx-1.13.0/src/http/modules/ngx_http_ssl_module.c 2017-04-25 17:46:13.000000000 -0400
@@ -234,6 +234,41 @@
offsetof(ngx_http_ssl_srv_conf_t, stapling_verify),
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
@@ -246,6 +246,41 @@
offsetof(ngx_http_ssl_srv_conf_t, early_data),
NULL },

+ { ngx_string("ssl_dyn_rec_enable"),
Expand Down Expand Up @@ -151,7 +151,7 @@ diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.13.0/
ngx_null_command
};

@@ -555,6 +590,11 @@
@@ -576,6 +611,11 @@
sscf->session_ticket_keys = NGX_CONF_UNSET_PTR;
sscf->stapling = NGX_CONF_UNSET;
sscf->stapling_verify = NGX_CONF_UNSET;
Expand All @@ -163,7 +163,7 @@ diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.13.0/

return sscf;
}
@@ -620,6 +660,20 @@
@@ -643,6 +683,20 @@
ngx_conf_merge_str_value(conf->stapling_responder,
prev->stapling_responder, "");

Expand All @@ -184,8 +184,8 @@ diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.13.0/
conf->ssl.log = cf->log;

if (conf->enable) {
@@ -800,6 +854,28 @@

@@ -827,6 +881,28 @@
return NGX_CONF_ERROR;
}

+ if (conf->dyn_rec_enable) {
Expand Down Expand Up @@ -213,10 +213,10 @@ diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.c nginx-1.13.0/
return NGX_CONF_OK;
}

diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.h nginx-1.13.0/src/http/modules/ngx_http_ssl_module.h
--- nginx-1.13.0-orig/src/http/modules/ngx_http_ssl_module.h 2017-04-25 17:13:00.649648644 -0400
+++ nginx-1.13.0/src/http/modules/ngx_http_ssl_module.h 2017-04-25 17:46:52.000000000 -0400
@@ -57,6 +57,12 @@
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
@@ -58,6 +58,12 @@

u_char *file;
ngx_uint_t line;
Expand Down
58 changes: 29 additions & 29 deletions SOURCES/webkaos.patch
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
diff -urN nginx-1.15.2-orig/auto/lib/openssl/make nginx-1.15.2/auto/lib/openssl/make
--- nginx-1.15.2-orig/auto/lib/openssl/make 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/auto/lib/openssl/make 2018-07-26 15:08:05.484784550 +0300
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
@@ -45,18 +45,18 @@
/*) ngx_prefix="$OPENSSL/.openssl" ;;
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
Expand All @@ -24,9 +24,9 @@ diff -urN nginx-1.15.2-orig/auto/lib/openssl/make nginx-1.15.2/auto/lib/openssl/
;;

esac
diff -urN nginx-1.15.2-orig/src/core/nginx.c nginx-1.15.2/src/core/nginx.c
--- nginx-1.15.2-orig/src/core/nginx.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/core/nginx.c 2018-07-26 15:08:05.489784513 +0300
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
@@ -389,13 +389,13 @@
static void
ngx_show_version_info(void)
Expand All @@ -45,13 +45,13 @@ diff -urN nginx-1.15.2-orig/src/core/nginx.c nginx-1.15.2/src/core/nginx.c
"Options:" NGX_LINEFEED
" -?,-h : this help" NGX_LINEFEED
" -v : show version and exit" NGX_LINEFEED
diff -urN nginx-1.15.2-orig/src/core/nginx.h nginx-1.15.2/src/core/nginx.h
--- nginx-1.15.2-orig/src/core/nginx.h 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/core/nginx.h 2018-07-26 15:24:34.000000000 +0300
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
@@ -11,7 +11,7 @@

#define nginx_version 1015002
#define NGINX_VERSION "1.15.2"
#define nginx_version 1015003
#define NGINX_VERSION "1.15.3"
-#define NGINX_VER "nginx/" NGINX_VERSION
+#define NGINX_VER "webkaos/" NGINX_VERSION

Expand All @@ -66,9 +66,9 @@ diff -urN nginx-1.15.2-orig/src/core/nginx.h nginx-1.15.2/src/core/nginx.h
#define NGX_OLDPID_EXT ".oldbin"


diff -urN nginx-1.15.2-orig/src/core/ngx_log.c nginx-1.15.2/src/core/ngx_log.c
--- nginx-1.15.2-orig/src/core/ngx_log.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/core/ngx_log.c 2018-07-26 15:08:05.498784447 +0300
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
@@ -202,9 +202,9 @@
return;
}
Expand Down Expand Up @@ -99,9 +99,9 @@ diff -urN nginx-1.15.2-orig/src/core/ngx_log.c nginx-1.15.2/src/core/ngx_log.c
return NGX_CONF_ERROR;
#endif

diff -urN nginx-1.15.2-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.15.2/src/http/modules/ngx_http_autoindex_module.c
--- nginx-1.15.2-orig/src/http/modules/ngx_http_autoindex_module.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/http/modules/ngx_http_autoindex_module.c 2018-07-26 15:08:05.503784410 +0300
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
@@ -451,9 +451,11 @@
;

Expand Down Expand Up @@ -177,9 +177,9 @@ diff -urN nginx-1.15.2-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.2-orig/src/http/ngx_http_header_filter_module.c nginx-1.15.2/src/http/ngx_http_header_filter_module.c
--- nginx-1.15.2-orig/src/http/ngx_http_header_filter_module.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/http/ngx_http_header_filter_module.c 2018-07-26 15:08:05.508784374 +0300
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
@@ -46,7 +46,7 @@
};

Expand Down Expand Up @@ -230,9 +230,9 @@ diff -urN nginx-1.15.2-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.2-orig/src/http/ngx_http_special_response.c nginx-1.15.2/src/http/ngx_http_special_response.c
--- nginx-1.15.2-orig/src/http/ngx_http_special_response.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/http/ngx_http_special_response.c 2018-07-26 15:08:05.513784337 +0300
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
@@ -19,21 +19,21 @@


Expand Down Expand Up @@ -739,9 +739,9 @@ diff -urN nginx-1.15.2-orig/src/http/ngx_http_special_response.c nginx-1.15.2/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.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.2/src/http/v2/ngx_http_v2_filter_module.c
--- nginx-1.15.2-orig/src/http/v2/ngx_http_v2_filter_module.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/http/v2/ngx_http_v2_filter_module.c 2018-07-26 15:25:40.000000000 +0300
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
@@ -148,7 +148,7 @@
ngx_http_core_srv_conf_t *cscf;
u_char addr[NGX_SOCKADDR_STRLEN];
Expand All @@ -760,9 +760,9 @@ diff -urN nginx-1.15.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.15.2
}

*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
diff -urN nginx-1.15.2-orig/src/os/unix/ngx_setproctitle.c nginx-1.15.2/src/os/unix/ngx_setproctitle.c
--- nginx-1.15.2-orig/src/os/unix/ngx_setproctitle.c 2018-07-24 16:11:00.000000000 +0300
+++ nginx-1.15.2/src/os/unix/ngx_setproctitle.c 2018-07-26 15:08:05.522784271 +0300
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
@@ -89,7 +89,7 @@

ngx_os_argv[1] = NULL;
Expand Down
9 changes: 7 additions & 2 deletions webkaos.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
%define service_name %{name}
%define service_home %{_cachedir}/%{service_name}

%define boring_commit f3bfab0035fe671889250c1cc52973109bfc104f
%define boring_commit 67e64342c1aa0b31b0b5c11e5ee21c481ce530e8
%define psol_ver 1.12.34.2
%define lua_module_ver 0.10.13
%define mh_module_ver 0.33
Expand All @@ -65,7 +65,7 @@

Summary: Superb high performance web server
Name: webkaos
Version: 1.15.2
Version: 1.15.3
Release: 0%{?dist}
License: 2-clause BSD-like license
Group: System Environment/Daemons
Expand Down Expand Up @@ -599,6 +599,11 @@ rm -rf %{buildroot}
################################################################################

%changelog
* Sun Sep 02 2018 Anton Novojilov <[email protected]> - 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

* Thu Jul 26 2018 Anton Novojilov <[email protected]> - 1.15.2-0
- Nginx updated to 1.15.2
- BoringSSL updated to latest version
Expand Down

0 comments on commit 45a63b6

Please sign in to comment.