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

[svn-commits at lists.digium.com]

Author: russell
Date: Tue Feb 20 14:32:13 2007
New Revision: 55635

URL: http://svn.digium.com/view/asterisk?view=rev&rev=55635
Log:
Merged revisions 55634 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55634 | russell | 2007-02-20 14:26:06 -0600 (Tue, 20 Feb 2007) | 3 lines

Add the Asterisk version information to the Server header in HTTP
responses.  (requested by Pari)

........

Modified:
    trunk/   (props changed)
    trunk/main/http.c

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: trunk/main/http.c
URL: http://svn.digium.com/view/asterisk/trunk/main/http.c?view=diff&rev=55635&r1=55634&r2=55635
==============================================================================
--- trunk/main/http.c (original)
+++ trunk/main/http.c Tue Feb 20 14:32:13 2007
@@ -54,6 +54,7 @@
 #include "asterisk/options.h"
 #include "asterisk/config.h"
 #include "asterisk/stringfields.h"
+#include "asterisk/version.h"
 
 #define MAX_PREFIX 80
 #define DEFAULT_PREFIX "/asterisk"
@@ -611,10 +612,10 @@
 
 		strftime(timebuf, sizeof(timebuf), "%a, %d %b %Y %H:%M:%S GMT", gmtime(&t));
 		fprintf(ser->f, "HTTP/1.1 %d %s\r\n"
-				"Server: Asterisk\r\n"
+				"Server: Asterisk/%s\r\n"
 				"Date: %s\r\n"
 				"Connection: close\r\n",
-			status, title ? title : "OK", timebuf);
+			status, title ? title : "OK", ASTERISK_VERSION, timebuf);
 		if (!contentlength) {	/* opaque body ? just dump it hoping it is properly formatted */
 			fprintf(ser->f, "%s", out->str);
 		} else {