[svn-commits] russell: trunk r108346 - /trunk/main/http.c

[SVN commits to the Digium repositories]

Author: russell
Date: Wed Mar 12 17:49:26 2008
New Revision: 108346

URL: http://svn.digium.com/view/asterisk?view=rev&rev=108346
Log:
Make the default prefix empty, like it was in Asterisk 1.4.

(closes issue #12198, reported by bkruse, patched by me)

Modified:
    trunk/main/http.c

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=108346&r1=108345&r2=108346
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Wed Mar 12 17:49:26 2008
@@ -53,7 +53,6 @@
 #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 @@
 	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 };
@@ -951,8 +950,6 @@
 
 	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)