Further refactoring of request.c to work with CGI

2 files changed, 5 insertions, 3 deletions

diff --git a/include/request.h b/include/request.h
index 1111f47f..7a2dc517 100644
--- a/include/request.h
+++ b/include/request.h
@@ -13,7 +13,10 @@ void uw_sign(const char *in, char *out);
 uw_request_context uw_new_request_context(void);
 void uw_free_request_context(uw_request_context);
 
-request_result uw_request(uw_request_context, uw_context, char *request, size_t request_len, int sock);
+request_result uw_request(uw_request_context, uw_context,
+                          char *method, char *path, char *query_string,
+                          char *body, size_t body_len,
+                          int sock);
 
 uw_context uw_request_new_context(void);
 
diff --git a/include/urweb.h b/include/urweb.h
index a286f9c8..55347030 100644
--- a/include/urweb.h
+++ b/include/urweb.h
@@ -24,8 +24,7 @@ void uw_reset_keep_request(uw_context);
 void uw_reset_keep_error_message(uw_context);
 
 failure_kind uw_begin_init(uw_context);
-void uw_set_headers(uw_context, char *headers);
-void uw_headers_moved(uw_context ctx, char *headers);
+void uw_set_headers(uw_context, char *(*get_header)(void *, const char *), void *get_header_data);
 failure_kind uw_begin(uw_context, char *path);
 void uw_login(uw_context);
 void uw_commit(uw_context);