Return-Path: X-Original-To: apmail-couchdb-commits-archive@www.apache.org Delivered-To: apmail-couchdb-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BFAA4D2B0 for ; Wed, 19 Dec 2012 01:58:33 +0000 (UTC) Received: (qmail 32479 invoked by uid 500); 19 Dec 2012 01:58:33 -0000 Delivered-To: apmail-couchdb-commits-archive@couchdb.apache.org Received: (qmail 32144 invoked by uid 500); 19 Dec 2012 01:58:33 -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 31863 invoked by uid 99); 19 Dec 2012 01:58:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 19 Dec 2012 01:58:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 31DE481EBC6; Wed, 19 Dec 2012 01:58:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: rnewson@apache.org To: commits@couchdb.apache.org X-Mailer: ASF-Git Admin Mailer Subject: [9/10] git commit: Include a comment before jsonp output Message-Id: <20121219015832.31DE481EBC6@tyr.zones.apache.org> Date: Wed, 19 Dec 2012 01:58:32 +0000 (UTC) Include a comment before jsonp output Project: http://git-wip-us.apache.org/repos/asf/couchdb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb/commit/f5be4963 Tree: http://git-wip-us.apache.org/repos/asf/couchdb/tree/f5be4963 Diff: http://git-wip-us.apache.org/repos/asf/couchdb/diff/f5be4963 Branch: refs/heads/1.0.x Commit: f5be496314b4c436eb5f4d540a25f887202c94bd Parents: 6cc84db Author: Robert Newson Authored: Wed Dec 19 00:45:22 2012 +0000 Committer: Robert Newson Committed: Wed Dec 19 01:22:10 2012 +0000 ---------------------------------------------------------------------- src/couchdb/couch_httpd.erl | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb/blob/f5be4963/src/couchdb/couch_httpd.erl ---------------------------------------------------------------------- diff --git a/src/couchdb/couch_httpd.erl b/src/couchdb/couch_httpd.erl index be19ea9..e4b25c3 100644 --- a/src/couchdb/couch_httpd.erl +++ b/src/couchdb/couch_httpd.erl @@ -652,7 +652,7 @@ start_jsonp(Req) -> case couch_config:get("httpd", "allow_jsonp", "false") of "true" -> validate_callback(CallBack), - CallBack ++ "("; + ["/* CouchDB */", CallBack, "("]; _Else -> % this could throw an error message, but instead we just ignore the % jsonp parameter