missed that one while reverting

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@99010 65c4cc65-6c06-0410-ace0-fbb531ad65f3

diff --git a/configs/cdr.conf.sample b/configs/cdr.conf.sample
index c2882c1f0dc52371e437d6ef248d0a0e22fb0d8d..c6d97edcd783cc3b2ec87749edae03d7878b6865 100644 (file)
--- a/configs/cdr.conf.sample
+++ b/configs/cdr.conf.sample
@@ -11,7 +11,7 @@
 
 ; Define whether or not to use CDR logging.  Setting this to "no" will override
 ; any loading of backend CDR modules.  Default is "yes".
-;enable=yes
+enable=yes
 
 ; Define whether or not to log unanswered calls. Setting this to "yes" will
 ; report every attempt to ring a phone in dialing attempts, when it was not 

diff --git a/main/manager.c b/main/manager.c
index bc342cf427e72083e1b14c2dc4f74a44150d6666..8e3309667546f3ecf01d339e165371de928c62d2 100644 (file)
--- a/main/manager.c
+++ b/main/manager.c
@@ -2711,7 +2711,7 @@ static char *generic_http_callback(int format, struct sockaddr_in *requestor, co
                }
                ast_build_string(&c, &len, "Content-type: text/%s\r\n", contenttype[format]);
                sprintf(tmp, "%08lx", s->managerid);
-               ast_build_string(&c, &len, "%s", ast_http_setcookie("mansession_id", tmp, httptimeout, cookie, sizeof(cookie)));
+               ast_build_string(&c, &len, "%s\r\n", ast_http_setcookie("mansession_id", tmp, httptimeout, cookie, sizeof(cookie)));
                if (format == FORMAT_HTML)
                        ast_build_string(&c, &len, "<title>Asterisk&trade; Manager Interface</title>");
                if (format == FORMAT_XML) {