24H1 Updates (#25)

Author: diznq

80s.sh

@@ -71,8 +71,8 @@ if [ "$(uname -o)" = "Msys" ]; then
   LIBS="$LIBS -lws2_32 -lmswsock -lcrypt32"
 fi
 
-if [ ! -z "$DEBUG_LEVEL" ]; then
-    DEFINES="$DEFINES -S80_DEBUG_LEVEL=$DEBUG_LEVEL"
+if [ "$DEBUG" = "true" ]; then
+    DEFINES="$DEFINES -DS80_DEBUG=1"
     FLAGS="-O2 -ggdb"
 fi
 

90s.sh

@@ -21,7 +21,7 @@ mkdir -p bin
 mkdir -p bin/obj
 
 DEFINES="-DS90_SHARED_ORM"
-LIBS="-lm -ldl -lpthread -lcrypto -lssl"
+LIBS="-lm -ldl -lpthread -lcrypto -lssl -lz -lresolv"
 
 if [ "$(uname -o)" = "Msys" ]; then
   SO_EXT="dll"
@@ -30,9 +30,9 @@ if [ "$(uname -o)" = "Msys" ]; then
   LIBS="$LIBS -lws2_32 -lmswsock -lcrypt32 -liconv"
 fi
 
-if [ "$DEBUG" = "true" ]; then
-    DEFINES="$DEFINES -DS80_DEBUG=1"
-    FLAGS="-O2 -ggdb"
+if [ ! -z "$DEBUG_LEVEL" ]; then
+    DEFINES="$DEFINES -DS80_DEBUG_LEVEL=$DEBUG_LEVEL"
+    FLAGS="-O0 -ggdb"
 else
     FLAGS="$FLAGS -march=native"
 fi
@@ -142,13 +142,15 @@ if [ "$arg" = "pages" ]; then
   fi
 else
   echo "Compiling 90s web server"
-  FLAGS="$FLAGS $DEFINES"
-  xmake "$CXX" "$FLAGS" "$LIBS" "bin/lib80s.a" "$OUT" \
-    src/90s/90s.cpp src/90s/afd.cpp src/90s/context.cpp \
-    src/90s/httpd/environment.cpp src/90s/httpd/render_context.cpp src/90s/httpd/server.cpp \
-    src/90s/util/util.cpp \
-    src/90s/sql/mysql.cpp src/90s/sql/mysql_util.cpp \
-    src/90s/mail/server.cpp src/90s/mail/parser.cpp src/90s/mail/indexed_mail_storage.cpp \
-    src/90s/dns/doh.cpp \
-    src/90s/mail/client.cpp
+    FLAGS="$FLAGS $DEFINES"
+    xmake "$CXX" "$FLAGS" "$LIBS" "bin/lib80s.a" "$OUT" \
+      src/90s/90s.cpp src/90s/afd.cpp src/90s/context.cpp \
+      src/90s/httpd/environment.cpp src/90s/httpd/render_context.cpp src/90s/httpd/server.cpp \
+      src/90s/util/util.cpp \
+      src/90s/sql/mysql.cpp src/90s/sql/mysql_util.cpp \
+      src/90s/storage/disk_storage.cpp\
+      src/90s/dns/doh.cpp \
+      src/90s/dns/resolv.cpp \
+      src/90s/httpd/client.cpp \
+      src/90s/actors/actor.cpp
 fi

aio/aio.lua

@@ -630,8 +630,9 @@ end
 --- @param fd aiosocket AIO socket to be handled
 --- @param ssl lightuserdata global SSL context
 --- @param client string|nil true host name if client connection
+--- @param skip_tls_verify boolean skip TLS host verification
 --- @return aiopromise<aiosocket|{error: string}> connection established promise
-function aio:wrap_tls(fd, ssl, client)
+function aio:wrap_tls(fd, ssl, client, skip_tls_verify)
     local resolve, resolver = aio:prepare_promise()
     local on_close = fd.on_close
     local raw_write = fd.write
@@ -641,7 +642,7 @@ function aio:wrap_tls(fd, ssl, client)
     if not fd.bio then
         local bio = nil
         if client then
-            bio = crypto.ssl_bio_new_connect(ssl, client, fd.elfd, fd.fd, KTLS)
+            bio = crypto.ssl_bio_new_connect(ssl, skip_tls_verify and nil or client, fd.elfd, fd.fd, KTLS)
         else
             bio = crypto.ssl_bio_new(ssl, fd.elfd, fd.fd, KTLS)
         end