From common-commits-return-81869-archive-asf-public=cust-asf.ponee.io@hadoop.apache.org Thu Apr 26 18:55:43 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 3189B180648 for ; Thu, 26 Apr 2018 18:55:43 +0200 (CEST) Received: (qmail 57041 invoked by uid 500); 26 Apr 2018 16:55:42 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 57032 invoked by uid 99); 26 Apr 2018 16:55:42 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 26 Apr 2018 16:55:42 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A11FDE965C; Thu, 26 Apr 2018 16:55:41 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: weichiu@apache.org To: common-commits@hadoop.apache.org Message-Id: <7e2e07c34d1846db896838cc965f31f5@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: HDFS-13492. Limit httpfs binds to certain IP addresses in branch-2. Contributed by Wei-Chiu Chuang. Date: Thu, 26 Apr 2018 16:55:41 +0000 (UTC) Repository: hadoop Updated Branches: refs/heads/branch-2 33ffc9608 -> a5fc63823 HDFS-13492. Limit httpfs binds to certain IP addresses in branch-2. Contributed by Wei-Chiu Chuang. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a5fc6382 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a5fc6382 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a5fc6382 Branch: refs/heads/branch-2 Commit: a5fc6382351150ec3fede697dbf03a4670264f16 Parents: 33ffc96 Author: Wei-Chiu Chuang Authored: Thu Apr 26 09:55:03 2018 -0700 Committer: Wei-Chiu Chuang Committed: Thu Apr 26 09:55:03 2018 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml | 3 ++- .../hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml | 3 ++- .../hadoop-hdfs-httpfs/src/site/markdown/ServerSetup.md.vm | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5fc6382/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml index 67f2159..f160893 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/server.xml @@ -69,7 +69,8 @@ APR (HTTP/AJP) Connector: /docs/apr.html Define a non-SSL HTTP/1.1 Connector on port ${httpfs.http.port} --> - http://git-wip-us.apache.org/repos/asf/hadoop/blob/a5fc6382/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml index 408d4e3..a85ada9 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml +++ b/hadoop-hdfs-project/hadoop-hdfs-httpfs/src/main/tomcat/ssl-server.xml @@ -68,7 +68,8 @@ This connector uses the JSSE configuration, when using APR, the connector should be using the OpenSSL style configuration described in the APR documentation --> -