Return-Path: Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: (qmail 35284 invoked from network); 14 Apr 2011 13:58:21 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 14 Apr 2011 13:58:21 -0000 Received: (qmail 130 invoked by uid 500); 14 Apr 2011 13:58:21 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 99989 invoked by uid 500); 14 Apr 2011 13:58:21 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 99982 invoked by uid 99); 14 Apr 2011 13:58:21 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2011 13:58:21 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 14 Apr 2011 13:58:19 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 8B0782388A29; Thu, 14 Apr 2011 13:57:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1092252 - /couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl Date: Thu, 14 Apr 2011 13:57:58 -0000 To: commits@couchdb.apache.org From: fdmanana@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110414135758.8B0782388A29@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fdmanana Date: Thu Apr 14 13:57:58 2011 New Revision: 1092252 URL: http://svn.apache.org/viewvc?rev=1092252&view=rev Log: Merged revision 1092247 from trunk Include OTP minor release information in the Server header This is mostly to help diagnose issues that might be related to specific OTP releases. Modified: couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl Modified: couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl URL: http://svn.apache.org/viewvc/couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl?rev=1092252&r1=1092251&r2=1092252&view=diff ============================================================================== --- couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl (original) +++ couchdb/branches/1.0.x/src/couchdb/couch_httpd.erl Thu Apr 14 13:57:58 2011 @@ -842,9 +842,8 @@ negotiate_content_type(#httpd{mochi_req= end. server_header() -> - OTPVersion = "R" ++ integer_to_list(erlang:system_info(compat_rel)) ++ "B", [{"Server", "CouchDB/" ++ couch_server:get_version() ++ - " (Erlang OTP/" ++ OTPVersion ++ ")"}]. + " (Erlang OTP/" ++ erlang:system_info(otp_release) ++ ")"}]. -record(mp, {boundary, buffer, data_fun, callback}).