From: Daniel Gruno <humbedooh@apache.org>
Date: Wed, 16 Jan 2013 18:00:04 +0000 (+0000)
Subject: If r:regex does not match, only return 'false', don't try to create error messages... 
X-Git-Tag: 2.5.0-alpha~5865
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=89d818870d41a1168ab5838bd811af66daeb447f;p=apache

If r:regex does not match, only return 'false', don't try to create error messages, because there should not be any - it's either match or no match here at this point.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1434065 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/modules/lua/lua_request.c b/modules/lua/lua_request.c
index 7020c2d1d9..c1267f3cbd 100644
--- a/modules/lua/lua_request.c
+++ b/modules/lua/lua_request.c
@@ -920,13 +920,11 @@ static int lua_ap_regex(lua_State *L)
     }
 
     rv = ap_regexec(&regex, source, AP_MAX_REG_MATCH, matches, 0);
-    if (rv < 0) {
+    if (rv == AP_REG_NOMATCH) {
         lua_pushboolean(L, 0);
-        err = apr_palloc(r->pool, 256);
-        ap_regerror(rv, &regex, err, 256);
-        lua_pushstring(L, err);
-        return 2;
+        return 1;
     }
+    
     lua_newtable(L);
     for (i = 0; i < regex.re_nsub; i++) {
         lua_pushinteger(L, i);