Compare commits

..

No commits in common. "f09b261b6241f66ea364e928ae20a5f19dcbc4a3" and "a63d9d1e650de64cc8c7a3a419416a6f29d70492" have entirely different histories.

4 changed files with 2 additions and 16 deletions

1
.envrc
View file

@ -1 +0,0 @@
use nix

View file

@ -89,13 +89,12 @@ int listen_loop(int port_number, backends::backend& be, bool tls) {
socket::anthracite_socket* client_sock; socket::anthracite_socket* client_sock;
if (tls){ if (tls){
socket::openssl_socket* ssl_sock = dynamic_cast<socket::openssl_socket*>(socket); client_sock = new socket::openssl_socket(*dynamic_cast<socket::openssl_socket*>(socket));
client_sock = new socket::openssl_socket(*ssl_sock);
} else { } else {
client_sock = new socket::anthracite_socket(*socket); client_sock = new socket::anthracite_socket(*socket);
} }
std::thread(handle_client, client_sock, std::ref(be), std::ref(fb), std::ref(thread_wait_mutex), std::ref(thread_wait_condvar), std::ref(active_threads)).detach(); std::thread(handle_client, socket, std::ref(be), std::ref(fb), std::ref(thread_wait_mutex), std::ref(thread_wait_condvar), std::ref(active_threads)).detach();
} }
delete socket; delete socket;

View file

@ -1,11 +0,0 @@
{ pkgs ? import <nixpkgs> {} }:
pkgs.mkShell {
nativeBuildInputs = [ pkgs.pkg-config pkgs.openssl pkgs.libgcc pkgs.boost pkgs.cmake ];
shellHook = ''
export OPENSSL_DIR="${pkgs.openssl.dev}"
export PKG_CONFIG_PATH="${pkgs.openssl.dev}/lib/pkgconfig"
export OPENSSL_NO_VENDOR=1
export OPENSSL_LIB_DIR="${pkgs.lib.getLib pkgs.openssl}/lib"
'';
}

View file

@ -7,7 +7,6 @@
#include <sstream> #include <sstream>
#include <unordered_map> #include <unordered_map>
#include <vector> #include <vector>
#include <span>
using namespace anthracite; using namespace anthracite;