From bb867832e15ba6ec48bf6e8bd934cf9d6c329b35 Mon Sep 17 00:00:00 2001 From: Lea Anthony Date: Wed, 26 Jan 2022 09:55:12 +1100 Subject: [PATCH] Disable 404 handling for now --- .../frontend/desktop/linux/frontend.go | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/v2/internal/frontend/desktop/linux/frontend.go b/v2/internal/frontend/desktop/linux/frontend.go index 02050f2c9..d9dc36028 100644 --- a/v2/internal/frontend/desktop/linux/frontend.go +++ b/v2/internal/frontend/desktop/linux/frontend.go @@ -24,7 +24,6 @@ import "C" import ( "context" "encoding/json" - "fmt" "log" "os" "strconv" @@ -345,22 +344,22 @@ func (f *Frontend) processRequest(request unsafe.Pointer) { content, mimeType, err := f.assets.Load(file) // TODO How to return 404/500 errors to webkit? - if err != nil { - if os.IsNotExist(err) { - f.dispatch(func() { - message := C.CString("not found") - defer C.free(unsafe.Pointer(message)) - C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(404), message)) - }) - } else { - err = fmt.Errorf("Error processing request %s: %w", uri, err) - f.logger.Error(err.Error()) - message := C.CString("internal server error") - defer C.free(unsafe.Pointer(message)) - C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(500), message)) - } - return - } + //if err != nil { + //if os.IsNotExist(err) { + // f.dispatch(func() { + // message := C.CString("not found") + // defer C.free(unsafe.Pointer(message)) + // C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(404), message)) + // }) + //} else { + // err = fmt.Errorf("Error processing request %s: %w", uri, err) + // f.logger.Error(err.Error()) + // message := C.CString("internal server error") + // defer C.free(unsafe.Pointer(message)) + // C.webkit_uri_scheme_request_finish_error(req, C.g_error_new_literal(C.G_FILE_ERROR_NOENT, C.int(500), message)) + //} + //return + //} cContent := C.CString(string(content)) defer C.free(unsafe.Pointer(cContent))