aboutsummaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-06 00:11:09 +0000
committerrussell <russell@f38db490-d61c-443f-a65b-d21fe96a405b>2008-03-06 00:11:09 +0000
commitc30ba146debc6b92b6875a7dc1ff951f4a6c6b70 (patch)
tree11f7ecd8b9f5e34026e49161c85f2861401f79a5 /res
parentcc4b6c80303144f1793c53728265669e35e9868a (diff)
Merged revisions 105773 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk ........ r105773 | russell | 2008-03-04 16:15:18 -0600 (Tue, 04 Mar 2008) | 2 lines Rename public object server_instance to ast_tcptls_server_instance ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.0@106303 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'res')
-rw-r--r--res/res_phoneprov.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/res/res_phoneprov.c b/res/res_phoneprov.c
index 288b236f6..7d647a903 100644
--- a/res/res_phoneprov.c
+++ b/res/res_phoneprov.c
@@ -323,7 +323,7 @@ static int load_file(const char *filename, char **ret)
}
/*! \brief Callback that is executed everytime an http request is received by this module */
-static struct ast_str *phoneprov_callback(struct server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
+static struct ast_str *phoneprov_callback(struct ast_tcptls_server_instance *ser, const char *uri, struct ast_variable *vars, int *status, char **title, int *contentlength)
{
struct http_route *route;
struct http_route search_route = {