diff options
Diffstat (limited to 'src/libfast')
| -rw-r--r-- | src/libfast/Makefile.in | 9 | ||||
| -rw-r--r-- | src/libfast/request.c | 10 | ||||
| -rw-r--r-- | src/libfast/request.h | 3 |
3 files changed, 22 insertions, 0 deletions
diff --git a/src/libfast/Makefile.in b/src/libfast/Makefile.in index 46f23f4d6..f520d5669 100644 --- a/src/libfast/Makefile.in +++ b/src/libfast/Makefile.in @@ -217,7 +217,13 @@ includedir = @includedir@ infodir = @infodir@ install_sh = @install_sh@ ipsecdir = @ipsecdir@ +<<<<<<< HEAD +ipsecgid = @ipsecgid@ ipsecgroup = @ipsecgroup@ +ipsecuid = @ipsecuid@ +======= +ipsecgroup = @ipsecgroup@ +>>>>>>> upstream/4.5.1 ipsecuser = @ipsecuser@ libcharon_plugins = @libcharon_plugins@ libdir = @libdir@ @@ -256,8 +262,11 @@ sbindir = @sbindir@ scepclient_plugins = @scepclient_plugins@ scripts_plugins = @scripts_plugins@ sharedstatedir = @sharedstatedir@ +<<<<<<< HEAD +======= soup_CFLAGS = @soup_CFLAGS@ soup_LIBS = @soup_LIBS@ +>>>>>>> upstream/4.5.1 srcdir = @srcdir@ strongswan_conf = @strongswan_conf@ sysconfdir = @sysconfdir@ diff --git a/src/libfast/request.c b/src/libfast/request.c index a3db70e82..b606d3e72 100644 --- a/src/libfast/request.c +++ b/src/libfast/request.c @@ -120,7 +120,11 @@ static char *getenv_cb(void *null, const char *key) private_request_t *this = (private_request_t*)thread_this->get(thread_this); value = FCGX_GetParam(key, this->req.envp); +<<<<<<< HEAD + return value ? strdup(value) : NULL; +======= return strdupnull(value); +>>>>>>> upstream/4.5.1 } /** @@ -204,6 +208,8 @@ static char* get_query_data(private_request_t *this, char *name) } /** +<<<<<<< HEAD +======= * Implementation of request_t.get_env_var. */ static char* get_env_var(private_request_t *this, char *name) @@ -212,6 +218,7 @@ static char* get_env_var(private_request_t *this, char *name) } /** +>>>>>>> upstream/4.5.1 * Implementation of request_t.read_data. */ static int read_data(private_request_t *this, char *buf, int len) @@ -423,7 +430,10 @@ request_t *request_create(int fd, bool debug) this->public.add_cookie = (void(*)(request_t*, char *name, char *value))add_cookie; this->public.get_cookie = (char*(*)(request_t*,char*))get_cookie; this->public.get_query_data = (char*(*)(request_t*, char *name))get_query_data; +<<<<<<< HEAD +======= this->public.get_env_var = (char*(*)(request_t*, char *name))get_env_var; +>>>>>>> upstream/4.5.1 this->public.read_data = (int(*)(request_t*, char*, int))read_data; this->public.session_closed = (bool(*)(request_t*))session_closed; this->public.close_session = (void(*)(request_t*))close_session; 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 |