aboutsummaryrefslogtreecommitdiffstats
path: root/main/manager.c
diff options
context:
space:
mode:
authorkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-18 22:32:26 +0000
committerkpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-18 22:32:26 +0000
commit93531c68a25e6424e8f8b93f4bf3c944fdc53440 (patch)
tree359e80b11b9aeec274ca5fe62c4b6a075d487417 /main/manager.c
parent28ef6ff72905b4d9229de9edf95682f958ba2fa5 (diff)
start the process of changing HTTP request dispatching to do it based on *both* URI and method, so that POST support can move into a module; move http.c's private function prototypes into _private.h
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@109762 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'main/manager.c')
-rw-r--r--main/manager.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/main/manager.c b/main/manager.c
index e205eb012..b81384b20 100644
--- a/main/manager.c
+++ b/main/manager.c
@@ -3476,7 +3476,7 @@ static void xml_translate(struct ast_str **out, char *in, struct ast_variable *v
}
static struct ast_str *generic_http_callback(enum output_format format,
- struct sockaddr_in *requestor, const char *uri,
+ struct sockaddr_in *requestor, const char *uri, enum ast_http_method method,
struct ast_variable *params, int *status,
char **title, int *contentlength)
{
@@ -3631,19 +3631,19 @@ generic_callback_out:
return out;
}
-static struct ast_str *manager_http_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
+static struct ast_str *manager_http_callback(struct ast_tcptls_session_instance *ser, const char *uri, enum ast_http_method method, struct ast_variable *params, int *status, char **title, int *contentlength)
{
- return generic_http_callback(FORMAT_HTML, &ser->requestor, uri, params, status, title, contentlength);
+ return generic_http_callback(FORMAT_HTML, &ser->requestor, uri, method, params, status, title, contentlength);
}
-static struct ast_str *mxml_http_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
+static struct ast_str *mxml_http_callback(struct ast_tcptls_session_instance *ser, const char *uri, enum ast_http_method method, struct ast_variable *params, int *status, char **title, int *contentlength)
{
- return generic_http_callback(FORMAT_XML, &ser->requestor, uri, params, status, title, contentlength);
+ return generic_http_callback(FORMAT_XML, &ser->requestor, uri, method, params, status, title, contentlength);
}
-static struct ast_str *rawman_http_callback(struct ast_tcptls_session_instance *ser, const char *uri, struct ast_variable *params, int *status, char **title, int *contentlength)
+static struct ast_str *rawman_http_callback(struct ast_tcptls_session_instance *ser, const char *uri, enum ast_http_method method, struct ast_variable *params, int *status, char **title, int *contentlength)
{
- return generic_http_callback(FORMAT_RAW, &ser->requestor, uri, params, status, title, contentlength);
+ return generic_http_callback(FORMAT_RAW, &ser->requestor, uri, method, params, status, title, contentlength);
}
struct ast_http_uri rawmanuri = {