Braiser BUILD

.gitignore

@@ -7,14 +7,16 @@ Makefile.in
 .libs
 .deps
 stamp-h1
-folly-config.h
+# This is bazel oriented so we are actually checking in an appropriate
+# folly-config file.
+# folly-config.h
 _configs.sed
 aclocal.m4
 autom4te.cache
 build-aux
 libtool
 folly/test/gtest
-folly/folly-config.h
+# folly/folly-config.h
 folly/**/test/*_benchmark
 folly/**/test/*.log
 folly/**/test/*_test

folly/folly-config.h

@@ -0,0 +1,76 @@
+#pragma once
+
+#ifdef __APPLE__
+#include <TargetConditionals.h> // @manual
+#endif
+
+#if !defined(FOLLY_MOBILE)
+#if defined(__ANDROID__) || \
+    (defined(__APPLE__) &&  \
+     (TARGET_IPHONE_SIMULATOR || TARGET_OS_SIMULATOR || TARGET_OS_IPHONE))
+#define FOLLY_MOBILE 1
+#else
+#define FOLLY_MOBILE 0
+#endif
+#endif // FOLLY_MOBILE
+
+#define FOLLY_HAVE_PTHREAD 1
+#define FOLLY_HAVE_PTHREAD_ATFORK 1
+
+#define FOLLY_HAVE_LIBGFLAGS 1
+/* #undef FOLLY_UNUSUAL_GFLAGS_NAMESPACE */
+#define FOLLY_GFLAGS_NAMESPACE gflags
+
+#define FOLLY_HAVE_LIBGLOG 1
+
+/* #undef FOLLY_USE_JEMALLOC */
+
+#if __has_include(<features.h>)
+#include <features.h>
+#endif
+
+#define FOLLY_HAVE_ACCEPT4 1
+#define FOLLY_HAVE_GETRANDOM 1
+#define FOLLY_HAVE_PREADV 1
+#define FOLLY_HAVE_PWRITEV 1
+#define FOLLY_HAVE_CLOCK_GETTIME 1
+#define FOLLY_HAVE_PIPE2 1
+#define FOLLY_HAVE_SENDMMSG 1
+#define FOLLY_HAVE_RECVMMSG 1
+#define FOLLY_HAVE_OPENSSL_ASN1_TIME_DIFF 1
+
+#define FOLLY_HAVE_IFUNC 1
+#define FOLLY_HAVE_STD__IS_TRIVIALLY_COPYABLE 1
+#define FOLLY_HAVE_UNALIGNED_ACCESS 1
+#define FOLLY_HAVE_VLA 1
+#define FOLLY_HAVE_WEAK_SYMBOLS 1
+#define FOLLY_HAVE_LINUX_VDSO 1
+#define FOLLY_HAVE_MALLOC_USABLE_SIZE 1
+/* #undef FOLLY_HAVE_INT128_T */
+#define FOLLY_HAVE_WCHAR_SUPPORT 1
+#define FOLLY_HAVE_EXTRANDOM_SFMT19937 1
+#define HAVE_VSNPRINTF_ERRORS 1
+
+#define FOLLY_HAVE_LIBUNWIND 1
+#define FOLLY_HAVE_DWARF 1
+#define FOLLY_HAVE_ELF 1
+#define FOLLY_HAVE_SWAPCONTEXT 1
+#define FOLLY_HAVE_BACKTRACE 1
+#define FOLLY_USE_SYMBOLIZER 1
+#define FOLLY_DEMANGLE_MAX_SYMBOL_SIZE 1024
+
+#define FOLLY_HAVE_SHADOW_LOCAL_WARNINGS 1
+
+#define FOLLY_HAVE_LIBLZ4 0
+#define FOLLY_HAVE_LIBLZMA 1
+#define FOLLY_HAVE_LIBSNAPPY 0
+#define FOLLY_HAVE_LIBZ 1
+#define FOLLY_HAVE_LIBZSTD 1
+#define FOLLY_HAVE_LIBBZ2 0
+
+#define FOLLY_LIBRARY_SANITIZE_ADDRESS 0
+
+#define FOLLY_SUPPORT_SHARED_LIBRARY 0
+
+#define FOLLY_HAVE_LIBRT 0
+

folly/io/async/ssl/OpenSSLUtils.cpp

@@ -275,19 +275,12 @@ int OpenSSLUtils::getBioShouldRetryWrite(int r) {
 }
 
 void OpenSSLUtils::setBioAppData(BIO* b, void* ptr) {
-#ifdef OPENSSL_IS_BORINGSSL
-  BIO_set_callback_arg(b, static_cast<char*>(ptr));
-#else
+  // Note(BRAISER) This method and the one below have been added to BORINGSSL very recently.
   BIO_set_app_data(b, ptr);
-#endif
 }
 
 void* OpenSSLUtils::getBioAppData(BIO* b) {
-#ifdef OPENSSL_IS_BORINGSSL
-  return BIO_get_callback_arg(b);
-#else
   return BIO_get_app_data(b);
-#endif
 }
 
 NetworkSocket OpenSSLUtils::getBioFd(BIO* b) {