mirror of
https://github.com/openresty/openresty
synced 2025-02-18 18:09:35 +01:00
bugfix: applied the patch for nginx security advisory (CVE-2016-4450).
also bumped version to 1.9.7.5.
This commit is contained in:
parent
3041624fbc
commit
bf47ba9529
15
patches/patch.2016.write2.txt
Normal file
15
patches/patch.2016.write2.txt
Normal file
@ -0,0 +1,15 @@
|
||||
--- src/os/unix/ngx_files.c
|
||||
+++ src/os/unix/ngx_files.c
|
||||
@@ -183,6 +183,12 @@ ngx_write_chain_to_file(ngx_file_t *file
|
||||
/* create the iovec and coalesce the neighbouring bufs */
|
||||
|
||||
while (cl && vec.nelts < IOV_MAX) {
|
||||
+
|
||||
+ if (ngx_buf_special(cl->buf)) {
|
||||
+ cl = cl->next;
|
||||
+ continue;
|
||||
+ }
|
||||
+
|
||||
if (prev == cl->buf->pos) {
|
||||
iov->iov_len += cl->buf->last - cl->buf->pos;
|
||||
|
@ -39,6 +39,13 @@ if [ "$answer" = "N" ]; then
|
||||
echo
|
||||
fi
|
||||
|
||||
answer=`$root/util/ver-ge "$main_ver" 1.9.12`
|
||||
if [ "$answer" = "N" ]; then
|
||||
echo "$info_txt applying the patch for nginx security advisory (CVE-2016-4450)"
|
||||
patch -p0 < $root/patches/patch.2016.write2.txt || exit 1
|
||||
echo
|
||||
fi
|
||||
|
||||
echo "$info_txt applying the upstream-pipelining patch for nginx"
|
||||
patch -p1 < $root/patches/nginx-$main_ver-upstream_pipelining.patch || exit 1
|
||||
echo
|
||||
|
2
util/ver
2
util/ver
@ -1,7 +1,7 @@
|
||||
#!/bin/bash
|
||||
|
||||
main_ver=1.9.7
|
||||
minor_ver=4
|
||||
minor_ver=5
|
||||
version=$main_ver.$minor_ver
|
||||
echo $version
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user