Open Source alternative to Algolia + Pinecone and an Easier-to-Use alternative to ElasticSearch ⚡ 🔍 ✨ Fast, typo tolerant, in-memory fuzzy Search Engine for building delightful search experiences
C++ algoliadatastoreelasticsearchenterprise-searchfacetingfull-text-searchfuzzy-searchgeosearchin-memoryinstantsearchmerchandisingpineconesearchsearch-enginesemantic-searchsimilarity-searchsite-searchsynonymstypo-tolerancevector-search
Upgrade to OpenSSL 1.1.1
kishorencd857e1064601
diff --git a/CMakeLists.txt b/CMakeLists.txtindex e48ae527..54691b45 100644--- a/CMakeLists.txt+++ b/CMakeLists.txt@@ -21,7 +21,7 @@ if (APPLE)add_definitions(-D__GLIBCXX__)# Prefer brew installated libraries- set(ENV{OPENSSL_ROOT_DIR} /usr/local/opt/openssl)+ set(OPENSSL_ROOT_DIR /usr/local/opt/[email protected])set(SNAPPY_ROOT_DIR /usr/local/opt/snappy)set(ZLIB_ROOT /usr/local/opt/zlib)set(CMAKE_PREFIX_PATH /usr/local/opt/curl-openssl /usr/local/opt/icu4c)@@ -35,12 +35,14 @@ ELSE()SET(CMAKE_FIND_LIBRARY_SUFFIXES .a)ENDIF()-FIND_PACKAGE(OpenSSL 1.0.2 REQUIRED)+FIND_PACKAGE(OpenSSL 1.1.1 REQUIRED)FIND_PACKAGE(Snappy REQUIRED)FIND_PACKAGE(ZLIB REQUIRED)FIND_PACKAGE(CURL REQUIRED)FIND_PACKAGE(ICU REQUIRED)+message("OpenSSL library: ${OPENSSL_LIBRARIES}")+include(cmake/For.cmake)include(cmake/H2O.cmake)include(cmake/RocksDB.cmake)@@ -138,8 +140,8 @@ if(NOT APPLE)endif()set(ICU_ALL_LIBRARIES ${ICU_I18N_LIBRARIES} ${ICU_LIBRARIES} ${ICU_DATA_LIBRARIES})-set(CORE_LIBS h2o-evloop iconv ${CURL_LIBRARIES} for ${ICU_ALL_LIBRARIES} ${G3LOGGER_LIBRARIES} pthread- ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} dl ${STD_LIB})+set(CORE_LIBS h2o-evloop iconv ${CURL_LIBRARIES} for ${ICU_ALL_LIBRARIES} ${G3LOGGER_LIBRARIES}+ ${ROCKSDB_LIBS} ${OPENSSL_LIBRARIES} pthread dl ${STD_LIB})target_link_libraries(typesense-core ${CORE_LIBS})target_link_libraries(typesense-server ${CORE_LIBS})diff --git a/build.sh b/build.shindex 02b52f30..32cfd38e 100755--- a/build.sh+++ b/build.sh@@ -24,7 +24,7 @@ ficmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION -DCMAKE_BUILD_TYPE=Release -H$PROJECT_DIR -B$PROJECT_DIR/$BUILD_DIRmake -C $PROJECT_DIR/$BUILD_DIR-if [[ "$@" == *"--create-binary"* ]]; then+if [[ "$@" == *"--package-binary"* ]]; thenOS_FAMILY=$(echo `uname` | awk '{print tolower($0)}')RELEASE_NAME=typesense-server-$TYPESENSE_VERSION-$OS_FAMILY-amd64printf `md5sum $PROJECT_DIR/$BUILD_DIR/typesense-server | cut -b-32` > $PROJECT_DIR/$BUILD_DIR/typesense-server.md5.txtdiff --git a/docker-build.sh b/docker-build.shindex 74e4158e..aa6641d9 100755--- a/docker-build.sh+++ b/docker-build.sh@@ -21,14 +21,14 @@ if [[ "$@" == *"--depclean"* ]]; thenmkdir $PROJECT_DIR/external-$SYSTEM_NAMEfi-echo "Creating development image..."-docker build --file $PROJECT_DIR/docker/development.Dockerfile --tag typesense/typesense-development:latest $PROJECT_DIR/docker+#echo "Creating development image..."+#docker build --file $PROJECT_DIR/docker/development.Dockerfile --tag typesense/typesense-development:latest $PROJECT_DIR/dockerecho "Building Typesense $TYPESENSE_VERSION..."docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development cmake -DTYPESENSE_VERSION=$TYPESENSE_VERSION \-DCMAKE_BUILD_TYPE=Release -H/typesense -B/typesense/$BUILD_DIR-docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development make -C/typesense/$BUILD_DIR+docker run -it -v $PROJECT_DIR:/typesense typesense/typesense-development make typesense-server typesense-core -C/typesense/$BUILD_DIRif [[ "$@" == *"--build-deploy-image"* ]]; thenecho "Creating deployment image for Typesense $TYPESENSE_VERSION server ..."@@ -38,7 +38,7 @@ if [[ "$@" == *"--build-deploy-image"* ]]; then$PROJECT_DIR/$BUILD_DIRfi-if [[ "$@" == *"--create-binary"* ]]; then+if [[ "$@" == *"--package-binary"* ]]; thenOS_FAMILY=linuxRELEASE_NAME=typesense-server-$TYPESENSE_VERSION-$OS_FAMILY-amd64printf `md5sum $PROJECT_DIR/$BUILD_DIR/typesense-server | cut -b-32` > $PROJECT_DIR/$BUILD_DIR/typesense-server.md5.txtdiff --git a/docker/development.Dockerfile b/docker/development.Dockerfileindex 2aff9449..80c18e45 100644--- a/docker/development.Dockerfile+++ b/docker/development.Dockerfile@@ -16,33 +16,33 @@ RUN apt-get install -y python-software-properties \libidn11 \git-RUN curl -L -o /opt/openssl-1.0.2s.tar.gz https://openssl.org/source/openssl-1.0.2s.tar.gz-RUN tar -C /opt -xvzf /opt/openssl-1.0.2s.tar.gz-RUN cd /opt/openssl-1.0.2s && sh ./config --prefix=/usr --openssldir=/usr zlib-dynamic-RUN make -C /opt/openssl-1.0.2s depend-RUN make -C /opt/openssl-1.0.2s -j4-RUN make -C /opt/openssl-1.0.2s install--RUN curl -L -o /opt/cmake-3.15.2-Linux-x86_64.tar.gz https://cmake.org/files/v3.15/cmake-3.15.2-Linux-x86_64.tar.gz+ADD https://cmake.org/files/v3.15/cmake-3.15.2-Linux-x86_64.tar.gz /opt/cmake-3.15.2-Linux-x86_64.tar.gzRUN tar -C /opt -xvzf /opt/cmake-3.15.2-Linux-x86_64.tar.gzRUN cp -r /opt/cmake-3.15.2-Linux-x86_64/* /usr-RUN curl -L -o /opt/snappy_1.1.3.orig.tar.gz https://launchpad.net/ubuntu/+archive/primary/+files/snappy_1.1.3.orig.tar.gz+ADD https://launchpad.net/ubuntu/+archive/primary/+files/snappy_1.1.3.orig.tar.gz /opt/snappy_1.1.3.orig.tar.gzRUN tar -C /opt -xf /opt/snappy_1.1.3.orig.tar.gz-RUN mkdir /opt/snappy-1.1.3/build && cd /opt/snappy-1.1.3/build && ../configure && make && make install+RUN mkdir /opt/snappy-1.1.3/build && cd /opt/snappy-1.1.3/build && ../configure && make -j8 && make install-RUN curl -L -o /opt/icu4c-61_1-src.tgz https://ssl.icu-project.org/files/icu4c/61.1/icu4c-61_1-src.tgz+ADD https://ssl.icu-project.org/files/icu4c/61.1/icu4c-61_1-src.tgz /opt/icu4c-61_1-src.tgzRUN tar -C /opt -xf /opt/icu4c-61_1-src.tgzRUN cd /opt/icu/source && echo "#define U_DISABLE_RENAMING 1" >> common/unicode/uconfig.h && \echo "#define U_STATIC_IMPLEMENTATION 1" >> common/unicode/uconfig.h && \echo "#define U_USING_ICU_NAMESPACE 0" >> common/unicode/uconfig.hRUN cd /opt/icu/source && ./runConfigureICU Linux --disable-samples --disable-tests --enable-static \- --disable-shared --disable-renaming && make && make install+ --disable-shared --disable-renaming && make -j8 && make install-RUN curl -L -o /opt/curl-7.65.3.tar.gz https://github.com/curl/curl/releases/download/curl-7_65_3/curl-7.65.3.tar.gz+ADD https://openssl.org/source/openssl-1.1.1d.tar.gz /opt/openssl-1.1.1d.tar.gz+RUN tar -C /opt -xvzf /opt/openssl-1.1.1d.tar.gz+RUN cd /opt/openssl-1.1.1d && sh ./config --prefix=/usr/local --openssldir=/usr/local zlib+RUN make -C /opt/openssl-1.1.1d depend+RUN make -C /opt/openssl-1.1.1d -j8+RUN make -C /opt/openssl-1.1.1d install++ADD https://github.com/curl/curl/releases/download/curl-7_65_3/curl-7.65.3.tar.gz /opt/curl-7.65.3.tar.gzRUN tar -C /opt -xf /opt/curl-7.65.3.tar.gz-RUN cd /opt/curl-7.65.3 && LIBS="-ldl -lpthread" ./configure --disable-shared --with-ssl=/usr \---without-ca-bundle --without-ca-path && make && make install+RUN cd /opt/curl-7.65.3 && LIBS="-ldl -lpthread" ./configure --disable-shared --with-ssl=/usr/local \+--without-ca-bundle --without-ca-path && make -j8 && make installENV CC /usr/local/gcc-6.4.0/bin/gccENV CXX /usr/local/gcc-6.4.0/bin/g++diff --git a/docker/ubuntu-10-04-gcc.Dockerfile b/docker/ubuntu-10-04-gcc.Dockerfileindex 4c6ca433..1e03b0c9 100644--- a/docker/ubuntu-10-04-gcc.Dockerfile+++ b/docker/ubuntu-10-04-gcc.Dockerfile@@ -19,22 +19,7 @@ RUN apt-get update && apt-get install -y \bison \zlib1g-dev-RUN mkdir -p /etc/ssl/certs-ADD https://curl.haxx.se/ca/cacert.pem /etc/ssl/certs/cacert.pem--ADD https://openssl.org/source/openssl-1.0.2k.tar.gz /opt/openssl-1.0.2k.tar.gz-RUN tar -C /opt -xvzf /opt/openssl-1.0.2k.tar.gz-RUN cd /opt/openssl-1.0.2k && sh ./config --prefix=/usr/local --openssldir=/usr/local zlib-dynamic-RUN make -C /opt/openssl-1.0.2k depend-RUN make -C /opt/openssl-1.0.2k -j4-RUN make -C /opt/openssl-1.0.2k install--ADD https://github.com/curl/curl/releases/download/curl-7_55_1/curl-7.55.1.tar.bz2 /opt/curl-7.55.1.tar.bz2-RUN tar -C /opt -xf /opt/curl-7.55.1.tar.bz2-RUN cd /opt/curl-7.55.1 && LIBS="-ldl -lpthread" ./configure --disable-shared --with-ssl=/usr/local \---with-ca-bundle=/etc/ssl/certs/cacert.pem && make && make install--RUN curl -L -o /opt/gcc-6.4.0.tar.gz https://ftp.gnu.org/gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.gz+ADD https://ftp.gnu.org/gnu/gcc/gcc-6.4.0/gcc-6.4.0.tar.gz /opt/RUN tar -C /opt -xf /opt/gcc-6.4.0.tar.gzRUN mkdir /opt/gcc-6.4.0/build && cd /opt/gcc-6.4.0/build && ../configure --disable-checking --enable-languages=c,c++ \@@ -46,8 +31,7 @@ RUN cd /opt/gcc-6.4.0/build && make -j8RUN cd /opt/gcc-6.4.0/build && make installRUN apt-get remove -y gcc-RUN rm -rf /opt/gcc-6.4.0 /opt/gcc-6.4.0.tar.gz /opt/openssl-1.0.2k /opt/openssl-1.0.2k.tar.gz \-/opt/curl-7.55.1 /opt/curl-7.55.1.tar.bz2+RUN rm -rf /opt/gcc-6.4.0 /opt/gcc-6.4.0.tar.gzENV PATH /usr/local/gcc-6.4.0/bin/:$PATHENV LD_LIBRARY_PATH /usr/local/gcc-6.4.0/lib64diff --git a/src/http_server.cpp b/src/http_server.cppindex 73e3352a..76e07baf 100644--- a/src/http_server.cpp+++ b/src/http_server.cpp@@ -53,9 +53,6 @@ void HttpServer::on_accept(h2o_socket_t *listener, const char *err) {}int HttpServer::setup_ssl(const char *cert_file, const char *key_file) {- SSL_library_init();- SSL_load_error_strings();-accept_ctx->ssl_ctx = SSL_CTX_new(SSLv23_server_method());// As recommended by: