From: Nick Kew <niq@apache.org>
Date: Tue, 21 Sep 2010 18:52:03 +0000 (+0000)
Subject: Remove cruft that accidentally got into r999533
X-Git-Tag: 2.3.9~467
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6c656ff74a253c8287b02c183519c97af83d7d76;p=apache

Remove cruft that accidentally got into r999533


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

diff --git a/server/util_regex.c b/server/util_regex.c
index 458e4f6f14..9ea837f5f7 100644
--- a/server/util_regex.c
+++ b/server/util_regex.c
@@ -134,7 +134,6 @@ AP_DECLARE(int) ap_rxplus_exec(apr_pool_t *pool, ap_rxplus_t *rx,
                                const char *pattern, char **newpattern)
                                //int max_iterations)
 {
-#if 1
     int ret = 1;
     int startl, oldl, newl, diffsz;
     const char *remainder;
@@ -173,61 +172,6 @@ AP_DECLARE(int) ap_rxplus_exec(apr_pool_t *pool, ap_rxplus_t *rx,
         *newpattern = subs;
     }
     return ret;
-        
-
-
-
-#else
-
-
-
-
-
-
-
-
-
-
-
-
-    if (!(rx->flags & AP_REG_MULTI) || (rx->subs == NULL)) {
-        max_iterations = 1;
-    }
-    /* FIXME: multi-matching is incorrect */
-    while (max_iterations-- > 0) {
-        if (ap_regexec(&rx->rx, pattern, rx->nmatch, rx->pmatch, rx->flags)
-            == 0) {
-            ret++;
-            if (rx->subs) {
-                rx->match = pattern;
-                *newpattern = ap_pregsub(pool, rx->subs, pattern,
-                                         rx->nmatch, rx->pmatch);
-                pattern = *newpattern;
-                if (pattern == NULL) {
-                    max_iterations = 0;
-                }
-            }
-        }
-        else {
-            max_iterations = 0;
-        }
-    }
-
-    if (ret == 0 || rx->flags&AP_REG_NOMEM) {
-        rx->match = NULL;  /* no match, so don't pretend to remember a match */
-    }
-    else {
-#if 0
-        /* FIXME - should we be 'safe' and take the performance hit,
-         * or just document thou-shalt-keep-pattern-in-scope?
-         */
-        if (rx->match == inpattern) {
-            rx->match = apr_pstrdup(pool, inpattern);
-        }
-#endif
-    }
-    return ret;
-#endif
 }
 #ifdef DOXYGEN
 AP_DECLARE(int) ap_rxplus_nmatch(ap_rxplus_t *rx)