From b8f4b5542641fbbe14c5283609c0b2664597e2ce Mon Sep 17 00:00:00 2001 From: spacewander Date: Mon, 3 Jun 2019 12:14:36 +0800 Subject: [PATCH] rename ssl_pending_session.patch to ssl_sess_cb_yield.patch since Nginx 1.15.8 --- ...n.patch => nginx-1.15.8-ssl_sess_cb_yield.patch} | 0 util/mirror-tarballs | 13 ++++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) rename patches/{nginx-1.15.8-ssl_pending_session.patch => nginx-1.15.8-ssl_sess_cb_yield.patch} (100%) diff --git a/patches/nginx-1.15.8-ssl_pending_session.patch b/patches/nginx-1.15.8-ssl_sess_cb_yield.patch similarity index 100% rename from patches/nginx-1.15.8-ssl_pending_session.patch rename to patches/nginx-1.15.8-ssl_sess_cb_yield.patch diff --git a/util/mirror-tarballs b/util/mirror-tarballs index 8e8a306..1bfedd8 100755 --- a/util/mirror-tarballs +++ b/util/mirror-tarballs @@ -410,9 +410,16 @@ echo "$info_txt applying the ssl_cert_cb_yield.patch patch to nginx" patch -p1 < $root/patches/nginx-$main_ver-ssl_cert_cb_yield.patch echo -echo "$info_txt applying the ssl_pending_session.patch patch to nginx" -patch -p1 < $root/patches/nginx-$main_ver-ssl_pending_session.patch -echo +answer=`$root/util/ver-ge "$main_ver" 1.15.8` +if [ "$answer" = "N" ]; then + echo "$info_txt applying the ssl_pending_session.patch patch to nginx" + patch -p1 < $root/patches/nginx-$main_ver-ssl_pending_session.patch + echo +else + echo "$info_txt applying the ssl_sess_cb_yield.patch patch to nginx" + patch -p1 < $root/patches/nginx-$main_ver-ssl_sess_cb_yield.patch + echo +fi echo "$info_txt applying the upstream_timeout_fields patch for nginx" patch -p1 < $root/patches/nginx-$main_ver-upstream_timeout_fields.patch || exit 1