File tree Expand file tree Collapse file tree 3 files changed +23
-1
lines changed
Expand file tree Collapse file tree 3 files changed +23
-1
lines changed Original file line number Diff line number Diff line change 1+ --- src/os/unix/ngx_files.c
2+ +++ src/os/unix/ngx_files.c
3+ @@ -183,6 +183,12 @@ ngx_write_chain_to_file(ngx_file_t *file
4+ /* create the iovec and coalesce the neighbouring bufs */
5+
6+ while (cl && vec.nelts < IOV_MAX) {
7+ +
8+ + if (ngx_buf_special(cl->buf)) {
9+ + cl = cl->next;
10+ + continue;
11+ + }
12+ +
13+ if (prev == cl->buf->pos) {
14+ iov->iov_len += cl->buf->last - cl->buf->pos;
15+
Original file line number Diff line number Diff line change @@ -39,6 +39,13 @@ if [ "$answer" = "N" ]; then
3939 echo
4040fi
4141
42+ answer=` $root /util/ver-ge " $main_ver " 1.9.12`
43+ if [ " $answer " = " N" ]; then
44+ echo " $info_txt applying the patch for nginx security advisory (CVE-2016-4450)"
45+ patch -p0 < $root /patches/patch.2016.write2.txt || exit 1
46+ echo
47+ fi
48+
4249echo " $info_txt applying the upstream-pipelining patch for nginx"
4350patch -p1 < $root /patches/nginx-$main_ver -upstream_pipelining.patch || exit 1
4451echo
Original file line number Diff line number Diff line change 11#! /bin/bash
22
33main_ver=1.9.7
4- minor_ver=4
4+ minor_ver=5
55version=$main_ver .$minor_ver
66echo $version
77
You can’t perform that action at this time.
0 commit comments