passenger 3.0.7 → 3.0.8

data/NEWS

@@ -1,3 +1,30 @@
+Release 3.0.8
+-------------
+
+ * [Nginx] Upgraded preferred Nginx version to 1.0.5.
+ * [Nginx] Fixed various compilation problems on various platforms.
+ * [Nginx] We now ensure that SERVER_NAME is equal to HTTP_HOST without the port part.
+   This is needed for Rack compliance. By default Nginx sets SERVER_NAME to
+   whatever is specified in the server_name directive, but that's not necessarily
+   the correct value. This fixes, for example, the use of the 'map' statement
+   in config.ru.
+ * [Nginx] Added the options passenger_buffer_size, passenger_buffers and passenger_busy_buffers_size.
+   These options are similar to proxy_module's similarly named options. You can
+   use these to e.g. increase the maximum header size limit.
+ * [Nginx] passenger_pre_start now supports virtual hosts that listen on Unix domain sockets.
+ * [Apache] Fixed the pcre.h compilation problem.
+ * [Standalone] Fixed 'passenger stop'.
+   It didn't work properly because it kept waiting for 'tail' to exit.
+   We now properly terminate 'tail' as well.
+ * Fixed compatibility with Rake 0.9.
+ * Fixed various Ruby 1.9 compatibility issues.
+ * Various documentation improvements.
+ * New Union Station filter language features.
+   It now supports status codes and response times.
+   Please refer to https://engage.unionstationapp.com/help#filtering
+   for more information.
+
+
 Release 3.0.7
 -------------
 

data/README

@@ -32,7 +32,7 @@ our website.
 You may also first generate a .gem file, and then install that.
 First, make sure that you have the following software installed:
 - Doxygen: http://www.stack.nl/~dimitri/doxygen/
-- Asciidoc: http://www.methods.co.nz/asciidoc/
+- Asciidoc >= 8.6.5: http://www.methods.co.nz/asciidoc/
 
 Next, run:
 

data/bin/passenger-install-nginx-module

@@ -390,7 +390,9 @@ private
 	end
 	
 	def build_nginx_configure_command(prefix, extra_configure_flags = nil)
-		command = "sh ./configure --prefix='#{prefix}' --with-http_ssl_module "
+		command = "sh ./configure --prefix='#{prefix}' "
+		command << "--with-http_ssl_module "
+		command << "--with-cc-opt='-Wno-error' "
 		if @pcre_source_dir
 			command << "--with-pcre='#{@pcre_source_dir}' "
 		elsif !pcre_is_installed?

data/build/config.rb

@@ -24,6 +24,7 @@
 OPTIMIZE = boolean_option("OPTIMIZE")
 CC       = string_option("CC", "gcc")
 CXX      = string_option("CXX", "g++")
+# TODO: consider -fcommon
 if OPTIMIZE
 	OPTIMIZATION_FLAGS = "#{PlatformInfo.debugging_cflags} -O2 -DBOOST_DISABLE_ASSERTS".strip
 else
@@ -32,7 +33,7 @@ end
 
 # Extra compiler flags that should always be passed to the C/C++ compiler.
 # Should be included last in the command string, even after PlatformInfo.portability_cflags.
-EXTRA_CXXFLAGS = "-Wall #{OPTIMIZATION_FLAGS}".strip
+EXTRA_CXXFLAGS = "-Wextra -Wno-unused-parameter -Wno-parentheses -Wpointer-arith -Wwrite-strings -Wno-missing-field-initializers -Wno-long-long #{OPTIMIZATION_FLAGS}".strip
 
 # Extra linker flags that should always be passed to the linker.
 # Should be included last in the command string, even after PlatformInfo.portability_ldflags.

data/build/cxx_tests.rb

@@ -125,9 +125,13 @@ TEST_CXX_OBJECTS = {
 		test/cxx/ScgiRequestParserTest.cpp
 		ext/nginx/ScgiRequestParser.h
 		ext/common/StaticString.h),
-	'test/cxx/HttpStatusExtractorTest.o' => %w(
-		test/cxx/HttpStatusExtractorTest.cpp
-		ext/nginx/HttpStatusExtractor.h),
+	'test/cxx/DechunkerTest.o' => %w(
+		test/cxx/DechunkerTest.cpp
+		ext/common/Utils/Dechunker.h),
+	'test/cxx/HttpHeaderBuffererTest.o' => %w(
+		test/cxx/HttpHeaderBuffererTest.cpp
+		ext/common/Utils/HttpHeaderBufferer.h
+		ext/common/Utils/StreamBoyerMooreHorspool.h),
 	'test/cxx/LoggingTest.o' => %w(
 		test/cxx/LoggingTest.cpp
 		ext/common/LoggingAgent/LoggingServer.h

data/build/documentation.rb

@@ -21,16 +21,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-ASCIIDOC_FLAGS = "-a toc -a numbered -a toclevels=3 -a icons"
-DOXYGEN = 'doxygen'
+ASCIIDOC_FLAGS = "-b html5 -a toc -a theme=flask -a numbered -a toclevels=3 -a icons"
 
 desc "Generate all documentation"
-task :doc => [:rdoc]
-
-if PlatformInfo.find_command(DOXYGEN)
-	task :doc => :doxygen
-end
-
 task :doc => Packaging::ASCII_DOCS
 
 Packaging::ASCII_DOCS.each do |target|
@@ -49,36 +42,8 @@ Packaging::ASCII_DOCS.each do |target|
 			sh "echo 'asciidoc required to build docs' > '#{target}'"
 		end
 	end
-end
-
-task :clobber => [:'doxygen:clobber'] do
-	sh "rm -f *.html"
-end
-
-desc "Generate Doxygen C++ API documentation if necessary"
-task :doxygen => ['doc/cxxapi']
-file 'doc/cxxapi' => Dir['ext/apache2/*.{h,c,cpp}'] do
-	sh "cd doc && doxygen"
-end
-
-desc "Force generation of Doxygen C++ API documentation"
-task :'doxygen:force' do
-	sh "cd doc && doxygen"
-end
-
-desc "Remove generated Doxygen C++ API documentation"
-task :'doxygen:clobber' do
-	sh "rm -rf doc/cxxapi"
-end
-
-Rake::RDocTask.new(:clobber_rdoc => "rdoc:clobber", :rerdoc => "rdoc:force") do |rd|
-	rd.main = "README"
-	rd.rdoc_dir = "doc/rdoc"
-	rd.rdoc_files.include("README", "DEVELOPERS.TXT",
-		"lib/phusion_passenger/*.rb",
-		"lib/phusion_passenger/*/*.rb",
-		"ext/phusion_passenger/*.c")
-	rd.template = "./doc/template/horo"
-	rd.title = "Passenger Ruby API"
-	rd.options << "-S" << "-N" << "-p" << "-H"
+	
+	task :clean do
+		sh "rm -f '#{target}'"
+	end
 end

data/build/nginx.rb

@@ -32,7 +32,6 @@ task :nginx => [
 dependencies = [
 	'ext/nginx/HelperAgent.cpp',
 	'ext/nginx/ScgiRequestParser.h',
-	'ext/nginx/HttpStatusExtractor.h',
 	'ext/common/StaticString.h',
 	'ext/common/Account.h',
 	'ext/common/AccountsDatabase.h',

data/build/packaging.rb

@@ -46,12 +46,6 @@ spec = Gem::Specification.new do |s|
 	s.add_dependency 'rack'
 	s.files = FileList[*Packaging::GLOB] - FileList[*Packaging::EXCLUDE_GLOB]
 	s.executables = Packaging::USER_EXECUTABLES + Packaging::SUPER_USER_EXECUTABLES
-	s.has_rdoc = true
-	s.extra_rdoc_files = ['README']
-	s.rdoc_options <<
-		"-S" << "-N" << "-p" << "-H" <<
-		'--main' << 'README' <<
-		'--title' << 'Passenger Ruby API'
 	s.description = "Easy and robust Ruby web application deployment."
 end
 

data/build/rake_extensions.rb

@@ -104,6 +104,11 @@ def subdir(dir, &block)
 end
 
 class Subdir # :nodoc:
+	# Rake 0.9 compatibility since methods like <tt>task<tt> and <tt>desc</tt>
+	# aren't available in Object anymore.
+	# See: https://github.com/jimweirich/rake/issues/33#issuecomment-1213705
+	include Rake::DSL if defined?(Rake::DSL)
+	
 	def initialize(dir)
 		@dir = dir
 		@toplevel_dir = Pathname.getwd

data/doc/Architectural overview.html

@@ -1,16 +1,35 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
-    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<!DOCTYPE html>
+<html lang="en">
 <head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.1" />
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta name="generator" content="AsciiDoc 8.6.5">
 <title>Passenger architectural overview</title>
 <style type="text/css">
-/* Debug borders */
-p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
 /*
-  border: 1px solid red;
-*/
+ * AsciiDoc 'flask' theme for xhtml11 and html5 backends. A shameless knock-off
+ * of the Flask website styling (http://flask.pocoo.org/docs/).
+ *
+ * The implementation is straight-forward, consisting of the asciidoc.css file
+ * followed by theme specific overrides.
+ *
+ * */
+
+
+/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
+
+/* Default font. */
+body {
+  font-family: Georgia,serif;
+}
+
+/* Title font. */
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+  font-family: Arial,Helvetica,sans-serif;
 }
 
 body {
@@ -35,13 +54,8 @@ strong {
   color: #083194;
 }
 
-tt {
-  color: navy;
-}
-
 h1, h2, h3, h4, h5, h6 {
   color: #527bbd;
-  font-family: sans-serif;
   margin-top: 1.2em;
   margin-bottom: 0.5em;
   line-height: 1.3;
@@ -59,9 +73,11 @@ h3 {
 h3 + * {
   clear: left;
 }
+h5 {
+  font-size: 1.0em;
+}
 
 div.sectionbody {
-  font-family: serif;
   margin-left: 0;
 }
 
@@ -77,45 +93,44 @@ p {
 ul, ol, li > p {
   margin-top: 0;
 }
+ul > li     { color: #aaa; }
+ul > li > * { color: black; }
 
 pre {
   padding: 0;
   margin: 0;
 }
 
-span#author {
+#author {
   color: #527bbd;
-  font-family: sans-serif;
   font-weight: bold;
   font-size: 1.1em;
 }
-span#email {
+#email {
 }
-span#revnumber, span#revdate, span#revremark {
-  font-family: sans-serif;
+#revnumber, #revdate, #revremark {
 }
 
-div#footer {
-  font-family: sans-serif;
+#footer {
   font-size: small;
   border-top: 2px solid silver;
   padding-top: 0.5em;
   margin-top: 4.0em;
 }
-div#footer-text {
+#footer-text {
   float: left;
   padding-bottom: 0.5em;
 }
-div#footer-badges {
+#footer-badges {
   float: right;
   padding-bottom: 0.5em;
 }
 
-div#preamble {
+#preamble {
   margin-top: 1.5em;
   margin-bottom: 1.5em;
 }
-div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
+div.imageblock, div.exampleblock, div.verseblock,
 div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
 div.admonitionblock {
   margin-top: 1.0em;
@@ -135,7 +150,6 @@ div.content { /* Block element content. */
 /* Block element titles. */
 div.title, caption.title {
   color: #527bbd;
-  font-family: sans-serif;
   font-weight: bold;
   text-align: left;
   margin-top: 1.0em;
@@ -157,13 +171,15 @@ div.content + div.title {
 
 div.sidebarblock > div.content {
   background: #ffffee;
-  border: 1px solid silver;
+  border: 1px solid #dddddd;
+  border-left: 4px solid #f0f0f0;
   padding: 0.5em;
 }
 
 div.listingblock > div.content {
-  border: 1px solid silver;
-  background: #f4f4f4;
+  border: 1px solid #dddddd;
+  border-left: 5px solid #f0f0f0;
+  background: #f8f8f8;
   padding: 0.5em;
 }
 
@@ -171,7 +187,7 @@ div.quoteblock, div.verseblock {
   padding-left: 1.0em;
   margin-left: 1.0em;
   margin-right: 10%;
-  border-left: 5px solid #dddddd;
+  border-left: 5px solid #f0f0f0;
   color: #777777;
 }
 
@@ -182,6 +198,7 @@ div.quoteblock > div.attribution {
 
 div.verseblock > pre.content {
   font-family: inherit;
+  font-size: inherit;
 }
 div.verseblock > div.attribution {
   padding-top: 0.75em;
@@ -254,36 +271,12 @@ div.compact div, div.compact div {
   margin-bottom: 0.1em;
 }
 
-div.tableblock > table {
-  border: 3px solid #527bbd;
-}
-thead, p.table.header {
-  font-family: sans-serif;
-  font-weight: bold;
-  color: #527bbd;
-}
 tfoot {
   font-weight: bold;
 }
 td > div.verse {
   white-space: pre;
 }
-p.table {
-  margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
-  border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
-  border-left-style: none;
-  border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
-  border-top-style: none;
-  border-bottom-style: none;
-}
-
 
 div.hdlist {
   margin-top: 0.8em;
@@ -350,16 +343,15 @@ div.colist td img {
 }
 
 @media print {
-  div#footer-badges { display: none; }
+  #footer-badges { display: none; }
 }
 
-div#toc {
+#toc {
   margin-bottom: 2.5em;
 }
 
-div#toctitle {
+#toctitle {
   color: #527bbd;
-  font-family: sans-serif;
   font-size: 1.1em;
   font-weight: bold;
   margin-top: 1.0em;
@@ -383,10 +375,223 @@ div.toclevel4 {
   font-size: 0.9em;
 }
 
+span.aqua { color: aqua; }
+span.black { color: black; }
+span.blue { color: blue; }
+span.fuchsia { color: fuchsia; }
+span.gray { color: gray; }
+span.green { color: green; }
+span.lime { color: lime; }
+span.maroon { color: maroon; }
+span.navy { color: navy; }
+span.olive { color: olive; }
+span.purple { color: purple; }
+span.red { color: red; }
+span.silver { color: silver; }
+span.teal { color: teal; }
+span.white { color: white; }
+span.yellow { color: yellow; }
+
+span.aqua-background { background: aqua; }
+span.black-background { background: black; }
+span.blue-background { background: blue; }
+span.fuchsia-background { background: fuchsia; }
+span.gray-background { background: gray; }
+span.green-background { background: green; }
+span.lime-background { background: lime; }
+span.maroon-background { background: maroon; }
+span.navy-background { background: navy; }
+span.olive-background { background: olive; }
+span.purple-background { background: purple; }
+span.red-background { background: red; }
+span.silver-background { background: silver; }
+span.teal-background { background: teal; }
+span.white-background { background: white; }
+span.yellow-background { background: yellow; }
+
+span.big { font-size: 2em; }
+span.small { font-size: 0.6em; }
+
+span.underline { text-decoration: underline; }
+span.overline { text-decoration: overline; }
+span.line-through { text-decoration: line-through; }
+
+
+/*
+ * xhtml11 specific
+ *
+ * */
+
+tt {
+  font-family: monospace;
+  font-size: inherit;
+  color: navy;
+}
+
+div.tableblock {
+  margin-top: 1.0em;
+  margin-bottom: 1.5em;
+}
+div.tableblock > table {
+  border: 3px solid #527bbd;
+}
+thead, p.table.header {
+  font-weight: bold;
+  color: #527bbd;
+}
+p.table {
+  margin-top: 0;
+}
+/* Because the table frame attribute is overriden by CSS in most browsers. */
+div.tableblock > table[frame="void"] {
+  border-style: none;
+}
+div.tableblock > table[frame="hsides"] {
+  border-left-style: none;
+  border-right-style: none;
+}
+div.tableblock > table[frame="vsides"] {
+  border-top-style: none;
+  border-bottom-style: none;
+}
+
+
+/*
+ * html5 specific
+ *
+ * */
+
+.monospaced {
+  font-family: monospace;
+  font-size: inherit;
+  color: navy;
+}
+
+table.tableblock {
+  margin-top: 1.0em;
+  margin-bottom: 1.5em;
+}
+thead, p.tableblock.header {
+  font-weight: bold;
+  color: #527bbd;
+}
+p.tableblock {
+  margin-top: 0;
+}
+table.tableblock {
+  border-width: 3px;
+  border-spacing: 0px;
+  border-style: solid;
+  border-color: #527bbd;
+  border-collapse: collapse;
+}
+th.tableblock, td.tableblock {
+  border-width: 1px;
+  padding: 4px;
+  border-style: solid;
+  border-color: #527bbd;
+}
+
+table.tableblock.frame-topbot {
+  border-left-style: hidden;
+  border-right-style: hidden;
+}
+table.tableblock.frame-sides {
+  border-top-style: hidden;
+  border-bottom-style: hidden;
+}
+table.tableblock.frame-none {
+  border-style: hidden;
+}
+
+th.tableblock.halign-left, td.tableblock.halign-left {
+  text-align: left;
+}
+th.tableblock.halign-center, td.tableblock.halign-center {
+  text-align: center;
+}
+th.tableblock.halign-right, td.tableblock.halign-right {
+  text-align: right;
+}
+
+th.tableblock.valign-top, td.tableblock.valign-top {
+  vertical-align: top;
+}
+th.tableblock.valign-middle, td.tableblock.valign-middle {
+  vertical-align: middle;
+}
+th.tableblock.valign-bottom, td.tableblock.valign-bottom {
+  vertical-align: bottom;
+}
+
+
+/*
+ * Theme specific overrides of the preceding (asciidoc.css) CSS.
+ *
+ */
+body {
+  font-family: Garamond, Georgia, serif;
+  font-size: 17px;
+  color: #3E4349;
+  line-height: 1.3em;
+}
+h1, h2, h3, h4, h5, h6,
+div.title, caption.title,
+thead, p.table.header,
+#toctitle,
+#author, #revnumber, #revdate, #revremark,
+#footer {
+  font-family: Garmond, Georgia, serif;
+  font-weight: normal;
+  border-bottom-width: 0;
+  color: #3E4349;
+}
+div.title, caption.title { color: #596673; font-weight: bold; }
+h1 { font-size: 240%; }
+h2 { font-size: 180%; }
+h3 { font-size: 150%; }
+h4 { font-size: 130%; }
+h5 { font-size: 100%; }
+h6 { font-size: 100%; }
+#header h1 { margin-top: 0; }
+#toc {
+  color: #444444;
+  line-height: 1.5;
+  padding-top: 1.5em;
+}
+#toctitle {
+  font-size: 20px;
+}
+#toc a {
+    border-bottom: 1px dotted #999999;
+    color: #444444 !important;
+    text-decoration: none !important;
+}
+#toc a:hover {
+    border-bottom: 1px solid #6D4100;
+    color: #6D4100 !important;
+    text-decoration: none !important;
+}
+div.toclevel1 { margin-top: 0.2em; font-size: 16px; }
+div.toclevel2 { margin-top: 0.15em; font-size: 14px; }
+em, dt, td.hdlist1 { color: black; }
+strong { color: #3E4349; }
+a { color: #004B6B; text-decoration: none; border-bottom: 1px dotted #004B6B; }
+a:visited { color: #615FA0; border-bottom: 1px dotted #615FA0; }
+a:hover { color: #6D4100; border-bottom: 1px solid #6D4100; }
+div.tableblock > table, table.tableblock { border: 3px solid #E8E8E8; }
+th.tableblock, td.tableblock { border: 1px solid #E8E8E8; }
+ul > li > * { color: #3E4349; }
+pre, tt, .monospaced { font-family: Consolas,Menlo,'Deja Vu Sans Mono','Bitstream Vera Sans Mono',monospace; }
+tt, .monospaced { font-size: 0.9em; color: black;
+}
+div.exampleblock > div.content, div.sidebarblock > div.content, div.listingblock > div.content { border-width: 0 0 0 3px; border-color: #E8E8E8; }
+div.verseblock { border-left-width: 0; margin-left: 3em; }
+div.quoteblock { border-left-width: 3px; margin-left: 0; margin-right: 0;}
+div.admonitionblock td.content { border-left: 3px solid #E8E8E8; }
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
-window.onload = function(){asciidoc.footnotes(); asciidoc.toc(3);}
 var asciidoc = {  // Namespace.
 
 /////////////////////////////////////////////////////////////////////
@@ -448,6 +653,25 @@ toc: function (toclevels) {
   }
 
   var toc = document.getElementById("toc");
+  if (!toc) {
+    return;
+  }
+
+  // Delete existing TOC entries in case we're reloading the TOC.
+  var tocEntriesToRemove = [];
+  var i;
+  for (i = 0; i < toc.childNodes.length; i++) {
+    var entry = toc.childNodes[i];
+    if (entry.nodeName == 'DIV'
+     && entry.getAttribute("class")
+     && entry.getAttribute("class").match(/^toclevel/))
+      tocEntriesToRemove.push(entry);
+  }
+  for (i = 0; i < tocEntriesToRemove.length; i++) {
+    toc.removeChild(tocEntriesToRemove[i]);
+  }
+
+  // Rebuild TOC entries.
   var entries = tocEntries(document.getElementById("content"), toclevels);
   for (var i = 0; i < entries.length; ++i) {
     var entry = entries[i];
@@ -475,24 +699,44 @@ toc: function (toclevels) {
  */
 
 footnotes: function () {
-  var cont = document.getElementById("content");
+  // Delete existing footnote entries in case we're reloading the footnodes.
+  var i;
   var noteholder = document.getElementById("footnotes");
+  if (!noteholder) {
+    return;
+  }
+  var entriesToRemove = [];
+  for (i = 0; i < noteholder.childNodes.length; i++) {
+    var entry = noteholder.childNodes[i];
+    if (entry.nodeName == 'DIV' && entry.getAttribute("class") == "footnote")
+      entriesToRemove.push(entry);
+  }
+  for (i = 0; i < entriesToRemove.length; i++) {
+    noteholder.removeChild(entriesToRemove[i]);
+  }
+
+  // Rebuild footnote entries.
+  var cont = document.getElementById("content");
   var spans = cont.getElementsByTagName("span");
   var refs = {};
   var n = 0;
   for (i=0; i<spans.length; i++) {
     if (spans[i].className == "footnote") {
       n++;
-      // Use [\s\S] in place of . so multi-line matches work.
-      // Because JavaScript has no s (dotall) regex flag.
-      note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+      var note = spans[i].getAttribute("data-note");
+      if (!note) {
+        // Use [\s\S] in place of . so multi-line matches work.
+        // Because JavaScript has no s (dotall) regex flag.
+        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
+        spans[i].innerHTML =
+          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
+          "' title='View footnote' class='footnote'>" + n + "</a>]";
+        spans[i].setAttribute("data-note", note);
+      }
       noteholder.innerHTML +=
         "<div class='footnote' id='_footnote_" + n + "'>" +
         "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
         n + "</a>. " + note + "</div>";
-      spans[i].innerHTML =
-        "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
-        "' title='View footnote' class='footnote'>" + n + "</a>]";
       var id =spans[i].getAttribute("id");
       if (id != null) refs["#"+id] = n;
     }
@@ -512,9 +756,32 @@ footnotes: function () {
       }
     }
   }
+},
+
+install: function(toclevels) {
+  var timerId;
+
+  function reinstall() {
+    asciidoc.footnotes();
+    if (toclevels) {
+      asciidoc.toc(toclevels);
+    }
+  }
+
+  function reinstallAndRemoveTimer() {
+    clearInterval(timerId);
+    reinstall();
+  }
+
+  timerId = setInterval(reinstall, 500);
+  if (document.addEventListener)
+    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+  else
+    window.onload = reinstallAndRemoveTimer;
 }
 
 }
+asciidoc.install(3);
 /*]]>*/
 </script>
 </head>
@@ -550,7 +817,7 @@ to exit. This does not necessarily mean that the web application speaks HTTP
 directly: it just means that the web application accepts some kind of
 representation of an HTTP request.</p></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/typical_isolated_web_application.png" alt="Architecture of a typical web application in isolation" />
+<img src="images/typical_isolated_web_application.png" alt="Architecture of a typical web application in isolation">
 </span></p></div>
 <div class="paragraph"><p>Few web applications are accessible directly by HTTP clients. Common setups
 are:</p></div>
@@ -605,8 +872,8 @@ considered to be a single entity; a black box if you will.</p></div>
 <div class="paragraph"><p>It should also be noted that these setups do not enforce any particular
 I/O processing implementation. The web servers, application servers, web
 applications, etc. could process I/O serially (i.e. one request at a time),
-could multiplex I/O with a single thread (e.g. by using <tt>select(2)</tt> or
-<tt>poll(2)</tt>) or it could process I/O with multiple threads and/or multiple
+could multiplex I/O with a single thread (e.g. by using <span class="monospaced">select(2)</span> or
+<span class="monospaced">poll(2)</span>) or it could process I/O with multiple threads and/or multiple
 processes.</p></div>
 <div class="paragraph"><p>Of course, there are many variations possible. For example, load balancers
 could be used. But that is outside the scope of this document.</p></div>
@@ -656,7 +923,7 @@ The next section contains a diagram which shows the prefork MPM&#8217;s architec
 Passenger extends Apache and allows it to act like an application server.
 Passenger&#8217;s architecture&#8201;&#8212;&#8201;assuming Apache 2 with the prefork MPM is used&#8201;&#8212;&#8201;is shown in the following diagram:</p></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/passenger_architecture.png" alt="Passenger&#8217;s architecture" />
+<img src="images/passenger_architecture.png" alt="Passenger&#8217;s architecture">
 </span></p></div>
 <div class="paragraph"><p>Passenger consists of an Apache module, <em>mod_passenger</em>. This is written in
 C++, and can be found in the directory <em>ext/apache2</em>. The module is active in
@@ -737,8 +1004,8 @@ worker process will communicate directly with the Rails application.</p></div>
 <div class="paragraph"><p>The application pool is implemented inside <em>mod_passenger</em>. One can find
 detailed documentation about it in
 <a href="cxxapi/index.html">the C++ API documentation</a>,
-in particular the documentation about the <tt>ApplicationPool</tt>,
-<tt>StandardApplicationPool</tt> and <tt>ApplicationPoolServer</tt> classes.</p></div>
+in particular the documentation about the <span class="monospaced">ApplicationPool</span>,
+<span class="monospaced">StandardApplicationPool</span> and <span class="monospaced">ApplicationPoolServer</span> classes.</p></div>
 <div class="paragraph"><p>The application pool is responsible for spawning applications, caching
 spawned applications' handles, and cleaning up applications which have been
 idle for an extended period of time.</p></div>
@@ -780,7 +1047,7 @@ implementation in detail.</p></div>
 </li>
 </ol></div>
 <div class="paragraph"><p><span class="image">
-<img src="images/spawn_server_architecture.png" alt="The spawn server&#8217;s architecture" />
+<img src="images/spawn_server_architecture.png" alt="The spawn server&#8217;s architecture">
 </span></p></div>
 <div class="paragraph"><p>As you can see, we have two layers of code caching: when the spawn server
 receives a request to spawn a new application instance, it will forward the
@@ -815,7 +1082,7 @@ memory usage.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
+<img src="./images/icons/note.png" alt="Note">
 </td>
 <td class="content">
 <div class="paragraph"><p>Sharing memory only works if <a href="http://www.rubyenterpriseedition.com/">Ruby
@@ -876,13 +1143,13 @@ algorithm, which is non-trivial. The algorithm is documented in detail in
 Attribution-Share Alike 3.0 Unported License</a>.</p></div>
 <div class="paragraph"><p><span class="image">
 <a class="image" href="link:http://creativecommons.org/licenses/by-sa/3.0/">
-<img src="images/by_sa.png" alt="images/by_sa.png" />
+<img src="images/by_sa.png" alt="images/by_sa.png">
 </a>
 </span></p></div>
 </div>
 </div>
 </div>
-<div id="footnotes"><hr /></div>
+<div id="footnotes"><hr></div>
 <div id="footer">
 <div id="footer-text">
 Last updated 2010-09-25 20:09:08 CEST