From: Martin Willi <martin@revosec.ch>
Date: Wed, 7 Apr 2010 13:36:22 +0000 (+0200)
Subject: Remove to_referer() method, as it fails if no referer was given
X-Git-Tag: 4.4.0~57
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=54e354f2d6d110079facfa19ce63fcc82a6d2b0d;p=thirdparty%2Fstrongswan.git

Remove to_referer() method, as it fails if no referer was given
---

diff --git a/src/libfast/request.c b/src/libfast/request.c
index 0f743e3b91..2cbdd2ef83 100644
--- a/src/libfast/request.c
+++ b/src/libfast/request.c
@@ -203,15 +203,21 @@ static char* get_query_data(private_request_t *this, char *name)
 	return hdf_get_valuef(this->hdf, "Query.%s", name);
 }
 
+/**
+ * Implementation of request_t.get_base.
+ */
+static char* get_base(private_request_t *this)
+{
+	return FCGX_GetParam("SCRIPT_NAME", this->req.envp);
+}
+
 /**
  * Implementation of request_t.add_cookie.
  */
 static void add_cookie(private_request_t *this, char *name, char *value)
 {
 	thread_this->set(thread_this, this);
-	cgi_cookie_set (this->cgi, name, value,
-					FCGX_GetParam("SCRIPT_NAME", this->req.envp),
-					NULL, NULL, 0, 0);
+	cgi_cookie_set (this->cgi, name, value, get_base(this), NULL, NULL, 0, 0);
 }
 
 /**
@@ -222,8 +228,7 @@ static void redirect(private_request_t *this, char *fmt, ...)
 	va_list args;
 
 	FCGX_FPrintF(this->req.out, "Status: 303 See Other\n");
-	FCGX_FPrintF(this->req.out, "Location: %s%s",
-				 FCGX_GetParam("SCRIPT_NAME", this->req.envp),
+	FCGX_FPrintF(this->req.out, "Location: %s%s", get_base(this),
 				 *fmt == '/' ? "" : "/");
 	va_start(args, fmt);
 	FCGX_VFPrintF(this->req.out, fmt, args);
@@ -239,24 +244,6 @@ static char* get_referer(private_request_t *this)
 	return FCGX_GetParam("HTTP_REFERER", this->req.envp);
 }
 
-/**
- * Implementation of request_t.to_referer.
- */
-static void to_referer(private_request_t *this)
-{
-	FCGX_FPrintF(this->req.out, "Status: 303 See Other\n");
-	FCGX_FPrintF(this->req.out, "Location: %s\n\n",
-				 FCGX_GetParam("HTTP_REFERER", this->req.envp));
-}
-
-/**
- * Implementation of request_t.get_base.
- */
-static char* get_base(private_request_t *this)
-{
-	return FCGX_GetParam("SCRIPT_NAME", this->req.envp);
-}
-
 /**
  * Implementation of request_t.session_closed.
  */
@@ -405,7 +392,6 @@ request_t *request_create(int fd, bool debug)
 	this->public.close_session = (void(*)(request_t*))close_session;
 	this->public.redirect = (void(*)(request_t*, char *fmt,...))redirect;
 	this->public.get_referer = (char*(*)(request_t*))get_referer;
-	this->public.to_referer = (void(*)(request_t*))to_referer;
 	this->public.render = (void(*)(request_t*,char*))render;
 	this->public.streamf = (int(*)(request_t*, char *format, ...))streamf;
 	this->public.serve = (void(*)(request_t*,char*,chunk_t))serve;
diff --git a/src/libfast/request.h b/src/libfast/request.h
index dd3b568a4b..e778018007 100644
--- a/src/libfast/request.h
+++ b/src/libfast/request.h
@@ -112,11 +112,6 @@ struct request_t {
 	 */
 	char* (*get_referer)(request_t *this);
 
-	/**
-	 * Redirect the client to the referer.
-	 */
-	void (*to_referer)(request_t *this);
-
 	/**
 	 * Set a template value.
 	 *