Diff of /httpd/httpd/trunk/modules/filters/mod_include.c

Parent Directory | Revision Log | Patch

--- httpd/httpd/trunk/modules/filters/mod_include.c	2009/07/18 23:21:52	795446
+++ httpd/httpd/trunk/modules/filters/mod_include.c	2009/07/19 21:54:36	795642
@@ -611,7 +611,11 @@
                 idx, r->filename);
             return NULL;
         }
-        else if (re->match[idx].rm_so == re->match[idx].rm_eo) {
+        else if (re->nsub < idx || idx >= AP_MAX_REG_MATCH) {
+            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
+                          "regex capture $%" APR_SIZE_T_FMT
+                          " is out of range (last regex was: '%s') in %s",
+                          idx, re->rexp, r->filename);
             return NULL;
         }
         else if (re->match[idx].rm_so < 0 || re->match[idx].rm_eo < 0) {
@@ -620,13 +624,6 @@
              */
             return NULL;
         }
-        else if (re->nsub < idx || idx >= AP_MAX_REG_MATCH) {
-            ap_log_rerror(APLOG_MARK, APLOG_WARNING, 0, r,
-                          "regex capture $%" APR_SIZE_T_FMT
-                          " is out of range (last regex was: '%s') in %s",
-                          idx, re->rexp, r->filename);
-            return NULL;
-        }
 
         else {
             val = apr_pstrmemdup(ctx->dpool, re->source + re->match[idx].rm_so,