Skip to content

Commit c588f30

Browse files
andyoneandyone
committed
Merge pull request #4 from essentialkaos/develop
Version 1.10.0
2 parents 7755ea6 + b328583 commit c588f30

File tree

8 files changed

+223
-101
lines changed

8 files changed

+223
-101
lines changed

‎SOURCES/bots.conf‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
# Usage:
3+
# include xtra/bots.conf
4+
# if ($is_scanbot = 1) {
5+
# return 403;
6+
# }
7+
8+
map $http_user_agent $is_scanbot {
9+
default 0;
10+
~*(google|bing|yandex|msnbot) 1;
11+
~*(AltaVista|Googlebot|Slurp|BlackWidow|Bot|ChinaClaw|Custo|DISCo|Download|Demon|eCatch|EirGrabber|EmailSiphon|EmailWolf|SuperHTTP|Surfbot|WebWhacker) 1;
12+
~*(Express|WebPictures|ExtractorPro|EyeNetIE|FlashGet|GetRight|GetWeb!|Go!Zilla|Go-Ahead-Got-It|GrabNet|Grafula|HMView|Go!Zilla|Go-Ahead-Got-It) 1;
13+
~*(rafula|HMView|HTTrack|Stripper|Sucker|Indy|InterGET|Ninja|JetCar|Spider|larbin|LeechFTP|Downloader|tool|Navroad|NearSite|NetAnts|tAkeOut|WWWOFFLE) 1;
14+
~*(GrabNet|NetSpider|Vampire|NetZIP|Octopus|Offline|PageGrabber|Foto|pavuk|pcBrowser|RealDownload|ReGet|SiteSnagger|SmartDownload|SuperBot|WebSpider) 1;
15+
~*(Teleport|VoidEYE|Collector|WebAuto|WebCopier|WebFetch|WebGo|WebLeacher|WebReaper|WebSauger|eXtractor|Quester|WebStripper|WebZIP|Wget|Widow|Zeus) 1;
16+
~*(Twengabot|htmlparser|libwww|Python|perl|urllib|scan|email|Pyth|PyQ|WebCollector|WebCopy|webcraw) 1;
17+
}

‎SOURCES/pagespeed_access.pswd‎ renamed to ‎SOURCES/pagespeed-access.pswd‎

File renamed without changes.

‎SOURCES/pagespeed-config-1.9.32.14.patch‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
diff -urN ngx_pagespeed-release-1.9.32.14-beta-orig/config ngx_pagespeed-release-1.9.32.14-beta/config
2+
--- ngx_pagespeed-release-1.9.32.14-beta-orig/config 2016-04-27 12:24:06.986198238 -0400
3+
+++ ngx_pagespeed-release-1.9.32.14-beta/config 2016-04-27 12:24:38.000000000 -0400
4+
@@ -195,10 +195,10 @@
5+
6+
# Make pagespeed run immediately before gzip.
7+
HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES |\
8+
- sed "s/$HTTP_GZIP_FILTER_MODULE/$HTTP_GZIP_FILTER_MODULE $ngx_addon_name/")
9+
+ sed "s/ngx_http_gzip_filter_module/ngx_http_gzip_filter_module $ngx_addon_name/")
10+
# Make the etag header filter run immediately after gzip.
11+
HTTP_FILTER_MODULES=$(echo $HTTP_FILTER_MODULES |\
12+
- sed "s/$HTTP_GZIP_FILTER_MODULE/ngx_pagespeed_etag_filter $HTTP_GZIP_FILTER_MODULE/")
13+
+ sed "s/ngx_http_gzip_filter_module/ngx_pagespeed_etag_filter ngx_http_gzip_filter_module/")
14+
CORE_LIBS="$CORE_LIBS $pagespeed_libs"
15+
CORE_INCS="$CORE_INCS $pagespeed_include"
16+
echo "List of modules (in reverse order of applicability): "$HTTP_FILTER_MODULES

‎SOURCES/pagespeed_enabled.conf‎ renamed to ‎SOURCES/pagespeed-enabled.conf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ location /pagespeed {
2323
deny all;
2424

2525
auth_basic "PageSpeed Private Area";
26-
auth_basic_user_file xtra/pagespeed_access.pswd;
26+
auth_basic_user_file xtra/pagespeed-access.pswd;
2727
}
2828

2929
###############################################################################

‎SOURCES/webkaos.conf‎

Lines changed: 25 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,25 @@ http {
4343
'$status $body_bytes_sent "$http_referer" '
4444
'"$http_user_agent" "$http_x_forwarded_for"';
4545

46-
log_format upsteram '$remote_addr - [$time_local] "$request" '
47-
'$status $body_bytes_sent '
48-
'"$http_x_forwarded_for" "$http_referer" $host '
49-
'$request_time $upstream_response_time '
50-
'$upstream_addr - $upstream_status ';
46+
log_format extended '$remote_addr - [$time_local] "$request" '
47+
'$status $body_bytes_sent '
48+
'"$http_x_forwarded_for" "$http_referer" $host '
49+
'$request_time $upstream_response_time '
50+
'$upstream_addr - $upstream_status ';
51+
52+
log_format reflog '$remote_addr - $remote_user [$time_local] '
53+
'"$request" $status $bytes_sent '
54+
'"$http_referer" "$http_user_agent" ';
55+
56+
log_format timed_combined '$remote_addr - $remote_user [$time_local] '
57+
'"$request" $status $body_bytes_sent '
58+
'"$http_x_forwarded_for" "$http_referer" $host'
59+
'"$http_referer" "$http_user_agent" '
60+
'$request_time $upstream_response_time';
61+
62+
log_format vhost_ip_full_format '$remote_addr - $remote_user [$time_local] $host $server_addr $request '
63+
'$status $body_bytes_sent "$http_referer"'
64+
'"$http_user_agent" "$http_x_forwarded_for" $request_time-$upstream_response_time';
5165

5266
access_log /var/log/webkaos/access.log main;
5367

@@ -56,10 +70,12 @@ http {
5670
tcp_nodelay off;
5771
ssi off;
5872

59-
client_body_timeout 15;
60-
client_header_timeout 15;
61-
keepalive_timeout 30;
62-
send_timeout 15;
73+
client_body_timeout 15;
74+
client_header_timeout 15;
75+
client_header_buffer_size 1k;
76+
keepalive_timeout 30;
77+
send_timeout 15;
78+
large_client_header_buffers 4 16k;
6379

6480
server_names_hash_max_size 1024;
6581
server_names_hash_bucket_size {BUCKET_SIZE};

‎SOURCES/webkaos.logrotate‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
/var/log/webkaos/*.log {
1+
/var/log/webkaos/*.log
2+
/var/log/webkaos/*/*.log {
23
daily
34
missingok
45
rotate 62

‎SOURCES/webkaos.patch‎

Lines changed: 112 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -1,44 +1,35 @@
1-
diff -urN nginx-1.9.10-orig/auto/lib/openssl/make nginx-1.9.10/auto/lib/openssl/make
2-
--- nginx-1.9.10-orig/auto/lib/openssl/make 2016-02-02 00:50:21.845000241 +0100
3-
+++ nginx-1.9.10/auto/lib/openssl/make 2014-10-11 13:11:31.000000000 +0200
4-
@@ -41,22 +41,28 @@
5-
;;
6-
7-
*)
8-
+ case $USE_THREADS in
9-
+ NO) OPENSSL_OPT="$OPENSSL_OPT no-threads" ;;
10-
+ *) OPENSSL_OPT="$OPENSSL_OPT threads" ;;
11-
+ esac
12-
+
13-
case $OPENSSL in
1+
diff -urN nginx-1.10.0-orig/auto/lib/openssl/make nginx-1.10.0/auto/lib/openssl/make
2+
--- nginx-1.10.0-orig/auto/lib/openssl/make 2016-04-26 09:31:19.000000000 -0400
3+
+++ nginx-1.10.0/auto/lib/openssl/make 2016-04-27 06:35:03.000000000 -0400
4+
@@ -45,18 +45,18 @@
145
/*) ngx_prefix="$OPENSSL/.openssl" ;;
156
*) ngx_prefix="$PWD/$OPENSSL/.openssl" ;;
167
esac
17-
18-
+ if [ ! -d "$ngx_prefix" ]; then
8+
-
9+
+ if [ ! -d "$ngx_prefix" ]; then
1910
cat << END >> $NGX_MAKEFILE
2011

2112
$OPENSSL/.openssl/include/openssl/ssl.h: $NGX_MAKEFILE
2213
cd $OPENSSL \\
2314
&& if [ -f Makefile ]; then \$(MAKE) clean; fi \\
2415
&& ./config --prefix=$ngx_prefix no-shared $OPENSSL_OPT \\
2516
- && \$(MAKE) \\
26-
- && \$(MAKE) install LIBDIR=lib
27-
+ && \$(MAKE) -j1 \\
28-
+ && \$(MAKE) -j1 install LIBDIR=lib
17+
- && \$(MAKE) install_sw LIBDIR=lib
18+
+ && \$(MAKE) -j1\\
19+
+ && \$(MAKE) -j1 install_sw LIBDIR=lib
2920

3021
END
3122
-
32-
+ fi
23+
+ fi
3324
;;
3425

3526
esac
36-
diff -urN nginx-1.9.10-orig/src/core/nginx.c nginx-1.9.10/src/core/nginx.c
37-
--- nginx-1.9.10-orig/src/core/nginx.c 2016-02-02 00:50:21.870000529 +0100
38-
+++ nginx-1.9.10/src/core/nginx.c 2016-02-03 22:44:23.000000000 +0100
39-
@@ -366,13 +366,13 @@
27+
diff -urN nginx-1.10.0-orig/src/core/nginx.c nginx-1.10.0/src/core/nginx.c
28+
--- nginx-1.10.0-orig/src/core/nginx.c 2016-04-26 09:31:19.000000000 -0400
29+
+++ nginx-1.10.0/src/core/nginx.c 2016-04-27 06:36:46.000000000 -0400
30+
@@ -374,13 +374,13 @@
4031
static void
41-
ngx_show_version_info()
32+
ngx_show_version_info(void)
4233
{
4334
- ngx_write_stderr("nginx version: " NGINX_VER_BUILD NGX_LINEFEED);
4435
+ ngx_write_stderr("webkaos version: " NGINX_VER_BUILD NGX_LINEFEED);
@@ -54,13 +45,13 @@ diff -urN nginx-1.9.10-orig/src/core/nginx.c nginx-1.9.10/src/core/nginx.c
5445
"Options:" NGX_LINEFEED
5546
" -?,-h : this help" NGX_LINEFEED
5647
" -v : show version and exit" NGX_LINEFEED
57-
diff -urN nginx-1.9.10-orig/src/core/nginx.h nginx-1.9.10/src/core/nginx.h
58-
--- nginx-1.9.10-orig/src/core/nginx.h 2016-02-02 00:50:21.871000531 +0100
59-
+++ nginx-1.9.10/src/core/nginx.h 2016-02-03 22:43:38.000000000 +0100
48+
diff -urN nginx-1.10.0-orig/src/core/nginx.h nginx-1.10.0/src/core/nginx.h
49+
--- nginx-1.10.0-orig/src/core/nginx.h 2016-04-26 09:31:19.000000000 -0400
50+
+++ nginx-1.10.0/src/core/nginx.h 2016-04-27 06:35:35.000000000 -0400
6051
@@ -11,7 +11,7 @@
6152

62-
#define nginx_version 1009010
63-
#define NGINX_VERSION "1.9.10"
53+
#define nginx_version 1010000
54+
#define NGINX_VERSION "1.10.0"
6455
-#define NGINX_VER "nginx/" NGINX_VERSION
6556
+#define NGINX_VER "webkaos/" NGINX_VERSION
6657

@@ -75,9 +66,9 @@ diff -urN nginx-1.9.10-orig/src/core/nginx.h nginx-1.9.10/src/core/nginx.h
7566
#define NGX_OLDPID_EXT ".oldbin"
7667

7768

78-
diff -urN nginx-1.9.10-orig/src/core/ngx_log.c nginx-1.9.10/src/core/ngx_log.c
79-
--- nginx-1.9.10-orig/src/core/ngx_log.c 2016-02-02 00:50:21.870000530 +0100
80-
+++ nginx-1.9.10/src/core/ngx_log.c 2016-02-03 22:45:32.000000000 +0100
69+
diff -urN nginx-1.10.0-orig/src/core/ngx_log.c nginx-1.10.0/src/core/ngx_log.c
70+
--- nginx-1.10.0-orig/src/core/ngx_log.c 2016-04-26 09:31:19.000000000 -0400
71+
+++ nginx-1.10.0/src/core/ngx_log.c 2016-04-27 06:37:52.000000000 -0400
8172
@@ -202,9 +202,9 @@
8273
return;
8374
}
@@ -108,10 +99,10 @@ diff -urN nginx-1.9.10-orig/src/core/ngx_log.c nginx-1.9.10/src/core/ngx_log.c
10899
return NGX_CONF_ERROR;
109100
#endif
110101

111-
diff -urN nginx-1.9.10-orig/src/event/ngx_event_openssl.c nginx-1.9.10/src/event/ngx_event_openssl.c
112-
--- nginx-1.9.10-orig/src/event/ngx_event_openssl.c 2016-02-02 00:50:21.855000475 +0100
113-
+++ nginx-1.9.10/src/event/ngx_event_openssl.c 2016-02-03 22:47:09.000000000 +0100
114-
@@ -729,7 +729,7 @@
102+
diff -urN nginx-1.10.0-orig/src/event/ngx_event_openssl.c nginx-1.10.0/src/event/ngx_event_openssl.c
103+
--- nginx-1.10.0-orig/src/event/ngx_event_openssl.c 2016-04-26 09:31:19.000000000 -0400
104+
+++ nginx-1.10.0/src/event/ngx_event_openssl.c 2016-04-27 06:44:07.000000000 -0400
105+
@@ -740,7 +740,7 @@
115106
wbio = SSL_get_wbio((ngx_ssl_conn_t *) ssl_conn);
116107

117108
if (rbio != wbio) {
@@ -120,10 +111,10 @@ diff -urN nginx-1.9.10-orig/src/event/ngx_event_openssl.c nginx-1.9.10/src/event
120111
c->ssl->handshake_buffer_set = 1;
121112
}
122113
}
123-
diff -urN nginx-1.9.10-orig/src/event/ngx_event_openssl.h nginx-1.9.10/src/event/ngx_event_openssl.h
124-
--- nginx-1.9.10-orig/src/event/ngx_event_openssl.h 2016-02-02 00:50:21.856000493 +0100
125-
+++ nginx-1.9.10/src/event/ngx_event_openssl.h 2016-02-03 22:47:31.000000000 +0100
126-
@@ -118,7 +118,8 @@
114+
diff -urN nginx-1.10.0-orig/src/event/ngx_event_openssl.h nginx-1.10.0/src/event/ngx_event_openssl.h
115+
--- nginx-1.10.0-orig/src/event/ngx_event_openssl.h 2016-04-26 09:31:19.000000000 -0400
116+
+++ nginx-1.10.0/src/event/ngx_event_openssl.h 2016-04-27 06:43:05.000000000 -0400
117+
@@ -135,7 +135,8 @@
127118
#define NGX_SSL_BUFFER 1
128119
#define NGX_SSL_CLIENT 2
129120

@@ -133,9 +124,9 @@ diff -urN nginx-1.9.10-orig/src/event/ngx_event_openssl.h nginx-1.9.10/src/event
133124

134125

135126
ngx_int_t ngx_ssl_init(ngx_log_t *log);
136-
diff -urN nginx-1.9.10-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.9.10/src/http/modules/ngx_http_autoindex_module.c
137-
--- nginx-1.9.10-orig/src/http/modules/ngx_http_autoindex_module.c 2016-02-02 00:50:21.861000547 +0100
138-
+++ nginx-1.9.10/src/http/modules/ngx_http_autoindex_module.c 2014-12-29 14:19:39.000000000 +0100
127+
diff -urN nginx-1.10.0-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1.10.0/src/http/modules/ngx_http_autoindex_module.c
128+
--- nginx-1.10.0-orig/src/http/modules/ngx_http_autoindex_module.c 2016-04-26 09:31:19.000000000 -0400
129+
+++ nginx-1.10.0/src/http/modules/ngx_http_autoindex_module.c 2014-12-29 08:19:39.000000000 -0500
139130
@@ -445,9 +445,11 @@
140131
;
141132

@@ -211,9 +202,9 @@ diff -urN nginx-1.9.10-orig/src/http/modules/ngx_http_autoindex_module.c nginx-1
211202
tm.ngx_tm_mday,
212203
months[tm.ngx_tm_mon - 1],
213204
tm.ngx_tm_year,
214-
diff -urN nginx-1.9.10-orig/src/http/ngx_http_header_filter_module.c nginx-1.9.10/src/http/ngx_http_header_filter_module.c
215-
--- nginx-1.9.10-orig/src/http/ngx_http_header_filter_module.c 2016-02-02 00:50:21.866000529 +0100
216-
+++ nginx-1.9.10/src/http/ngx_http_header_filter_module.c 2016-02-03 22:49:43.000000000 +0100
205+
diff -urN nginx-1.10.0-orig/src/http/ngx_http_header_filter_module.c nginx-1.10.0/src/http/ngx_http_header_filter_module.c
206+
--- nginx-1.10.0-orig/src/http/ngx_http_header_filter_module.c 2016-04-26 09:31:20.000000000 -0400
207+
+++ nginx-1.10.0/src/http/ngx_http_header_filter_module.c 2016-04-27 06:52:57.000000000 -0400
217208
@@ -46,7 +46,7 @@
218209
};
219210

@@ -223,9 +214,60 @@ diff -urN nginx-1.9.10-orig/src/http/ngx_http_header_filter_module.c nginx-1.9.1
223214
static char ngx_http_server_full_string[] = "Server: " NGINX_VER CRLF;
224215

225216

226-
diff -urN nginx-1.9.10-orig/src/http/ngx_http_special_response.c nginx-1.9.10/src/http/ngx_http_special_response.c
227-
--- nginx-1.9.10-orig/src/http/ngx_http_special_response.c 2016-02-02 00:50:21.866000529 +0100
228-
+++ nginx-1.9.10/src/http/ngx_http_special_response.c 2016-02-03 23:53:21.000000000 +0100
217+
@@ -95,15 +95,41 @@
218+
ngx_string("414 Request-URI Too Large"),
219+
ngx_string("415 Unsupported Media Type"),
220+
ngx_string("416 Requested Range Not Satisfiable"),
221+
-
222+
- /* ngx_null_string, */ /* "417 Expectation Failed" */
223+
- /* ngx_null_string, */ /* "418 unused" */
224+
- /* ngx_null_string, */ /* "419 unused" */
225+
- /* ngx_null_string, */ /* "420 unused" */
226+
- /* ngx_null_string, */ /* "421 unused" */
227+
- /* ngx_null_string, */ /* "422 Unprocessable Entity" */
228+
- /* ngx_null_string, */ /* "423 Locked" */
229+
- /* ngx_null_string, */ /* "424 Failed Dependency" */
230+
+ ngx_null_string, /* "417 Expectation Failed" */
231+
+ ngx_null_string, /* "418 unused" */
232+
+ ngx_null_string, /* "419 unused" */
233+
+ ngx_null_string, /* "420 unused" */
234+
+ ngx_null_string, /* "421 unused" */
235+
+ ngx_null_string, /* "422 Unprocessable Entity" */
236+
+ ngx_null_string, /* "423 Locked" */
237+
+ ngx_null_string, /* "424 Failed Dependency" */
238+
+ ngx_null_string, /* "425 unused" */
239+
+ ngx_null_string, /* "426 unused" */
240+
+ ngx_null_string, /* "427 unused" */
241+
+ ngx_null_string, /* "428 unused" */
242+
+ ngx_null_string, /* "429 unused" */
243+
+ ngx_null_string, /* "430 unused" */
244+
+ ngx_null_string, /* "431 unused" */
245+
+ ngx_null_string, /* "432 unused" */
246+
+ ngx_null_string, /* "433 unused" */
247+
+ ngx_null_string, /* "434 unused" */
248+
+ ngx_null_string, /* "435 unused" */
249+
+ ngx_null_string, /* "436 unused" */
250+
+ ngx_null_string, /* "437 unused" */
251+
+ ngx_null_string, /* "438 unused" */
252+
+ ngx_null_string, /* "439 unused" */
253+
+ ngx_null_string, /* "440 unused" */
254+
+ ngx_null_string, /* "441 unused" */
255+
+ ngx_null_string, /* "442 unused" */
256+
+ ngx_null_string, /* "443 unused" */
257+
+ ngx_null_string, /* "444 unused" */
258+
+ ngx_null_string, /* "445 unused" */
259+
+ ngx_null_string, /* "446 unused" */
260+
+ ngx_null_string, /* "447 unused" */
261+
+ ngx_null_string, /* "448 unused" */
262+
+ ngx_null_string, /* "449 unused" */
263+
+ ngx_null_string, /* "450 unused" */
264+
+ ngx_string("451 Unavailable For Legal Reasons"),
265+
266+
#define NGX_HTTP_LAST_4XX 417
267+
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
268+
diff -urN nginx-1.10.0-orig/src/http/ngx_http_special_response.c nginx-1.10.0/src/http/ngx_http_special_response.c
269+
--- nginx-1.10.0-orig/src/http/ngx_http_special_response.c 2016-04-26 09:31:20.000000000 -0400
270+
+++ nginx-1.10.0/src/http/ngx_http_special_response.c 2016-02-03 17:53:21.000000000 -0500
229271
@@ -19,14 +19,14 @@
230272

231273

@@ -671,32 +713,30 @@ diff -urN nginx-1.9.10-orig/src/http/ngx_http_special_response.c nginx-1.9.10/sr
671713
#define NGX_HTTP_OFF_5XX (NGX_HTTP_LAST_4XX - 400 + NGX_HTTP_OFF_4XX)
672714

673715
ngx_string(ngx_http_error_494_page), /* 494, request header too large */
674-
diff -urN nginx-1.9.10-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.9.10/src/http/v2/ngx_http_v2_filter_module.c
675-
--- nginx-1.9.10-orig/src/http/v2/ngx_http_v2_filter_module.c 2016-02-02 00:50:21.867000523 +0100
676-
+++ nginx-1.9.10/src/http/v2/ngx_http_v2_filter_module.c 2016-02-03 23:05:38.000000000 +0100
677-
@@ -216,7 +216,7 @@
678-
716+
diff -urN nginx-1.10.0-orig/src/http/v2/ngx_http_v2_filter_module.c nginx-1.10.0/src/http/v2/ngx_http_v2_filter_module.c
717+
--- nginx-1.10.0-orig/src/http/v2/ngx_http_v2_filter_module.c 2016-04-26 09:31:20.000000000 -0400
718+
+++ nginx-1.10.0/src/http/v2/ngx_http_v2_filter_module.c 2016-04-27 08:38:56.000000000 -0400
719+
@@ -143,7 +143,7 @@
720+
#endif
721+
u_char addr[NGX_SOCKADDR_STRLEN];
722+
723+
- static const u_char nginx[5] = "\x84\xaa\x63\x55\xe7";
724+
+ static const u_char nginx[6] = "\x85\xf0\x58\xfa\x8c\xe8";
725+
#if (NGX_HTTP_GZIP)
726+
static const u_char accept_encoding[12] =
727+
"\x8b\x84\x84\x2d\x69\x5b\x05\x44\x3c\x86\xaa\x6f";
728+
@@ -437,7 +437,7 @@
679729
if (r->headers_out.server == NULL) {
680-
len += 1 + clcf->server_tokens ? ngx_http_v2_literal_size(NGINX_VER)
681-
- : ngx_http_v2_literal_size("nginx");
682-
+ : ngx_http_v2_literal_size("webkaos");
683-
}
730+
ngx_log_debug1(NGX_LOG_DEBUG_HTTP, fc->log, 0,
731+
"http2 output header: \"server: %s\"",
732+
- clcf->server_tokens ? NGINX_VER : "nginx");
733+
+ clcf->server_tokens ? NGINX_VER : "webkaos");
684734

685-
if (r->headers_out.date == NULL) {
686-
@@ -412,8 +412,8 @@
687-
pos = ngx_cpymem(pos, NGINX_VER, sizeof(NGINX_VER) - 1);
688-
689-
} else {
690-
- *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("nginx") - 1);
691-
- pos = ngx_cpymem(pos, "nginx", sizeof("nginx") - 1);
692-
+ *pos++ = NGX_HTTP_V2_ENCODE_RAW | (sizeof("webkaos") - 1);
693-
+ pos = ngx_cpymem(pos, "webkaos", sizeof("webkaos") - 1);
694-
}
695-
}
735+
*pos++ = ngx_http_v2_inc_indexed(NGX_HTTP_V2_SERVER_INDEX);
696736

697-
diff -urN nginx-1.9.10-orig/src/os/unix/ngx_setproctitle.c nginx-1.9.10/src/os/unix/ngx_setproctitle.c
698-
--- nginx-1.9.10-orig/src/os/unix/ngx_setproctitle.c 2016-02-02 00:50:21.851000419 +0100
699-
+++ nginx-1.9.10/src/os/unix/ngx_setproctitle.c 2016-02-03 23:06:08.000000000 +0100
737+
diff -urN nginx-1.10.0-orig/src/os/unix/ngx_setproctitle.c nginx-1.10.0/src/os/unix/ngx_setproctitle.c
738+
--- nginx-1.10.0-orig/src/os/unix/ngx_setproctitle.c 2016-04-26 09:31:20.000000000 -0400
739+
+++ nginx-1.10.0/src/os/unix/ngx_setproctitle.c 2016-04-27 07:35:45.000000000 -0400
700740
@@ -89,7 +89,7 @@
701741

702742
ngx_os_argv[1] = NULL;

0 commit comments

Comments
 (0)