diff options
Diffstat (limited to 'src/libfast/request.h')
| -rw-r--r-- | src/libfast/request.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libfast/request.h b/src/libfast/request.h index c9c1f13e2..48a82c3be 100644 --- a/src/libfast/request.h +++ b/src/libfast/request.h @@ -86,6 +86,8 @@ struct request_t { char* (*get_query_data)(request_t *this, char *name); /** +<<<<<<< HEAD +======= * Get an arbitrary environment variable. * * @param name name of the environment variable @@ -94,6 +96,7 @@ struct request_t { char* (*get_env_var)(request_t *this, char *name); /** +>>>>>>> upstream/4.5.1 * Read raw POST/PUT data from HTTP request. * * @param buf buffer to read data into |