diff options
author | Russell Bryant <russell@russellbryant.com> | 2008-03-12 22:49:26 +0000 |
---|---|---|
committer | Russell Bryant <russell@russellbryant.com> | 2008-03-12 22:49:26 +0000 |
commit | c3c56990df3416657c1bbc600c81fc3789065d6a (patch) | |
tree | 5724d7afd30f58181f227335a5ad3b5acdd02c4c | |
parent | 8bbef5f996078b5065cf54567b4af166186afb03 (diff) |
Make the default prefix empty, like it was in Asterisk 1.4.
(closes issue #12198, reported by bkruse, patched by me)
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@108346 65c4cc65-6c06-0410-ace0-fbb531ad65f3
-rw-r--r-- | main/http.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/main/http.c b/main/http.c index f48ee6138..462e3ff34 100644 --- a/main/http.c +++ b/main/http.c @@ -53,7 +53,6 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$") #include "asterisk/manager.h" #define MAX_PREFIX 80 -#define DEFAULT_PREFIX "/asterisk" /* See http.h for more information about the SSL implementation */ #if defined(HAVE_OPENSSL) && (defined(HAVE_FUNOPEN) || defined(HAVE_FOPENCOOKIE)) @@ -937,7 +936,7 @@ static int __ast_http_load(int reload) int newenablestatic=0; struct hostent *hp; struct ast_hostent ahp; - char newprefix[MAX_PREFIX]; + char newprefix[MAX_PREFIX] = ""; int have_sslbindaddr = 0; struct http_uri_redirect *redirect; struct ast_flags config_flags = { reload ? CONFIG_FLAG_FILEUNCHANGED : 0 }; @@ -952,8 +951,6 @@ static int __ast_http_load(int reload) memset(&https_desc.sin, 0, sizeof(https_desc.sin)); https_desc.sin.sin_port = htons(8089); - strcpy(newprefix, DEFAULT_PREFIX); - http_tls_cfg.enabled = 0; if (http_tls_cfg.certfile) ast_free(http_tls_cfg.certfile); |