Skip to content
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

Jump to bottom

C-Web-Server - Scott Bren #303

Open
wants to merge 11 commits into
base: master
Choose a base branch
from
Open

C-Web-Server - Scott Bren #303

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f427773
initial commit
smbren Mar 11, 2019
639cf72
send_response implemented
smbren Mar 11, 2019
311a497
handle_http_request and get_d20 implemented
smbren Mar 11, 2019
6719ace
working on handling files
smbren Mar 12, 2019
a721805
fixed mem management bug for arbitrary file serving
smbren Mar 12, 2019
3c4f7fe
working on allocating cache and cache entry memory
smbren Mar 13, 2019
2f6b931
fixed cache mem allocation and serving images
smbren Mar 13, 2019
9076f1b
working on adding and removing from cache
smbren Mar 13, 2019
9d3770c
fixed cache_put
smbren Mar 13, 2019
edc4a5f
working on serving files from cache
smbren Mar 14, 2019
2bf99d5
added serving files from the cache
smbren Mar 14, 2019
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
8 changes: 4 additions & 4 deletions src/server.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,12 +140,12 @@ void get_file(int fd, struct cache *cache, char *request_path)
mime_type = mime_type_get(filepath);

if(filedata == NULL) {
fprintf(stderr, "%s", request_path);
resp_404(fd);
} else {
send_response(fd, "HTTP/1.1 200 OK", mime_type, filedata->data, filedata->size);
file_free(filedata);
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yep it's an annoying pattern but whatever you allocate you must free.

}

//file_free(filedata);
}

/**
Expand All @@ -168,8 +168,8 @@ void handle_http_request(int fd, struct cache *cache)
{
const int request_buffer_size = 65536; // 64K
char request[request_buffer_size];
char *action;
char *endpoint;
char action[100];
char endpoint[100];

// Read request
int bytes_recvd = recv(fd, request, request_buffer_size - 1, 0);
Expand Down