8000 Merge remote-tracking branch 'origin/devel' into feature/cpp17 · arangodb/arangodb@9fc1548 · GitHub
[go: up one dir, main page]
Skip to content

Commit 9fc1548

Browse files
ObiWahnObiWahn
committed
Merge remote-tracking branch 'origin/devel' into feature/cpp17
* origin/devel: Doc - Update remark about per-database replication (#7891) Doc - Known Issues - new links (#7908) support db._explain with all plans (#7895) JWT base64url encoding (#7899) cppcheck/Scheduler (#7909) multiplex REPLICATION-APPLIER-STATE files for RocksDB engine (#7898) fix compile warnings upgrade bundled curl library to version 7.63 (#7846) Feature/new server infra (#7733) Doc - check_function (#7885) simran (#7881) added AQL function CHECK_DOCUMENT (#7842) added arangorestore option `--cleanup-duplicate-attributes` (#7877) Doc - arangorestore improvements (#7878) added arangorestore options `--number-of-shards` and `--replication-f… (#7869)
2 parents f2ecee8 + e7810e1 commit 9fc1548
  • tool_cb_prg.c
  • tests
  • winbuild
  • curl-7.63.0

    • Some content is hidden

    Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

    3,224 files changed

    +229830
    -61596
    lines changed

    ‎3rdParty/CMakeLists.txt

    Lines changed: 2 additions & 1 deletion
    Original file line numberDiff line numberDiff line change
    @@ -203,14 +203,15 @@ add_definitions(-DCURL_STATICLIB=1)
    203203

    204204
    set(ENABLE_MANUAL OFF CACHE type BOOL)
    205205
    set(BUILD_CURL_EXE OFF CACHE type BOOL)
    206+
    set(BUILD_SHARED_LIBS OFF CACHE type BOOL)
    206207
    set(BUILD_TESTING OFF CACHE type BOOL)
    207208
    set(CURL_STATICLIB ON CACHE type BOOL)
    208209
    set(HTTP_ONLY ON CACHE type BOOL)
    209210
    set(CMAKE_USE_LIBSSH2 OFF CACHE type BOOL)
    210211
    set(CMAKE_USE_OPENSSL ON CACHE type BOOL)
    211212
    # mop: super important...if this is off curl will not handle request timeouts < 1000ms
    212213
    set(ENABLE_THREADED_RESOLVER ON CACHE type BOOL)
    213-
    set(CURL_VERSION "7.57.0")
    214+
    set(CURL_VERSION "7.63.0")
    214215
    set(CURL_SRC_DIR "${CMAKE_CURRENT_SOURCE_DIR}/curl/curl-${CURL_VERSION}")
    215216
    add_subdirectory(${CURL_SRC_DIR})
    216217

    ‎3rdParty/README_maintainers.md

    Copy file name to clipboard
    Lines changed: 17 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -26,6 +26,23 @@ HTTP client library https://curl.haxx.se/
    2626

    2727
    We apply several build system patches to avoid unneccessary recompiles, bugfixes.
    2828

    29+
    For example, we commented out curl's check for nroff to avoid documentation
    30+
    building (and complaining about it on Windows).
    31+
    32+
    We also deactivated some of curl's install CMake commands, as we don't need
    33+
    anything installed (apart from that the vanilla curl install commands don't work
    34+
    when compiled as part of ArangoDB).
    35+
    36+
    We also disabled adding the OpenSSL libraries via the following command:
    37+
    38+
    list(APPEND CURL_LIBS OpenSSL::SSL OpenSSL::Crypto)
    39+
    40+
    and instead are using the command
    41+
    42+
    list(APPEND CURL_LIBS ${OPENSSL_LIBRARIES})
    43+
    44+
    from the previous version of curl's CMake file. When not applying this change,
    45+
    the static builds try to look for libssl.so, which will not work.
    2946

    3047
    ## date
    3148

    ‎3rdParty/curl/curl-7.57.0/.dir-locals.el

    Lines changed: 0 additions & 10 deletions
    This file was deleted.

    ‎3rdParty/curl/curl-7.57.0/.gitattributes

    Lines changed: 0 additions & 7 deletions
    This file was deleted.

    ‎3rdParty/curl/curl-7.57.0/.github/CONTRIBUTING.md

    Lines changed: 0 additions & 23 deletions
    This file was deleted.

    ‎3rdParty/curl/curl-7.57.0/.github/ISSUE_TEMPLATE

    Lines changed: 0 additions & 16 deletions
    This file was deleted.

    ‎3rdParty/curl/curl-7.57.0/.github/stale.yml

    Lines changed: 0 additions & 17 deletions
    This file was deleted.

    ‎3rdParty/curl/curl-7.57.0/.gitignore

    Lines changed: 0 additions & 58 deletions
    This file was deleted.

    ‎3rdParty/curl/curl-7.57.0/.mailmap

    Lines changed: 0 additions & 26 deletions
    This file was deleted.

    0 commit comments

    Comments
     (0)
    0