Return-Path: Delivered-To: apmail-incubator-esme-commits-archive@minotaur.apache.org Received: (qmail 87198 invoked from network); 1 Mar 2010 09:40:09 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 1 Mar 2010 09:40:09 -0000 Received: (qmail 99479 invoked by uid 500); 28 Feb 2010 14:53:28 -0000 Delivered-To: apmail-incubator-esme-commits-archive@incubator.apache.org Received: (qmail 99446 invoked by uid 500); 28 Feb 2010 14:53:28 -0000 Mailing-List: contact esme-commits-help@incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: esme-dev@incubator.apache.org Delivered-To: mailing list esme-commits@incubator.apache.org Received: (qmail 99438 invoked by uid 99); 28 Feb 2010 14:53:27 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 28 Feb 2010 14:53:27 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.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; Sun, 28 Feb 2010 14:53:27 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 69283238897F; Sun, 28 Feb 2010 14:53:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r917187 - /incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala Date: Sun, 28 Feb 2010 14:53:07 -0000 To: esme-commits@incubator.apache.org From: vdichev@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20100228145307.69283238897F@eris.apache.org> Author: vdichev Date: Sun Feb 28 14:53:07 2010 New Revision: 917187 URL: http://svn.apache.org/viewvc?rev=917187&view=rev Log: Fix infinite loop in mailto action parsing. Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala Modified: incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala URL: http://svn.apache.org/viewvc/incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala?rev=917187&r1=917186&r2=917187&view=diff ============================================================================== --- incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala (original) +++ incubator/esme/trunk/server/src/main/scala/org/apache/esme/lib/MsgParser.scala Sun Feb 28 14:53:07 2010 @@ -259,7 +259,7 @@ lazy val _perform: Parser[Performances] = (acceptCI("filter") ~ lineSpace ~ EOF ^^^ PerformFilter) | (acceptCI("resend") ~ lineSpace ~ EOF ^^^ PerformResend) | - (mailtoUrl ~ opt(rep(EOL) ~> rep1(anyChar)) <~ EOF ^^ { + (mailtoUrl ~ opt(rep1(not(EOF) ~ EOL) ~> rep1(anyChar)) <~ EOF ^^ { case mt ~ text => MailTo(mt, text.map(_ mkString)) }) | (scheme ~ userPass ~ urlpart ~ rep(httpHeader) ~ httpData <~ EOF ^^ {