Merge pull request #869 from Neilpang/dev

Dev
This commit is contained in:
neil authored and GitHub committed 2017-06-05 22:59:41 +08:00
commit d29aa43ba4
1 file changed
+6 -4
+6 -4
View File
@@ -2665,12 +2665,14 @@ _isRealNginxConf() {
_debug "_seg_n" "$_seg_n"
if [ "$(echo "$_seg_n" | _egrep_o "^ *ssl *on *;")" ]; then
if [ "$(echo "$_seg_n" | _egrep_o "^ *ssl *on *;")" ] \
|| [ "$(echo "$_seg_n" | _egrep_o "listen .* ssl[ |;]")" ]; then
_debug "ssl on, skip"
return 1
else
FOUND_REAL_NGINX_CONF_LN=$_fln
_debug3 "found FOUND_REAL_NGINX_CONF_LN" "$FOUND_REAL_NGINX_CONF_LN"
return 0
fi
FOUND_REAL_NGINX_CONF_LN=$_fln
return 0
fi
done
fi
Reference in new issue
Block a user
Blocking a user prevents them from interacting with repositories, such as opening or commenting on pull requests or issues. Learn more about blocking a user.