Skip to content

Commit bf47ba9

Browse files
committed
bugfix: applied the patch for nginx security advisory (CVE-2016-4450).
also bumped version to 1.9.7.5.
1 parent 3041624 commit bf47ba9

File tree

3 files changed

+23
-1
lines changed

3 files changed

+23
-1
lines changed

patches/patch.2016.write2.txt

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
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+

util/mirror-tarballs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,13 @@ if [ "$answer" = "N" ]; then
3939
echo
4040
fi
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+
4249
echo "$info_txt applying the upstream-pipelining patch for nginx"
4350
patch -p1 < $root/patches/nginx-$main_ver-upstream_pipelining.patch || exit 1
4451
echo

util/ver

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
main_ver=1.9.7
4-
minor_ver=4
4+
minor_ver=5
55
version=$main_ver.$minor_ver
66
echo $version
77

0 commit comments

Comments
 (0)