Merged revisions 108346 via svnmerge from

https://origsvn.digium.com/svn/asterisk/trunk

........
r108346 | russell | 2008-03-12 17:49:26 -0500 (Wed, 12 Mar 2008) | 4 lines

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/branches/1.6.0@108347 65c4cc65-6c06-0410-ace0-fbb531ad65f3

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);