From a25e1b29ce444eb62b41b2adf985c8cfd20abc47 Mon Sep 17 00:00:00 2001
From: Ground0 <rene.linder@lihaso.ch>
Date: Mon, 30 Nov 2020 09:52:27 +0100
Subject: [PATCH] Some translations and bugfixes

---
 lweb.pbi        | 31 ++++++++++++++++---------------
 lweb_header.pbi |  4 ++--
 2 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/lweb.pbi b/lweb.pbi
index bd522cd..63ffdb8 100644
--- a/lweb.pbi
+++ b/lweb.pbi
@@ -2,9 +2,9 @@
 ;*
 ;* lweb-srv.pbi V0.9
 ;*
-;* LiHaSo Webserver Hauptmodule
+;* LiHaSo Webserver Main module.
 ;*
-;* Dieser Webserver ist auch Alleine Nutzbar muss allerdings in einem Hauptprogramm Korrekt zusammengesetzt werden.
+;* It is usable as standalone Webserver, look at lwebd.pb
 ;*
 
 
@@ -588,7 +588,7 @@ Module lhs_web
                     ;}
                     
                   Else
-                    ;{ Uncached File Handling scheint stabil zu funktionieren mit Getestet 200 Clients à 100 Requests 
+                    ;{ Uncached file sems to be stable tested up to 200 clients and 100 requests. 
                     thread_file_handle = ReadFile(#PB_Any, conf_basedir + thread_requested,#PB_File_SharedRead)
                     If Not thread_file_handle
                         thread_file_handle = ReadFile(#PB_Any, conf_basedir + conf_defaultfile,#PB_File_SharedRead)
@@ -622,9 +622,9 @@ Module lhs_web
                       ExtractJSONMap(JSONValue(MyThreadJSON), Post())
                       FreeJSON(MyThreadJSON)
                     Else
-                      ;WTF ???
-                      Debug "Fehler Absturz"
-                      Break 2 ; Thread abschiessen
+                      ;Should not be possible.
+                      Debug "Error in thread, JSON Convert didn't Work"
+                      Break 2 ; Kill Thread
                     EndIf
                   EndIf
                   
@@ -641,8 +641,8 @@ Module lhs_web
                     ToCall = 0
                   EndIf
                   
-                  If ToCall > 0 ;Dann ist eine Funktion hinterlegt und zulässig aufgerufen zu werden.
-                    ;{ Dynamischer WebHandler
+                  If ToCall > 0 ;A dynamic webhandler is available, call.
+                    ;{ Dynamic webhandler.
                     
                     Select ToCallType
                       Case #handler_proto_universal
@@ -714,7 +714,7 @@ Module lhs_web
                     ;}
                     
                   Else
-                    ;{ Uncached File Handling scheint stabil zu funktionieren mit Getestet 200 Clients à 100 Requests 
+                    ;{ Uncached file sems to be stable tested up to 200 clients and 100 requests.
                     thread_file_handle = ReadFile(#PB_Any, conf_basedir + thread_requested,#PB_File_SharedRead)
                     If Not thread_file_handle
                         thread_file_handle = ReadFile(#PB_Any, conf_basedir + conf_defaultfile,#PB_File_SharedRead)
@@ -803,8 +803,8 @@ Module lhs_web
                 FreeMemory(m_clients(Str(thread_cli_id))\datenbuffer()\Buffer)
               EndIf
               DeleteElement(m_clients(Str(thread_cli_id))\datenbuffer())
-              ;Daten Senden...
-              ;TODO: SSL Send
+
+              ;Send the data in memory to client.
               sent_total = thread_data_size+(thread_buffer_offset-thread_buffer)
               If  m_clients(Str(thread_cli_id))\client_ssl = 1
                 sent_length = sent_total 
@@ -823,7 +823,6 @@ Module lhs_web
                   
                 Until sent_length <= 0 
                 sent = sent_total
-                ;thread_alive = #False
 
               Else
                 sent_length = sent_total 
@@ -841,14 +840,16 @@ Module lhs_web
                   EndIf
                   
                 Until sent_length <= 0 
-                sent = sent_total
-                ;thread_alive = #False                
+                sent = sent_total                
               EndIf
               
               If sent = thread_data_size+(thread_buffer_offset-thread_buffer)
                 ;Ok
                 ;Debug "Gesendet:" + PeekS(thread_buffer,thread_buffer_length, #PB_Ascii)
-                FreeMemory(thread_buffer)
+                If thread_buffer > 0
+                  FreeMemory(thread_buffer)
+                EndIf
+                
                 m_clients(Str(thread_cli_id))\client_do_cli = #CLI_DO_WaitDataReceive
                 m_clients(Str(thread_cli_id))\client_do_srv = #SRV_DO_DataReceive             
               Else
diff --git a/lweb_header.pbi b/lweb_header.pbi
index 850edf1..dc52a49 100644
--- a/lweb_header.pbi
+++ b/lweb_header.pbi
@@ -2,9 +2,9 @@
 ;*
 ;* lweb_header.pbi 
 ;*
-;* LiHaSo Webserver Modul Header
+;* LiHaSo Webserver Modul Header/Declare
 ;*
-;* Dieser Webserver ist auch Alleine Nutzbar muss allerdings in einem Hauptprogramm Korrekt zusammengesetzt werden.
+;* It is usable as standalone Webserver, look at lwebd.pb
 ;*
 ;* 
 ;*