Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion WORKSPACE
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ ISTIO_PROXY = "2c9c1af3d6ac5ab4d295444c30acd42599edfcb3"

git_repository(
name = "nginx",
commit = "cfce863dbe786e61e0e7a33376906b337da70c19",
commit = "1ff432d2828e6536cd50d917046b85eafc43ed71", # 1.11.9
remote = "https://nginx.googlesource.com/nginx",
)

Expand Down
6 changes: 3 additions & 3 deletions src/nginx/main/testdata/copyright-expected
Original file line number Diff line number Diff line change
Expand Up @@ -286,9 +286,9 @@ NGINX license:
==============

/*
* Copyright (C) 2002-2016 Igor Sysoev
* Copyright (C) 2011-2016 Nginx, Inc.
* Copyright (C) 2015-2016 Google Inc.
* Copyright (C) 2002-2017 Igor Sysoev
* Copyright (C) 2011-2017 Nginx, Inc.
* Copyright (C) 2015-2017 Google Inc.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
Expand Down
7 changes: 6 additions & 1 deletion third_party/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ 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.

Expand All @@ -46,7 +48,10 @@ nginx_suite(
tags = ["exclusive"],
tests = glob(
["nginx-tests/*.t"],
exclude = ["nginx-tests/ssl_sni_reneg.t"],
exclude = [
"nginx-tests/limit_req.t",
"nginx-tests/ssl_sni_reneg.t",
],
),
deps = [
":nginx_test",
Expand Down
2 changes: 1 addition & 1 deletion third_party/nginx-tests
Submodule nginx-tests updated from 62a669 to d82df5