Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 2E8B07EB9 for ; Tue, 8 Nov 2011 00:26:09 +0000 (UTC) Received: (qmail 51416 invoked by uid 500); 8 Nov 2011 00:26:09 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 51368 invoked by uid 500); 8 Nov 2011 00:26:09 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 51359 invoked by uid 99); 8 Nov 2011 00:26:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 08 Nov 2011 00:26:08 +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; Tue, 08 Nov 2011 00:26:07 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id A9F7D23888E4; Tue, 8 Nov 2011 00:25:47 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1199028 - /httpd/httpd/trunk/modules/lua/lua_request.c Date: Tue, 08 Nov 2011 00:25:47 -0000 To: cvs@httpd.apache.org From: covener@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111108002547.A9F7D23888E4@eris.apache.org> Author: covener Date: Tue Nov 8 00:25:47 2011 New Revision: 1199028 URL: http://svn.apache.org/viewvc?rev=1199028&view=rev Log: correct return val, the char* is pushed on the lua stack. Modified: httpd/httpd/trunk/modules/lua/lua_request.c Modified: httpd/httpd/trunk/modules/lua/lua_request.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/lua/lua_request.c?rev=1199028&r1=1199027&r2=1199028&view=diff ============================================================================== --- httpd/httpd/trunk/modules/lua/lua_request.c (original) +++ httpd/httpd/trunk/modules/lua/lua_request.c Tue Nov 8 00:25:47 2011 @@ -210,7 +210,7 @@ static int req_construct_url(lua_State * } /* wrap ap_escape_html r:escape_html(String) */ -static char * req_escape_html(lua_State *L) +static int req_escape_html(lua_State *L) { request_rec *r = ap_lua_check_request_rec(L, 1); const char *s = luaL_checkstring(L, 2);