Skip to content

Commit

Permalink
v1.1.2
Browse files Browse the repository at this point in the history
  • Loading branch information
NevermindExpress committed Nov 28, 2022
1 parent 7b2df42 commit 1a94a75
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 8 deletions.
2 changes: 1 addition & 1 deletion Alyssa.h
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ extern bool HSTS;

// Definition of constant values
static char separator = 1;
static string version = "v1.1.1";
static string version = "v1.1.2";

#ifdef COMPILE_OPENSSL
// SSL stuff
Expand Down
8 changes: 4 additions & 4 deletions Alyssa.rc
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,1,1,0
PRODUCTVERSION 1,1,1,0
FILEVERSION 1,1,2,0
PRODUCTVERSION 1,1,2,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -69,12 +69,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "PEPSIMANTR"
VALUE "FileDescription", "Alyssa HTTP Server Project"
VALUE "FileVersion", "v1.1.1"
VALUE "FileVersion", "v1.1.2"
VALUE "InternalName", "AlyssaHTTP.exe"
VALUE "LegalCopyright", "Copyright (C) 2022 PEPSIMANTR"
VALUE "OriginalFilename", "AlyssaHTTP.exe"
VALUE "ProductName", "Alyssa HTTP Server Project"
VALUE "ProductVersion", "v1.1.1"
VALUE "ProductVersion", "v1.1.2"
END
END
BLOCK "VarFileInfo"
Expand Down
3 changes: 3 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
# Alyssa HTTP Server Changelog
------------------------------

v1.1.2 - 28.11.2022
� Added the forgotten patches on v1.0.2 to SSL code, now SSL also doesn't crash anymore like the plain TCP counterpart.

v1.1.1 - 25.11.2022
� Fixed bugs related to requests to root of any folder and responses with index.html files on that folders (infinite page loadings, browser pretending as binary files and downloads it and etc.).
� Fixed missing file count on directory indexes when there is only one file.
Expand Down
7 changes: 4 additions & 3 deletions Main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -729,7 +729,7 @@ int main()//This is the main server function that fires up the server and listen
SSL* ssl;
ssl = SSL_new(ctx);
SSL_set_fd(ssl, clientSocket);
std::thread t([&client, &clientSocket, &ssl]() {
std::thread t([&client, &clientSocket, ssl]() {
clientInfo cl;
char host[NI_MAXHOST] = { 0 }; // Client's remote name
char service[NI_MAXSERV] = { 0 }; // Service (i.e. port) the client is connect on
Expand All @@ -738,14 +738,15 @@ int main()//This is the main server function that fires up the server and listen
if (logOnScreen) std::cout << host << " connected on port " << ntohs(client.sin_port) << std::endl;//TCP is big endian so convert it back to little endian.

//if (whitelist == "") threads.emplace_back(new std::thread((clientConnection), clientSocket));
if (whitelist == "") { clientConnection(cl); }
if (whitelist == "") { std::thread t((clientConnection_SSL), cl); t.detach(); }
else if (isWhitelisted(host)) {
std::thread t((clientConnection), cl); t.detach();
std::thread t((clientConnection_SSL), cl); t.detach();
}
else {
closesocket(clientSocket); SSL_free(ssl);
}
});
t.detach();
}
}));
}
Expand Down

0 comments on commit 1a94a75

Please sign in to comment.