Skip to content

[Fix]: Fixed some components not having the correct information #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
douxxtech merged 3 commits into from
Jul 11, 2026
Merged

[Fix]: Fixed some components not having the correct information #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91cfdec
Fixed issue where the ip wouldnt show up in the logs
douxxtech Jul 11, 2026
ea0e76b
Fixed issue where the Server: header is sent empty
douxxtech Jul 11, 2026
eb3318a
debug: logging server_name instead of server_w_ver
douxxtech Jul 11, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion labels/debug.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,7 @@ dbg_startup_infos:
CLB
lea r9, [rel log_buffer]
AAPPEND r9, str_config_servername
AAPPEND r9, server_w_ver
AAPPEND r9, server_name
lea rcx, [rel log_buffer]
sub r9, rcx
mov rbx, r9
Expand Down
1 change: 1 addition & 0 deletions labels/initialsetup.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,6 +166,7 @@ initial_setup:
lea r14, [rel server_w_ver]
AAPPEND r14, default_name
AAPPEND r14, version
mov byte [r14], 0 ; null term
ret ; .build_server_name return point

.open_logfile:
Expand Down
2 changes: 1 addition & 1 deletion labels/loadenv.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ load_config:

ENV_DEFAULT env_path_buf, key_linger_to, max_age_str, 12, default_linger_to
ATOI max_age_str, rax
mov dword [rel linger_to], eax
mov word [rel linger_to], ax

ENV_DEFAULT env_path_buf, key_servedots, serve_dots_str, 5, default_servedots
BOOL_FLAG serve_dots_str, serve_dots
Expand Down
7 changes: 4 additions & 3 deletions program.asm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -816,13 +816,14 @@ _start:
PARSE_REFERER_HEADER request, 8192, referer, 1024

cmp byte [rel use_xri], 1
jne .str_req ; check if we need to use the X-Real-IP header
jne .use_client_ip ; check if we need to use the X-Real-IP header

PARSE_XRI_HEADER request, 8192, real_ip, 39

cmp byte [rel real_ip], 0
jne .str_req
jne .str_req ; header was present, keep it

.use_client_ip:
mov rsi, client_ip_str
mov rdi, real_ip
mov rcx, 16
Expand Down
Loading