2 files changed, 39 insertions, 9 deletions
diff --git a/lib/Apache/Inject.pm b/lib/Apache/Inject.pm
index 1d6f49b..68e003e 100644
--- a/lib/Apache/Inject.pm
+++ b/lib/Apache/Inject.pm
@@ -182,6 +182,10 @@ intelligently and forwards their combined contents.
 
 =head1 CAVEATS
 
+=over
+
+=item *
+
 Apache::Inject::Filter uses a regular expression to determine the
 proper location of the injected header.  It supports all valid HTML.
 However, it does not parse embedded CSS and JavaScript, which means
@@ -204,10 +208,22 @@ This specific type of document, however, is I<incredibly> unlikely.
 In this case, an ad-hoc solution is simpler, more efficient and
 more maintainable than a general one.
 
+=item *
+
+Because of how Apache filters work, Inject may fail to find the end
+of the E<lt>headE<gt> if the E<lt>headE<gt> is very long (in my
+experience over 7000 characters).  If this happens, it will decline
+the request, and the contents will be served as though Inject had
+not been enabled.
+
+=item *
+
 On FreeBSD, you may need to enable the accf_http kernel module in
 order for the tests to work.  Note that Apache::Inject works fine
 without the module; it is only the tests that require it.
 
+=back
+
 =head1 DIAGNOSTICS
 
 Apache::Inject and Apache::Inject::Filter log all errors and
diff --git a/lib/Apache/Inject/Filter.pm b/lib/Apache/Inject/Filter.pm
index f87cdc1..67511e2 100644
--- a/lib/Apache/Inject/Filter.pm
+++ b/lib/Apache/Inject/Filter.pm
@@ -49,15 +49,29 @@ sub handler : FilterRequestHandler {
 		return DECLINED;
 	}
 
-	my ($buf, $content);
-	$content .= $buf while $f->read($buf);
-	return DECLINED if not $content =~ /$doc/;
-
-	$f->print($+{head}) if $+{head};
-	inject($f, "InjectHead");
-	$f->print($+{body}) if $+{body};
-	inject($f, "InjectFoot");
-	$f->print($+{rest}) if $+{rest};
+	# First pass
+	if (not $f->ctx) {
+		my ($buf, $content);
+		$content .= $buf while $f->read($buf);
+		if (not $content =~ /$doc/) {
+			$f->r->warn('Inject: Cannot find <body> (<head> too long?)');
+			return DECLINED;
+		}
+
+		$f->print($+{head}) if $+{head};
+		inject($f, "InjectHead");
+		$f->print($+{body}) if $+{body};
+		inject($f, "InjectFoot");
+		$f->print($+{rest}) if $+{rest};
+
+		$f->ctx(1);
+	}
+
+	# Any subsequent pass
+	else {
+		my $buf;
+		$f->print($buf) while $f->read($buf);
+	}
 
 	return OK;
 }