[asterisk-commits] twilson: branch 1.8 r310240 - in /branches/1.8: main/ res/

[SVN commits to the Asterisk project]

Author: twilson
Date: Thu Mar 10 10:05:45 2011
New Revision: 310240

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=310240
Log:
Add \r\n to remaining http headers passed to ast_http_send

r309204 changed the behavior of ast_http_send. It now requires headers
to be passed with trailing \r\n. This change updates the remaining
instances in the code that did not pass the \r\n.

(closes issue #18186)
Reported by: nivaldomjunior
Patches: 
      res_phoneprov.c.diff uploaded by lathama (license 1028)
      manager.diff.txt uploaded by twilson (license 396)
Tested by: lathama

Modified:
    branches/1.8/main/manager.c
    branches/1.8/res/res_phoneprov.c

Modified: branches/1.8/main/manager.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/main/manager.c?view=diff&rev=310240&r1=310239&r2=310240
==============================================================================
--- branches/1.8/main/manager.c (original)
+++ branches/1.8/main/manager.c Thu Mar 10 10:05:45 2011
@@ -5839,7 +5839,7 @@
 		goto auth_callback_out;
 	}
 
-	ast_str_append(&http_header, 0, "Content-type: text/%s", contenttype[format]);
+	ast_str_append(&http_header, 0, "Content-type: text/%s\r\n", contenttype[format]);
 
 	if (format == FORMAT_XML) {
 		ast_str_append(&out, 0, "<ajax-response>\n");

Modified: branches/1.8/res/res_phoneprov.c
URL: http://svnview.digium.com/svn/asterisk/branches/1.8/res/res_phoneprov.c?view=diff&rev=310240&r1=310239&r2=310240
==============================================================================
--- branches/1.8/res/res_phoneprov.c (original)
+++ branches/1.8/res/res_phoneprov.c Thu Mar 10 10:05:45 2011
@@ -440,7 +440,7 @@
 		}
 
 		http_header = ast_str_create(80);
-		ast_str_set(&http_header, 0, "Content-type: %s",
+		ast_str_set(&http_header, 0, "Content-type: %s\r\n",
 			route->file->mime_type);
 
 		ast_http_send(ser, method, 200, NULL, http_header, NULL, fd, 0);
@@ -504,7 +504,7 @@
 		}
 
 		http_header = ast_str_create(80);
-		ast_str_set(&http_header, 0, "Content-type: %s",
+		ast_str_set(&http_header, 0, "Content-type: %s\r\n",
 			route->file->mime_type);
 
 		if (!(result = ast_str_create(512))) {