Relicense from BSD+PATENTS to straight BSD

Reviewed By: afrind Differential Revision: D17871920 fbshipit-source-id: 7a963b296546f667caff759de0470f2258f4ecb9
facebook · Oct 11, 2019 · 6654e0d · 6654e0d
1 parent 54fb4b6
commit 6654e0d
Show file tree

Hide file tree

Showing 516 changed files with 2,515 additions and 2,982 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 cmake_minimum_required(VERSION 3.10)
 include(CheckCXXCompilerFlag)
 

diff --git a/LICENSE b/LICENSE
@@ -2,7 +2,7 @@ BSD License
 
 For Proxygen software
 
-Copyright (c) 2015-present, Facebook, Inc. All rights reserved.
+Copyright (c) Facebook, Inc. and its affiliates. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
 are permitted provided that the following conditions are met:

diff --git a/PATENTS b/PATENTS
diff --git a/build/fbcode_builder_config.py b/build/fbcode_builder_config.py
@@ -1,5 +1,10 @@
 #!/usr/bin/env python
-# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 from __future__ import absolute_import, division, print_function, unicode_literals
 
 import specs.fizz as fizz

diff --git a/cmake/FindZstd.cmake b/cmake/FindZstd.cmake
@@ -1,8 +1,8 @@
-#  Copyright (c) 2018, Facebook, Inc.
-#  All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
 #
-#  This source code is licensed under the BSD-style license found in the
-#  LICENSE file in the root directory of this source tree.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 # - Find zstd
 # Find the zstd compression library and includes

diff --git a/cmake/ProxygenTest.cmake b/cmake/ProxygenTest.cmake
@@ -1,8 +1,8 @@
-#  Copyright (c) 2019, Facebook, Inc.
-#  All rights reserved.
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
 #
-#  This source code is licensed under the BSD-style license found in the
-#  LICENSE file in the root directory of this source tree.
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 option(BUILD_TESTS  "Enable tests" OFF)
 include(CTest)

diff --git a/proxygen/CMakeLists.txt b/proxygen/CMakeLists.txt
@@ -1,3 +1,8 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 add_subdirectory(external)
 add_subdirectory(lib)

diff --git a/proxygen/build.sh b/proxygen/build.sh
@@ -1,5 +1,9 @@
 #!/usr/bin/env bash
-# Copyright (c) Facebook, Inc. and its affiliates. All Rights Reserved
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
 
 ## Run this script to build proxygen and run the tests. If you want to
 ## install proxygen to use in another C++ project on this machine, run

diff --git a/proxygen/external/CMakeLists.txt b/proxygen/external/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 add_library(
     proxygen_http_parser OBJECT
     http_parser/http_parser_cpp.cpp

diff --git a/proxygen/fuzzers/CMakeLists.txt b/proxygen/fuzzers/CMakeLists.txt
@@ -1,9 +1,8 @@
-# Copyright (c) 2019-present, Facebook, Inc.
+# Copyright (c) Facebook, Inc. and its affiliates.
 # All rights reserved.
 #
 # This source code is licensed under the BSD-style license found in the
-# LICENSE file in the root directory of this source tree. An additional grant
-# of patent rights can be found in the PATENTS file in the same directory.
+# LICENSE file in the root directory of this source tree.
 
 function(proxygen_add_fuzzer)
     if(NOT BUILD_FUZZERS)

diff --git a/proxygen/fuzzers/ProxygenHTTP1xFuzzer.cpp b/proxygen/fuzzers/ProxygenHTTP1xFuzzer.cpp
@@ -1,11 +1,9 @@
 /*
- *  Copyright (c) 2019-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <folly/portability/GFlags.h>

diff --git a/proxygen/httpclient/CMakeLists.txt b/proxygen/httpclient/CMakeLists.txt
@@ -1 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 add_subdirectory(samples)
diff --git a/proxygen/httpclient/samples/CMakeLists.txt b/proxygen/httpclient/samples/CMakeLists.txt
@@ -1 +1,7 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 add_subdirectory(curl)
diff --git a/proxygen/httpclient/samples/curl/CMakeLists.txt b/proxygen/httpclient/samples/curl/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 add_library(proxygencurl STATIC CurlClient.cpp)
 target_include_directories(
     proxygencurl PUBLIC

diff --git a/proxygen/httpclient/samples/curl/CurlClient.cpp b/proxygen/httpclient/samples/curl/CurlClient.cpp
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include "CurlClient.h"
 
 #include <iostream>

diff --git a/proxygen/httpclient/samples/curl/CurlClient.h b/proxygen/httpclient/samples/curl/CurlClient.h
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <folly/io/async/EventBase.h>

diff --git a/proxygen/httpclient/samples/curl/CurlClientMain.cpp b/proxygen/httpclient/samples/curl/CurlClientMain.cpp
@@ -1,17 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- *
- *  This is a higly simplified example of an HTTP client. This can be heavily
- *  extended using mechanisms like redirects, transfer encoding, connection
- *  pooling, etc.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <folly/portability/GFlags.h>
 
 #include "proxygen/httpclient/samples/curl/CurlClient.h"

diff --git a/proxygen/httpclient/samples/pricli/CMakeLists.txt b/proxygen/httpclient/samples/pricli/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 add_executable(proxygen_pricli PriCli.cpp)
 target_compile_options(
     proxygen_pricli PRIVATE

diff --git a/proxygen/httpclient/samples/pricli/PriCli.cpp b/proxygen/httpclient/samples/pricli/PriCli.cpp
@@ -1,14 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
- *
- * This example shows how to request high priority resources periodically while
- * a low priority resource request is in flight.
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <folly/portability/GFlags.h>
 
 #include <folly/io/async/EventBase.h>

diff --git a/proxygen/httpserver/CMakeLists.txt b/proxygen/httpserver/CMakeLists.txt
@@ -1,3 +1,9 @@
+# Copyright (c) Facebook, Inc. and its affiliates.
+# All rights reserved.
+#
+# This source code is licensed under the BSD-style license found in the
+# LICENSE file in the root directory of this source tree.
+
 add_library(
     proxygenhttpserver STATIC
     RequestHandlerAdaptor.cpp

diff --git a/proxygen/httpserver/ExMessageHandler.h b/proxygen/httpserver/ExMessageHandler.h
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <proxygen/httpserver/RequestHandler.h>

diff --git a/proxygen/httpserver/Filters.h b/proxygen/httpserver/Filters.h
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <proxygen/httpserver/RequestHandler.h>

diff --git a/proxygen/httpserver/HTTPServer.cpp b/proxygen/httpserver/HTTPServer.cpp
@@ -1,11 +1,9 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
 
 #include <proxygen/httpserver/HTTPServer.h>

diff --git a/proxygen/httpserver/HTTPServer.h b/proxygen/httpserver/HTTPServer.h
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <wangle/ssl/SSLContextConfig.h>

diff --git a/proxygen/httpserver/HTTPServerAcceptor.cpp b/proxygen/httpserver/HTTPServerAcceptor.cpp
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #include <proxygen/httpserver/HTTPServerAcceptor.h>
 
 #include <folly/ExceptionString.h>

diff --git a/proxygen/httpserver/HTTPServerAcceptor.h b/proxygen/httpserver/HTTPServerAcceptor.h
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <proxygen/httpserver/HTTPServer.h>

diff --git a/proxygen/httpserver/HTTPServerOptions.h b/proxygen/httpserver/HTTPServerOptions.h
@@ -1,12 +1,11 @@
 /*
- *  Copyright (c) 2015-present, Facebook, Inc.
- *  All rights reserved.
- *
- *  This source code is licensed under the BSD-style license found in the
- *  LICENSE file in the root directory of this source tree. An additional grant
- *  of patent rights can be found in the PATENTS file in the same directory.
+ * Copyright (c) Facebook, Inc. and its affiliates.
+ * All rights reserved.
  *
+ * This source code is licensed under the BSD-style license found in the
+ * LICENSE file in the root directory of this source tree.
  */
+
 #pragma once
 
 #include <folly/Function.h>