can serve jpegs (and only these :P) as binary prototype

bin/main.lua

@@ -16,11 +16,12 @@ while true do
     local err = ""
 
     if client then
-        client:settimeout(0)
+        client:settimeout( nil )
+
         table.insert( selectlist, client )
     end
 
-    readlist, _, err = socket.select( selectlist, nil, 0.1 )
+    readlist, _, err = socket.select( selectlist, nil, nil )
 
     if err then print( err ) end
 
@@ -40,13 +41,15 @@ while true do
 
             if key ~= nil and value ~= nil then
                 request[key] = value
+            else
+                break
             end
             if rest ~= nil then
                 request.post = rest
                 break
             end
         end
-        
+
         if request.GET ~= nil then
             local getList = getRequest( request.GET, " " )
             if getList[1] ~= nil then
@@ -61,10 +64,11 @@ while true do
             end
         end
 
-        -- Debug Information prints complete request
-        --for k,l in pairs( request ) do
-        --    print( " key: " .. k .. " value: " .. l )
-        --end
+        --[[ Debug Information prints complete request
+        for k,l in pairs( request ) do
+            print( " key: " .. k .. " value: " .. l )
+        end
+        --]]
 
         client:close()
         table.remove( selectlist, i )

lib/answerRequest.lua

@@ -2,36 +2,57 @@
 
 function answerRequest ( request )
     local fileStatus = 0;
+    local req
+    local ext
+
     request = cutTrailingSlash( request )
-    local fh , err = io.open( "./content/" .. request, "r" )
 
+    if #request == 0 then
+        request = "index.html"
+    end
+
+    req, ext = splitReq( request )
+
+    local fh , err = io.open( "./content/" .. request, "rb" )
+
     if fh == nil then
         fileStatus = 1;
         fh , err = io.open( "./content/error.html", "r" )
         return prepareHeader( fileStatus ) .. prepareContent( fh )
     else
-        return prepareHeader( fileStatus ) .. prepareContent( fh )
+        return prepareHeader( fileStatus, ext ) .. prepareContent( fh, ext )
     end 
-end 
+end
 
-function prepareHeader ( status )
+function prepareHeader ( status, ext )
 
     return prepareStatus( status ) 
         .. prepareDate()
         .. prepareServername() 
-        .. prepareConnType()
-        .. prepareContentType()
+        .. prepareConnType( )
+        .. prepareContentType( ext )
 end 
 
-function prepareContent ( fh )
-    local html = ""
-
-    while true do
-        local line = fh.read( fh )
-        if not line then break end
-        html = html .. line
-    end
+function prepareContent ( fh, ext )
+    local html
+    if ext == "html" then
+        html = ""
+        while true do
+            local line = fh.read( fh )
+            if not line then break end
+            html = html .. line
+        end
+    elseif ext == "jpg" or ext == "jpeg" then
+        html = fh:read("*a")
+    else
+        html = ""
+        while true do
+            local line = fh.read( fh )
+            if not line then break end
+            html = html .. line
+        end
 
+    end
     return html
 end 
 
@@ -68,7 +89,23 @@ function prepareConnType ()
     return conntype
 end
 
-function prepareContentType ()
-    local contenttype = 'Content-Type: text/html; charset=iso-8859-1\r\n\r\n'
+function prepareContentType ( ext )
+    local contenttype
+    if ext == "html" then
+        contenttype = 'Content-Type: text/html; charset=iso-8859-1\r\n\r\n'
+    elseif ext == "jpg" or ext == "jpeg" then
+        contenttype = 'Content-Type: image/jpeg\r\n\r\n'
+    else
+        contenttype = 'Content-Type: text/html; charset=iso-8859-1\r\n\r\n'
+    end
     return contenttype
 end
+
+function splitReq( request )
+    local req
+    local ext
+    local found = request:find( '%.' )
+    req = request:sub( 1, found - 1 )
+    ext = request:sub( found + 1 )
+    return req, ext;
+end