changed ctx to pointer (otherwise response header changes can't be saved)

demo/demo.c

@@ -2,39 +2,40 @@
 #include <string.h>
 
 #include <controller.h>
+#include <cookies.h>
 
 #include "entities.h"
 
 
 GET("/", hello);
 GET("/index.*", hello);
-response_t hello(ctx_t ctx) {
+response_t hello(ctx_t* ctx) {
 	return rawResponse(200, "Hello World\n");
 }
 
 GET("/foobar", foobar);
-response_t foobar(ctx_t ctx) {
+response_t foobar(ctx_t* ctx) {
 	return fileResponse("demo/foobar.txt");
 }
 
-response_t authenticate(ctx_t ctx) {
+response_t authenticate(ctx_t* ctx) {
-	if (ctx.auth.type != BASIC) {
+	if (ctx->auth.type != BASIC) {
 		return basicAuthResponse(401, "Protected Area");
 	}
 	
-	if (strcmp(ctx.auth.basic.user, "admin") != 0 ||
+	if (strcmp(ctx->auth.basic.user, "admin") != 0 ||
-	    strcmp(ctx.auth.basic.password, "password") != 0
+	    strcmp(ctx->auth.basic.password, "password") != 0
 	) {
 		// username or password wrong
 		return basicAuthResponse(401, "Protected Area");
 	}
-	
 
 	return next();
 }
 
 GET("/user", authenticate, user);
-response_t user(ctx_t ctx) {
+POST("/user", authenticate, user);
+response_t user(ctx_t* ctx) {
 	user_t user = {
 		.username = "overflowerror",
 		.github = "https://github.com/overflowerror"
@@ -44,6 +45,6 @@ response_t user(ctx_t ctx) {
 }
 
 GET("/template", template);
-response_t template(ctx_t ctx) {
+response_t template(ctx_t* ctx) {
 	return templateResponse(200, "demo.templ", "Page Title", "Overflow");
 }

src/base_cfloor.c

@@ -27,7 +27,7 @@ static void handler(struct request request, struct response _response) {
 		responseHeaders: headers_create()
 	};
 
-	response_t response = routerHandler(ctx);
+	response_t response = routerHandler(&ctx);
 	if (response.output == NULL) {
 		response = errorResponse(500, "route did not provide a reponse handler");
 	}
@@ -51,7 +51,7 @@ static void handler(struct request request, struct response _response) {
 		return;
 	}
 
-	response.output(out, response._userData, ctx);
+	response.output(out, response._userData, &ctx);
 
 	fclose(out);
 }

src/base_cgi.c

@@ -114,7 +114,7 @@ int main(int argc, char** argv) {
 		responseHeaders: headers_create()
 	};
 
-	response_t response = routerHandler(ctx);
+	response_t response = routerHandler(&ctx);
 	if (response.output == NULL) {
 		response = errorResponse(500, "route did not provide a reponse handler");
 	}
@@ -132,7 +132,7 @@ int main(int argc, char** argv) {
 	headers_free(&response.headers);
 	headers_free(&ctx.responseHeaders);
 
-	response.output(stdout, response._userData, ctx);
+	response.output(stdout, response._userData, &ctx);
 
 	return 0;
 }

src/handler.h

@@ -3,6 +3,6 @@
 
 #include "request.h"
 
-typedef response_t (handle_t)(ctx_t);
+typedef response_t (handle_t)(ctx_t*);
 
 #endif

src/request.c

@@ -31,13 +31,13 @@ void setDefaultErrorFormat(errorformat_t format) {
 	errorformat = format;
 }
 
-static void rawOutputAndFree(FILE* out, void* _userData, ctx_t ctx) {
+static void rawOutputAndFree(FILE* out, void* _userData, ctx_t* ctx) {
 	fprintf(out, "%s", (char*) _userData);
 	
 	free(_userData);
 }
 
-static void rawOutput(FILE* out, void* _userData, ctx_t ctx) {
+static void rawOutput(FILE* out, void* _userData, ctx_t* ctx) {
 	fprintf(out, "%s", (const char*) _userData);
 }
 
@@ -70,7 +70,7 @@ struct statusdata {
 	const char* message;
 };
 
-static void statusOutput(FILE* out, void* _userData, ctx_t ctx) {
+static void statusOutput(FILE* out, void* _userData, ctx_t* ctx) {
 		struct statusdata* data = (struct statusdata*) _userData;
 		
 		const char* statusString = getStatusStrings(data->status).statusString;
@@ -80,7 +80,7 @@ static void statusOutput(FILE* out, void* _userData, ctx_t ctx) {
 			"status", json_long(data->status),
 			"error", json_string(statusString),
 			"message", json_string(data->message),
-			"path", json_string(ctx.path)
+			"path", json_string(ctx->path)
 		);
 		free(data);
 		free(tmp);
@@ -126,7 +126,7 @@ response_t errorResponse(int status, const char* message) {
 	return statusResponse(status, message);
 }
 
-static void fileOutput(FILE* out, void* _userData, ctx_t ctx) {
+static void fileOutput(FILE* out, void* _userData, ctx_t* ctx) {
 	FILE* in = (FILE*) _userData;
 
 	#define READ_BUFFER_SIZE (1024)
@@ -171,7 +171,7 @@ response_t fileResponse(const char* file) {
 	return response;
 }
 
-static void jsonOutput(FILE* output, void* _userData, ctx_t ctx) {
+static void jsonOutput(FILE* output, void* _userData, ctx_t* ctx) {
 	jsonValue_t* json = (jsonValue_t*) _userData;
 	
 	char* result = json_stringify(json);

src/request.h

@@ -27,7 +27,7 @@ typedef struct {
 	struct headers headers;
 
 	void* _userData;
-	void (*output) (FILE* conenction, void* _userData, ctx_t ctx);
+	void (*output) (FILE* conenction, void* _userData, ctx_t* ctx);
 } response_t;
 
 typedef enum {

src/router.c

@@ -121,8 +121,8 @@ int registerRoute(method_t method, const char* path, ...) {
 	return 0;
 }
 
-response_t routerHandler(ctx_t ctx) {
+response_t routerHandler(ctx_t* ctx) {
-	struct route* route = findRoute(ctx.method, ctx.path);
+	struct route* route = findRoute(ctx->method, ctx->path);
 	if (route == NULL) {
 		return errorResponse(404, "no route found");
 	}

src/router.h

@@ -5,6 +5,6 @@
 
 int registerRoute(method_t method, const char* path, ...);
 
-response_t routerHandler(ctx_t ctx);
+response_t routerHandler(ctx_t* ctx);
 
 #endif