From b726a8624772b32c51237c72c7bb93894d99d7f3 Mon Sep 17 00:00:00 2001 From: Lizan Zhou Date: Wed, 8 Feb 2017 13:13:41 -0800 Subject: [PATCH] Revert "Update NGINX to 1.11.9" --- WORKSPACE | 2 +- src/nginx/main/testdata/copyright-expected | 6 +++--- third_party/BUILD | 7 +------ third_party/nginx-tests | 2 +- 4 files changed, 6 insertions(+), 11 deletions(-) diff --git a/WORKSPACE b/WORKSPACE index a00bf3286..cd373850d 100644 --- a/WORKSPACE +++ b/WORKSPACE @@ -30,7 +30,7 @@ ISTIO_PROXY = "76355366e4adc6d4002d69d5aafa57e1606338ee" git_repository( name = "nginx", - commit = "1ff432d2828e6536cd50d917046b85eafc43ed71", # 1.11.9 + commit = "cfce863dbe786e61e0e7a33376906b337da70c19", remote = "https://nginx.googlesource.com/nginx", ) diff --git a/src/nginx/main/testdata/copyright-expected b/src/nginx/main/testdata/copyright-expected index c2a5bdf48..56c20ab86 100644 --- a/src/nginx/main/testdata/copyright-expected +++ b/src/nginx/main/testdata/copyright-expected @@ -286,9 +286,9 @@ NGINX license: ============== /* - * Copyright (C) 2002-2017 Igor Sysoev - * Copyright (C) 2011-2017 Nginx, Inc. - * Copyright (C) 2015-2017 Google Inc. + * Copyright (C) 2002-2016 Igor Sysoev + * Copyright (C) 2011-2016 Nginx, Inc. + * Copyright (C) 2015-2016 Google Inc. * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/third_party/BUILD b/third_party/BUILD index c052b5df1..0e66d782c 100644 --- a/third_party/BUILD +++ b/third_party/BUILD @@ -38,8 +38,6 @@ perl_library( # Nginx test suite containing all of the integration tests # included with Nginx. -# limit_req.t is excluded due to https://nginx-review.googlesource.com/#/c/2522/ - # ssl_sni_reneg.t is excluded from the test suite because boring ssl # does not support renegotiation feature required by the test. @@ -48,10 +46,7 @@ nginx_suite( tags = ["exclusive"], tests = glob( ["nginx-tests/*.t"], - exclude = [ - "nginx-tests/limit_req.t", - "nginx-tests/ssl_sni_reneg.t", - ], + exclude = ["nginx-tests/ssl_sni_reneg.t"], ), deps = [ ":nginx_test", diff --git a/third_party/nginx-tests b/third_party/nginx-tests index d82df5645..62a669ea0 160000 --- a/third_party/nginx-tests +++ b/third_party/nginx-tests @@ -1 +1 @@ -Subproject commit d82df564586ca57405f7a65c8f4587f05d754c88 +Subproject commit 62a669ea06e0140e1fb8014c9e5830691082e281