From: Russell Bryant <russell@russellbryant.com>
Date: Tue, 20 Feb 2007 20:32:13 +0000 (+0000)
Subject: Merged revisions 55634 via svnmerge from
X-Git-Tag: 1.6.0-beta1~3^2~3159
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4cbce3356e8bf3b6c3c13e8dabf8d36365eae996;p=thirdparty%2Fasterisk.git

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)

........


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

diff --git a/main/http.c b/main/http.c
index 3d0b7f703f..97738b4f0a 100644
--- a/main/http.c
+++ b/main/http.c
@@ -54,6 +54,7 @@ ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
 #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 @@ static void *httpd_helper_thread(void *data)
 
 		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 {