summaryrefslogtreecommitdiff
path: root/src/mongo/util/net
diff options
context:
space:
mode:
authorBilly Donahue <billy.donahue@mongodb.com>2019-02-13 14:07:04 -0500
committerBilly Donahue <billy.donahue@mongodb.com>2019-02-13 15:26:10 -0500
commitb21647a5e19e5980186e57f77be0b1e0ef92a087 (patch)
tree007f8d67bedc94aa97e8b745887134f1304eacf3 /src/mongo/util/net
parenta5388bd274e0df770457122dc3cef704e60c25ae (diff)
downloadmongo-b21647a5e19e5980186e57f77be0b1e0ef92a087.tar.gz
SERVER-39560 - remove leading blank line on all C++ files
Remove leading comments that are just stating the filename. Move any file-level comments below the copyright banner. Remove leading blank lines.
Diffstat (limited to 'src/mongo/util/net')
-rw-r--r--src/mongo/util/net/cidr.cpp1
-rw-r--r--src/mongo/util/net/cidr.h1
-rw-r--r--src/mongo/util/net/cidr_test.cpp1
-rw-r--r--src/mongo/util/net/dh_openssl.h1
-rw-r--r--src/mongo/util/net/hostandport.cpp1
-rw-r--r--src/mongo/util/net/hostandport.h1
-rw-r--r--src/mongo/util/net/hostandport_test.cpp1
-rw-r--r--src/mongo/util/net/hostname_canonicalization.cpp1
-rw-r--r--src/mongo/util/net/hostname_canonicalization.h1
-rw-r--r--src/mongo/util/net/http_client.h1
-rw-r--r--src/mongo/util/net/http_client_curl.cpp1
-rw-r--r--src/mongo/util/net/http_client_none.cpp1
-rw-r--r--src/mongo/util/net/http_client_winhttp.cpp1
-rw-r--r--src/mongo/util/net/private/socket_poll.cpp1
-rw-r--r--src/mongo/util/net/private/socket_poll.h1
-rw-r--r--src/mongo/util/net/private/ssl_expiration.cpp1
-rw-r--r--src/mongo/util/net/private/ssl_expiration.h1
-rw-r--r--src/mongo/util/net/sock.cpp3
-rw-r--r--src/mongo/util/net/sock.h3
-rw-r--r--src/mongo/util/net/sock_test.cpp1
-rw-r--r--src/mongo/util/net/sockaddr.cpp1
-rw-r--r--src/mongo/util/net/sockaddr.h1
-rw-r--r--src/mongo/util/net/socket_exception.cpp1
-rw-r--r--src/mongo/util/net/socket_exception.h1
-rw-r--r--src/mongo/util/net/socket_utils.cpp1
-rw-r--r--src/mongo/util/net/socket_utils.h1
-rw-r--r--src/mongo/util/net/ssl_manager.h1
-rw-r--r--src/mongo/util/net/ssl_manager_apple.cpp1
-rw-r--r--src/mongo/util/net/ssl_manager_none.cpp1
-rw-r--r--src/mongo/util/net/ssl_manager_openssl.cpp1
-rw-r--r--src/mongo/util/net/ssl_manager_test.cpp1
-rw-r--r--src/mongo/util/net/ssl_manager_windows.cpp1
-rw-r--r--src/mongo/util/net/ssl_options.cpp1
-rw-r--r--src/mongo/util/net/ssl_options.h1
-rw-r--r--src/mongo/util/net/ssl_options_client.cpp1
-rw-r--r--src/mongo/util/net/ssl_options_server.cpp1
-rw-r--r--src/mongo/util/net/ssl_options_test.cpp1
-rw-r--r--src/mongo/util/net/ssl_parameters.cpp1
-rw-r--r--src/mongo/util/net/ssl_stream.cpp38
-rw-r--r--src/mongo/util/net/ssl_types.cpp1
-rw-r--r--src/mongo/util/net/ssl_types.h1
41 files changed, 29 insertions, 53 deletions
diff --git a/src/mongo/util/net/cidr.cpp b/src/mongo/util/net/cidr.cpp
index 6db58c907ea..8e3f5899c42 100644
--- a/src/mongo/util/net/cidr.cpp
+++ b/src/mongo/util/net/cidr.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/cidr.h b/src/mongo/util/net/cidr.h
index b60165bc517..a7dd48a6645 100644
--- a/src/mongo/util/net/cidr.h
+++ b/src/mongo/util/net/cidr.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/cidr_test.cpp b/src/mongo/util/net/cidr_test.cpp
index 74dcd3f60d9..5b140a638a8 100644
--- a/src/mongo/util/net/cidr_test.cpp
+++ b/src/mongo/util/net/cidr_test.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/dh_openssl.h b/src/mongo/util/net/dh_openssl.h
index b32e3a4942c..b9d8afaa7b8 100644
--- a/src/mongo/util/net/dh_openssl.h
+++ b/src/mongo/util/net/dh_openssl.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/hostandport.cpp b/src/mongo/util/net/hostandport.cpp
index eb6b402a05c..6eab3a7aa7d 100644
--- a/src/mongo/util/net/hostandport.cpp
+++ b/src/mongo/util/net/hostandport.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/hostandport.h b/src/mongo/util/net/hostandport.h
index d7b069ef08e..fdadf39d9e1 100644
--- a/src/mongo/util/net/hostandport.h
+++ b/src/mongo/util/net/hostandport.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/hostandport_test.cpp b/src/mongo/util/net/hostandport_test.cpp
index a3f01e559e0..c70c8e7f4ae 100644
--- a/src/mongo/util/net/hostandport_test.cpp
+++ b/src/mongo/util/net/hostandport_test.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/hostname_canonicalization.cpp b/src/mongo/util/net/hostname_canonicalization.cpp
index ae39f103e79..e3710912892 100644
--- a/src/mongo/util/net/hostname_canonicalization.cpp
+++ b/src/mongo/util/net/hostname_canonicalization.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/hostname_canonicalization.h b/src/mongo/util/net/hostname_canonicalization.h
index 81813c45923..99a1fd4444d 100644
--- a/src/mongo/util/net/hostname_canonicalization.h
+++ b/src/mongo/util/net/hostname_canonicalization.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/http_client.h b/src/mongo/util/net/http_client.h
index 9504f6d1fff..be6c5440931 100644
--- a/src/mongo/util/net/http_client.h
+++ b/src/mongo/util/net/http_client.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/http_client_curl.cpp b/src/mongo/util/net/http_client_curl.cpp
index e9fb3271708..18d37d14da3 100644
--- a/src/mongo/util/net/http_client_curl.cpp
+++ b/src/mongo/util/net/http_client_curl.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/http_client_none.cpp b/src/mongo/util/net/http_client_none.cpp
index c71df5ecb39..d3e8f3c58f2 100644
--- a/src/mongo/util/net/http_client_none.cpp
+++ b/src/mongo/util/net/http_client_none.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/http_client_winhttp.cpp b/src/mongo/util/net/http_client_winhttp.cpp
index de095199e2d..94d2ade6f66 100644
--- a/src/mongo/util/net/http_client_winhttp.cpp
+++ b/src/mongo/util/net/http_client_winhttp.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/private/socket_poll.cpp b/src/mongo/util/net/private/socket_poll.cpp
index dbed87e2bf4..28bfed452de 100644
--- a/src/mongo/util/net/private/socket_poll.cpp
+++ b/src/mongo/util/net/private/socket_poll.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/private/socket_poll.h b/src/mongo/util/net/private/socket_poll.h
index a8bec97d138..705633f624b 100644
--- a/src/mongo/util/net/private/socket_poll.h
+++ b/src/mongo/util/net/private/socket_poll.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/private/ssl_expiration.cpp b/src/mongo/util/net/private/ssl_expiration.cpp
index ca1c8b61ae6..3ef6236d2c8 100644
--- a/src/mongo/util/net/private/ssl_expiration.cpp
+++ b/src/mongo/util/net/private/ssl_expiration.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/private/ssl_expiration.h b/src/mongo/util/net/private/ssl_expiration.h
index d7026b01829..fb22505c020 100644
--- a/src/mongo/util/net/private/ssl_expiration.h
+++ b/src/mongo/util/net/private/ssl_expiration.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/sock.cpp b/src/mongo/util/net/sock.cpp
index 311b713c8ae..f56a0a31778 100644
--- a/src/mongo/util/net/sock.cpp
+++ b/src/mongo/util/net/sock.cpp
@@ -1,6 +1,3 @@
-// @file sock.cpp
-
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/sock.h b/src/mongo/util/net/sock.h
index e76adc0139e..071cd2a7ced 100644
--- a/src/mongo/util/net/sock.h
+++ b/src/mongo/util/net/sock.h
@@ -1,6 +1,3 @@
-// @file sock.h
-
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/sock_test.cpp b/src/mongo/util/net/sock_test.cpp
index c2ea570c0a6..77931df8b94 100644
--- a/src/mongo/util/net/sock_test.cpp
+++ b/src/mongo/util/net/sock_test.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/sockaddr.cpp b/src/mongo/util/net/sockaddr.cpp
index 34a926eaf00..819702ddca3 100644
--- a/src/mongo/util/net/sockaddr.cpp
+++ b/src/mongo/util/net/sockaddr.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/sockaddr.h b/src/mongo/util/net/sockaddr.h
index 67f8304de2c..d704f227523 100644
--- a/src/mongo/util/net/sockaddr.h
+++ b/src/mongo/util/net/sockaddr.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/socket_exception.cpp b/src/mongo/util/net/socket_exception.cpp
index 0c059a99601..eaf83cdf04b 100644
--- a/src/mongo/util/net/socket_exception.cpp
+++ b/src/mongo/util/net/socket_exception.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/socket_exception.h b/src/mongo/util/net/socket_exception.h
index 6dc984ac344..17ed5d3701a 100644
--- a/src/mongo/util/net/socket_exception.h
+++ b/src/mongo/util/net/socket_exception.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/socket_utils.cpp b/src/mongo/util/net/socket_utils.cpp
index 3f20807b5aa..556d41edb8c 100644
--- a/src/mongo/util/net/socket_utils.cpp
+++ b/src/mongo/util/net/socket_utils.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/socket_utils.h b/src/mongo/util/net/socket_utils.h
index 7f33526fa1d..2d12f331a0e 100644
--- a/src/mongo/util/net/socket_utils.h
+++ b/src/mongo/util/net/socket_utils.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager.h b/src/mongo/util/net/ssl_manager.h
index a34075d482e..7a8f5889d1b 100644
--- a/src/mongo/util/net/ssl_manager.h
+++ b/src/mongo/util/net/ssl_manager.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager_apple.cpp b/src/mongo/util/net/ssl_manager_apple.cpp
index 6d16d98fae0..c2dc902137f 100644
--- a/src/mongo/util/net/ssl_manager_apple.cpp
+++ b/src/mongo/util/net/ssl_manager_apple.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager_none.cpp b/src/mongo/util/net/ssl_manager_none.cpp
index e568ec82d6d..696ff2f95a5 100644
--- a/src/mongo/util/net/ssl_manager_none.cpp
+++ b/src/mongo/util/net/ssl_manager_none.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager_openssl.cpp b/src/mongo/util/net/ssl_manager_openssl.cpp
index 78da9916ffc..160368bcfd5 100644
--- a/src/mongo/util/net/ssl_manager_openssl.cpp
+++ b/src/mongo/util/net/ssl_manager_openssl.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager_test.cpp b/src/mongo/util/net/ssl_manager_test.cpp
index 8869cbede6f..0614c41445e 100644
--- a/src/mongo/util/net/ssl_manager_test.cpp
+++ b/src/mongo/util/net/ssl_manager_test.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_manager_windows.cpp b/src/mongo/util/net/ssl_manager_windows.cpp
index cfdc226c53f..300461ed977 100644
--- a/src/mongo/util/net/ssl_manager_windows.cpp
+++ b/src/mongo/util/net/ssl_manager_windows.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_options.cpp b/src/mongo/util/net/ssl_options.cpp
index fde6a4fa57f..bc87567cafe 100644
--- a/src/mongo/util/net/ssl_options.cpp
+++ b/src/mongo/util/net/ssl_options.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_options.h b/src/mongo/util/net/ssl_options.h
index 9bbb026ab08..27402e8a923 100644
--- a/src/mongo/util/net/ssl_options.h
+++ b/src/mongo/util/net/ssl_options.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_options_client.cpp b/src/mongo/util/net/ssl_options_client.cpp
index 58be48b7ba3..fb40ebb2bc7 100644
--- a/src/mongo/util/net/ssl_options_client.cpp
+++ b/src/mongo/util/net/ssl_options_client.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_options_server.cpp b/src/mongo/util/net/ssl_options_server.cpp
index 8fdadd085b4..dba0e0f94f7 100644
--- a/src/mongo/util/net/ssl_options_server.cpp
+++ b/src/mongo/util/net/ssl_options_server.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_options_test.cpp b/src/mongo/util/net/ssl_options_test.cpp
index 6a701c58fbc..c85bc240559 100644
--- a/src/mongo/util/net/ssl_options_test.cpp
+++ b/src/mongo/util/net/ssl_options_test.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_parameters.cpp b/src/mongo/util/net/ssl_parameters.cpp
index 74112b58cbe..816b993034c 100644
--- a/src/mongo/util/net/ssl_parameters.cpp
+++ b/src/mongo/util/net/ssl_parameters.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_stream.cpp b/src/mongo/util/net/ssl_stream.cpp
index a99723d4a32..8aec85a3133 100644
--- a/src/mongo/util/net/ssl_stream.cpp
+++ b/src/mongo/util/net/ssl_stream.cpp
@@ -1,12 +1,32 @@
-//
-// asio_ssl.cpp
-// ~~~~~~~~~~~~
-//
-// Copyright (c) 2003-2017 Christopher M. Kohlhoff (chris at kohlhoff dot com)
-//
-// Distributed under the Boost Software License, Version 1.0. (See accompanying
-// file LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
-//
+/**
+ * Copyright (C) 2018-present MongoDB, Inc.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the Server Side Public License, version 1,
+ * as published by MongoDB, Inc.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * Server Side Public License for more details.
+ *
+ * You should have received a copy of the Server Side Public License
+ * along with this program. If not, see
+ * <http://www.mongodb.com/licensing/server-side-public-license>.
+ *
+ * As a special exception, the copyright holders give permission to link the
+ * code of portions of this program with the OpenSSL library under certain
+ * conditions as described in each individual source file and distribute
+ * linked combinations including the program with the OpenSSL library. You
+ * must comply with the Server Side Public License in all respects for
+ * all of the code used other than as permitted herein. If you modify file(s)
+ * with this exception, you may extend this exception to your version of the
+ * file(s), but you are not obligated to do so. If you do not wish to do so,
+ * delete this exception statement from your version. If you delete this
+ * exception statement from all source files in the program, then also delete
+ * it in the license file.
+ */
+
#include "mongo/platform/basic.h"
#include "mongo/config.h"
diff --git a/src/mongo/util/net/ssl_types.cpp b/src/mongo/util/net/ssl_types.cpp
index 09427eb9d4e..1e1af066a29 100644
--- a/src/mongo/util/net/ssl_types.cpp
+++ b/src/mongo/util/net/ssl_types.cpp
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*
diff --git a/src/mongo/util/net/ssl_types.h b/src/mongo/util/net/ssl_types.h
index 7bcca37700e..cd2175df49e 100644
--- a/src/mongo/util/net/ssl_types.h
+++ b/src/mongo/util/net/ssl_types.h
@@ -1,4 +1,3 @@
-
/**
* Copyright (C) 2018-present MongoDB, Inc.
*