Skip to content

Commit 991b87d

Browse files
andyoneandyone
authored
Merge pull request #39 from essentialkaos/develop
Version 1.13.2
2 parents 131884f + c9ff50c commit 991b87d

File tree

3 files changed

+914
-33
lines changed

3 files changed

+914
-33
lines changed

‎SOURCES/webkaos-1.13.0-lua-build-fix.patch‎ renamed to ‎SOURCES/webkaos-1.13.2-lua-build-fix.patch‎

File renamed without changes.

‎SOURCES/webkaos.patch‎

Lines changed: 45 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
diff -urN nginx-1.13.0-orig/auto/lib/openssl/make nginx-1.13.0/auto/lib/openssl/make
2-
--- nginx-1.13.0-orig/auto/lib/openssl/make 2017-04-25 17:13:00.618649224 -0400
3-
+++ nginx-1.13.0/auto/lib/openssl/make 2017-04-25 17:13:19.755289174 -0400
1+
diff -urN nginx-1.13.2-orig/auto/lib/openssl/make nginx-1.13.2/auto/lib/openssl/make
2+
--- nginx-1.13.2-orig/auto/lib/openssl/make 2017-07-07 00:55:54.190396434 +0200
3+
+++ nginx-1.13.2/auto/lib/openssl/make 2017-04-08 23:39:20.000000000 +0200
44
@@ -45,18 +45,18 @@
55
/*) ngx_prefix="$OPENSSL/.openssl" ;;
66
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
@@ -24,9 +24,9 @@ diff -urN nginx-1.13.0-orig/auto/lib/openssl/make nginx-1.13.0/auto/lib/openssl/
2424
;;
2525

2626
esac
27-
diff -urN nginx-1.13.0-orig/src/core/nginx.c nginx-1.13.0/src/core/nginx.c
28-
--- nginx-1.13.0-orig/src/core/nginx.c 2017-04-25 17:13:00.666648328 -0400
29-
+++ nginx-1.13.0/src/core/nginx.c 2017-04-25 17:13:19.773290501 -0400
27+
diff -urN nginx-1.13.2-orig/src/core/nginx.c nginx-1.13.2/src/core/nginx.c
28+
--- nginx-1.13.2-orig/src/core/nginx.c 2017-07-07 00:55:54.247396437 +0200
29+
+++ nginx-1.13.2/src/core/nginx.c 2017-04-08 23:39:20.000000000 +0200
3030
@@ -382,13 +382,13 @@
3131
static void
3232
ngx_show_version_info(void)
@@ -45,13 +45,13 @@ diff -urN nginx-1.13.0-orig/src/core/nginx.c nginx-1.13.0/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.13.0-orig/src/core/nginx.h nginx-1.13.0/src/core/nginx.h
49-
--- nginx-1.13.0-orig/src/core/nginx.h 2017-04-25 17:13:00.670648253 -0400
50-
+++ nginx-1.13.0/src/core/nginx.h 2017-04-25 17:14:15.000000000 -0400
48+
diff -urN nginx-1.13.2-orig/src/core/nginx.h nginx-1.13.2/src/core/nginx.h
49+
--- nginx-1.13.2-orig/src/core/nginx.h 2017-07-07 00:55:54.257396437 +0200
50+
+++ nginx-1.13.2/src/core/nginx.h 2017-07-07 00:59:11.000000000 +0200
5151
@@ -11,7 +11,7 @@
5252

53-
#define nginx_version 1013000
54-
#define NGINX_VERSION "1.13.0"
53+
#define nginx_version 1013002
54+
#define NGINX_VERSION "1.13.2"
5555
-#define NGINX_VER "nginx/" NGINX_VERSION
5656
+#define NGINX_VER "webkaos/" NGINX_VERSION
5757

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

6868

69-
diff -urN nginx-1.13.0-orig/src/core/ngx_log.c nginx-1.13.0/src/core/ngx_log.c
70-
--- nginx-1.13.0-orig/src/core/ngx_log.c 2017-04-25 17:13:00.669648272 -0400
71-
+++ nginx-1.13.0/src/core/ngx_log.c 2017-04-25 17:13:19.816292375 -0400
69+
diff -urN nginx-1.13.2-orig/src/core/ngx_log.c nginx-1.13.2/src/core/ngx_log.c
70+
--- nginx-1.13.2-orig/src/core/ngx_log.c 2017-07-07 00:55:54.255396437 +0200
71+
+++ nginx-1.13.2/src/core/ngx_log.c 2017-04-08 23:39:20.000000000 +0200
7272
@@ -202,9 +202,9 @@
7373
return;
7474
}
@@ -99,9 +99,9 @@ diff -urN nginx-1.13.0-orig/src/core/ngx_log.c nginx-1.13.0/src/core/ngx_log.c
9999
return NGX_CONF_ERROR;
100100
#endif
101101

102-
diff -urN nginx-1.13.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.0/src/http/modules/ngx_http_autoindex_module.c
103-
--- nginx-1.13.0-orig/src/http/modules/ngx_http_autoindex_module.c 2017-04-25 17:13:00.646648701 -0400
104-
+++ nginx-1.13.0/src/http/modules/ngx_http_autoindex_module.c 2017-04-25 17:13:19.836292484 -0400
102+
diff -urN nginx-1.13.2-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.13.2/src/http/modules/ngx_http_autoindex_module.c
103+
--- nginx-1.13.2-orig/src/http/modules/ngx_http_autoindex_module.c 2017-07-07 00:55:54.212396434 +0200
104+
+++ nginx-1.13.2/src/http/modules/ngx_http_autoindex_module.c 2017-07-07 01:20:14.266502368 +0200
105105
@@ -445,9 +445,11 @@
106106
;
107107

@@ -177,9 +177,9 @@ diff -urN nginx-1.13.0-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.13.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.0/src/http/ngx_http_header_filter_module.c
181-
--- nginx-1.13.0-orig/src/http/ngx_http_header_filter_module.c 2017-04-25 17:13:00.655648533 -0400
182-
+++ nginx-1.13.0/src/http/ngx_http_header_filter_module.c 2017-04-25 17:18:05.000000000 -0400
180+
diff -urN nginx-1.13.2-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.2/src/http/ngx_http_header_filter_module.c
181+
--- nginx-1.13.2-orig/src/http/ngx_http_header_filter_module.c 2017-07-07 00:55:54.220396435 +0200
182+
+++ nginx-1.13.2/src/http/ngx_http_header_filter_module.c 2017-07-07 01:14:19.000000000 +0200
183183
@@ -46,7 +46,7 @@
184184
};
185185

@@ -221,9 +221,9 @@ diff -urN nginx-1.13.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.13.
221221
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
222222

223223
ngx_string("500 Internal Server Error"),
224-
diff -urN nginx-1.13.0-orig/src/http/ngx_http_special_response.c nginx-1.13.0/src/http/ngx_http_special_response.c
225-
--- nginx-1.13.0-orig/src/http/ngx_http_special_response.c 2017-04-25 17:13:00.657648495 -0400
226-
+++ nginx-1.13.0/src/http/ngx_http_special_response.c 2017-04-25 17:22:31.000000000 -0400
224+
diff -urN nginx-1.13.2-orig/src/http/ngx_http_special_response.c nginx-1.13.2/src/http/ngx_http_special_response.c
225+
--- nginx-1.13.2-orig/src/http/ngx_http_special_response.c 2017-07-07 00:55:54.228396435 +0200
226+
+++ nginx-1.13.2/src/http/ngx_http_special_response.c 2017-07-07 01:17:43.000000000 +0200
227227
@@ -19,21 +19,21 @@
228228

229229

@@ -249,7 +249,7 @@ diff -urN nginx-1.13.0-orig/src/http/ngx_http_special_response.c nginx-1.13.0/sr
249249
"</body>" CRLF
250250
"</html>" CRLF
251251
;
252-
@@ -59,273 +59,311 @@
252+
@@ -59,281 +59,320 @@
253253

254254
static char ngx_http_error_301_page[] =
255255
"<html>" CRLF
@@ -656,6 +656,18 @@ diff -urN nginx-1.13.0-orig/src/http/ngx_http_special_response.c nginx-1.13.0/sr
656656
;
657657

658658

659+
static char ngx_http_error_505_page[] =
660+
"<html>" CRLF
661+
-"<head><title>505 HTTP Version Not Supported</title></head>" CRLF
662+
-"<body bgcolor=\"white\">" CRLF
663+
-"<center><h1>505 HTTP Version Not Supported</h1></center>" CRLF
664+
+"<head><title>505 HTTP Version Not Supported</title>" CRLF
665+
+"<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
666+
+"<body>" CRLF
667+
+"<div><h1>505 HTTP Version Not Supported</h1>" CRLF
668+
;
669+
670+
659671
static char ngx_http_error_507_page[] =
660672
"<html>" CRLF
661673
-"<head><title>507 Insufficient Storage</title></head>" CRLF
@@ -668,7 +680,7 @@ diff -urN nginx-1.13.0-orig/src/http/ngx_http_special_response.c nginx-1.13.0/sr
668680
;
669681

670682

671-
@@ -379,8 +417,30 @@
683+
@@ -387,8 +426,30 @@
672684
ngx_null_string, /* 427 */
673685
ngx_null_string, /* 428 */
674686
ngx_string(ngx_http_error_429_page),
@@ -700,10 +712,10 @@ diff -urN nginx-1.13.0-orig/src/http/ngx_http_special_response.c nginx-1.13.0/sr
700712
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
701713

702714
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
703-
diff -urN nginx-1.13.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.0/src/http/v2/ngx_http_v2_filter_module.c
704-
--- nginx-1.13.0-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-04-25 17:13:00.660648440 -0400
705-
+++ nginx-1.13.0/src/http/v2/ngx_http_v2_filter_module.c 2017-04-25 17:13:19.869291927 -0400
706-
@@ -139,7 +139,7 @@
715+
diff -urN nginx-1.13.2-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.2/src/http/v2/ngx_http_v2_filter_module.c
716+
--- nginx-1.13.2-orig/src/http/v2/ngx_http_v2_filter_module.c 2017-07-07 00:55:54.239396436 +0200
717+
+++ nginx-1.13.2/src/http/v2/ngx_http_v2_filter_module.c 2017-07-07 01:05:10.000000000 +0200
718+
@@ -143,7 +143,7 @@
707719
ngx_http_core_srv_conf_t *cscf;
708720
u_char addr[NGX_SOCKADDR_STRLEN];
709721

@@ -712,7 +724,7 @@ diff -urN nginx-1.13.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.0
712724
#if (NGX_HTTP_GZIP)
713725
static const u_char accept_encoding[12] =
714726
"\x8b\x84\x84\x2d\x69\x5b\x05\x44\x3c\x86\xaa\x6f";
715-
@@ -446,7 +446,7 @@
727+
@@ -450,7 +450,7 @@
716728

717729
} else {
718730
ngx_log_debug0(NGX_LOG_DEBUG_HTTP, fc->log, 0,
@@ -721,9 +733,9 @@ diff -urN nginx-1.13.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.13.0
721733
}
722734

723735
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
724-
diff -urN nginx-1.13.0-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.0/src/os/unix/ngx_setproctitle.c
725-
--- nginx-1.13.0-orig/src/os/unix/ngx_setproctitle.c 2017-04-25 17:13:00.624649111 -0400
726-
+++ nginx-1.13.0/src/os/unix/ngx_setproctitle.c 2017-04-25 17:13:19.883291667 -0400
736+
diff -urN nginx-1.13.2-orig/src/os/unix/ngx_setproctitle.c nginx-1.13.2/src/os/unix/ngx_setproctitle.c
737+
--- nginx-1.13.2-orig/src/os/unix/ngx_setproctitle.c 2017-07-07 00:55:54.199396434 +0200
738+
+++ nginx-1.13.2/src/os/unix/ngx_setproctitle.c 2017-04-08 23:39:20.000000000 +0200
727739
@@ -89,7 +89,7 @@
728740

729741
ngx_os_argv[1] = NULL;

0 commit comments

Comments
 (0)