passenger 5.0.1 → 5.0.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzQxOGI3N2E5ZWJiMjU3MGY2YmI4NzAxYWQ1ZTdlYTA3Yjk5N2FiMQ==
+    N2JiN2YxMTU2OTZmZTQzMzIwMTk1MWM4ZGZkYzZlZmJmMjdiZTM3NA==
   data.tar.gz: !binary |-
-    ZjYxYTNjYjU0M2IxZWVjNzFmN2VmZGM2NWRkODg2NjliMTRiODE5Nw==
+    YWQ0YzJmMDg0MzMwYzBkOGQwZjExYWIzMjA1ZGM4MTAxMDE5NDNkZQ==
 SHA512:
   metadata.gz: !binary |-
-    NWNmNjM1MWEzYWU3ZjA3MjM3NmI2ODNlOWQ1MDcxYzUwMTU2NWEyZjJjZjc0
-    NDlhMDJjMTdlOWJlYjcxYmI5OGU0ODczOWU2Y2NjZjQzOWMwM2I3YmY0Y2Rm
-    NzZhNWY0MzY0M2VhMzRhMDQ0MjExNzdlYTM2OGU3YzdmNmU0NDU=
+    ZGZhMjdiMTZhYTk1MDRiMTYxNTlhMjhiZjNmZDI3OTBmYWZkZmEzM2ZkMDY5
+    ZTU4MDRmZWU1NjdiOTYxZjk2OGM0YmE3ZmZkNzU2YjRmZGIwMzI1M2UxYmU2
+    YTBmYWEyNzdlZWYzMzQ0YzczYmRiNjcwYTVjMDQzMTVjNjBiMmM=
   data.tar.gz: !binary |-
-    ZTg5MGY4MTZjYTdkNmMzYjFlNDNhM2U3M2U1ODc1M2QxY2I2NDI1MTBlYzIz
-    NGU4MjVkN2JjZmNlMzg0MDNjNzhiOWZkNGRlMDMxMGZlYzc2NDVlMzkwN2Iy
-    MTBkYTA2OWFhOTM4MWU5MmUyZDRhMDE4MmJlN2U4NmNmNDc3MzM=
+    MzliMDhiMjI5MzM2NTZjNmUwYmQ4MWVhNmZiY2EwYTczNGY0NzI1YzAwMzQ4
+    MmQwZTQwZTI0Y2U2NjBiY2ZmZGQzZTI1YmVjN2MzMjNkNTUwOTk0NDJiZTI3
+    ZThhZTk0MzFjODY2NjQ1NWFlMzBiOTkwZWM0NTNmYmI4MjljYzY=

checksums.yaml.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU9xtNAAoJECrHRaUKISqMJQAIAJrl0J6b4TJ5HELJjdVBV3Qq
-nZXFQt1JW6nf2i2/vAabc1LPG4RcMakOuzKmn3HLFuxasaZXHhrNtAMLboaIAs7n
-Hk2PuOh01nvbLm/mSVajzfRL9EkUfjJpoFtLfwlRt5c7J++PmbdFdNucsAYzIYgl
-12nRnu6CUc7SxVki6QC5mZwJeKcR/QvzCWG7bJ2NDvvQWoKcmkksHlBmSOhPQWC9
-lExE5ZgZSjmjMeBd1peheNLPW62SVlZBKOgA32yA5wNg/KqZ88YalxQp82Pit44N
-9iCA7A3PW+dUcrjbmXRYKDYSOg0SIAJvjCdRhHdcssbQPlGVbFrEZfRHrWxaRVw=
-=xWOs
+iQEcBAABAgAGBQJU+skQAAoJECrHRaUKISqMCYEIALFilhp8+SVXIUbPuDbRWt+0
+V8JijFYyXw1Jiy5VFW5V20Zu70okzRXd9V+u3UvgdRkftqrIPsp4b+vW18pAeg4i
+Gse7Wjr53xMvNthIZKqC0BY6zi9FurzkgP4r0hkd2cLmcjB53NNui7nPuYt9mMwH
++WplJeAazcISRhQRJnlBLMDrVWesgJMj+xP/8SaKGsIYfVju8m78TI+hl0X+XT0T
+qt9zZDLRd7EpJUS5BovYAFiU7ljLXeFt9bmvN23kZ1MB49GpaPe9hA9L8pRhZmOT
+7oyLImaMKFprjwL+vPS8JYM0b+NVYkT1ALki08yEoKIpwtnujkNFr6KpHAyGSFc=
+=o0Sc
 -----END PGP SIGNATURE-----

data.tar.gz.asc

@@ -2,11 +2,11 @@
 Version: GnuPG/MacGPG2 v2.0.17 (Darwin)
 Comment: GPGTools - http://gpgtools.org
 
-iQEcBAABAgAGBQJU9xtNAAoJECrHRaUKISqMRNsIAJ3SdZ3briMF68aVBwnDb9Ht
-z4uRqGROnKA/FX7EpVRtxEypVaArGgvfSI+C2jho91GIBWoEL5S5YEbRL3RwUci0
-Pr4Ts+g9OYvmzYFrTmzM75W8pF2nht1hm9bxu1xxdfQMo9ts8+J9vpFjPv31+d6z
-o1JnVIHZXUw9NPeAUZzBN0DMozpDqY7JH1DXYzwR7uejikz3bDbTmnPq5xIv1RAO
-7aR1VfOrHm3HCs8HMPXO46vfdg4bnhrzhVQgj8xKiMXQJrd6Si/Tx6kDURDGt0zr
-BBxiuYcCeVVG5LDCY6PCvaUNMal7m/98xG4AFCYpe3LirpthzAo6OZTDbaI8Dbk=
-=1Ov4
+iQEcBAABAgAGBQJU+skQAAoJECrHRaUKISqM3w8IALm2kOp7hWd1Qy4mvAl7czSb
+b+V/QGy14Mlt+v24GIuVjl88CaX4qA3eHGzsBNb807+L3pc/PYPi7qd0pf0hEN6x
+kL730RkjnSFvpuLE37kuemtStVUKHnO8jxMbGWMUZEdEOLThw4LkeDKJPAjm2M2V
+dWuHzzdFsA3tb79dy6dL8SSkpqwpfHhpeCdHbgZXhMq+PhllCieeICuwBvZeSOvE
+mOwAqt5Toq1KNoKPE/gOPiywGsNQgLYn6HXYTuHrCz/p8YMjJOiTEMODTJD4io4V
+cF6byuXfikIouVBgkZQYbwuItMlpJr9e4oZidjBZ7trFmqOT1FnnFiMUehsaHzw=
+=h4HJ
 -----END PGP SIGNATURE-----

data/.editorconfig

@@ -53,6 +53,16 @@ indent_style = space
 indent_size = 2
 trim_trailing_whitespace = true
 
+[Rakefile]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
+[Gemfile]
+indent_style = space
+indent_size = 2
+trim_trailing_whitespace = true
+
 [*.js]
 indent_style = tab
 indent_size = 4

data/CHANGELOG

@@ -1,3 +1,15 @@
+Release 5.0.2
+-------------
+
+ * Fixes a connection freeze that could occur when processing large responses. This would manifest itself under the error message "This website is under heavy load" or "Request queue is full, returning an error". Closes GH-1404.
+ * Debian and Ubuntu packages have been reintroduces.
+ * When `passenger-config restart-app` is run interactively, if Passenger is not serving any applications, then the command now prints an error message instead of showing a menu with only a "Cancel" option.
+ * Fixes a compilation problem on FreeBSD 10 (contributed by: clemensg). Closes GH-1401.
+ * [Standalone] Fixes a crash that would occur if you use the `--ctl` parameter.
+ * [Enterprise] The `--max-request-time` option has been added to Passenger Standalone.
+ * [Enterprise] The `max_request_time_reached` hook has been introduced. This hook allows you to run diagnostics on a process that that took too long to respond to a request.
+
+
 Release 5.0.1
 -------------
 

data/CONTRIBUTING.md

@@ -17,6 +17,7 @@
    * [Ruby coding style](#ruby_coding_style)
    * [Systems programming fundamentals](#systems_programming_fundamentals)
    * [Further reading](#further_reading)
+ * [Git structure] (#git_structure)
 
 Thank you for your interest in Phusion Passenger. Phusion Passenger is open source so your contributions are very welcome. Although we also provide a [commercial version](https://www.phusionpassenger.com/enterprise) and [commercial support](https://www.phusionpassenger.com/commercial_support), the core remains open source and we remain committed to keep it that way. This guide gives you an overview of the ways with which you can contribute, as well as contribution guidelines.
 
@@ -348,3 +349,12 @@ A good and comprehensive, but rather large source for learning POSIX is the [POS
 ### Further reading
 
  * [Coding Tips and Pitfalls](https://github.com/phusion/passenger/blob/master/doc/CodingTipsAndPitfalls.md)
+
+<a name="git_structure"></a>
+### Git structure
+
+The **master** branch is the main development branch, containing the latest and greatest code that was tested and accepted for inclusion into passenger (usually merged in from loose development branches that are deleted afterwards). This branch may not be stable enough yet for production.
+
+Branches like **stable-4.0**, **stable-5.0** are production quality branches (split off from master) for major versions. Each production branch has tags for minor versions, whereby **tag x.0.1** represents the first production-ready version on a branch (there may be some release candidates before that). For example: branch stable-5.0, tagged 5.0.1 is the first release of the 5.0 line that is ready for production.
+
+In general we apply fixes to the respective stable branch and merge these into the master, so it is easiest if you submit pull requests to the stable branches (unless of course you are working with the unstable master). Conversely, new features always go to the master and are then cherrypicked from one or more branches.

data/CONTRIBUTORS

@@ -12,6 +12,7 @@ Bernd Ahlers
 Chad Fowler
 Chris Walquist
 Christoffer Sawicki
+Clemens Gruber
 Damien Le Berrigaud
 Dan Peterson
 Danial Pearce

data/Gemfile

@@ -1,17 +1,17 @@
 source 'https://rubygems.org/'
 
 group :base do
-	gem 'mime-types', '1.25'
-	gem 'rspec', '2.14.1'
-	gem 'rake'
-	gem 'drake'
-	gem 'json'
-	gem 'rack'
+  gem 'mime-types', '1.25'
+  gem 'rspec', '2.14.1'
+  gem 'rake'
+  gem 'drake'
+  gem 'json'
+  gem 'rack'
 end
 
 group :doc do
-	# Last version that worked on Ruby 1.8
-	gem 'nokogiri', '1.5.9'
-	gem 'mizuho'
-	gem 'bluecloth'
+  # Last version that worked on Ruby 1.8
+  gem 'nokogiri', '1.5.9'
+  gem 'mizuho'
+  gem 'bluecloth'
 end

data/build/basics.rb

@@ -146,15 +146,19 @@ USE_DMALLOC = boolean_option('USE_DMALLOC')
 USE_EFENCE  = boolean_option('USE_EFENCE')
 USE_ASAN    = boolean_option('USE_ASAN')
 OPTIMIZE    = boolean_option('OPTIMIZE')
+LTO         = OPTIMIZE && boolean_option('LTO')
 
 # Agent-specific compiler flags.
 AGENT_CFLAGS  = ""
-AGENT_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 AGENT_CFLAGS << " -O" if OPTIMIZE
+AGENT_CFLAGS << " -flto" if LTO
+AGENT_CFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 AGENT_CFLAGS.strip!
 
 # Agent-specific linker flags.
 AGENT_LDFLAGS = ""
+AGENT_LDFLAGS << " -O" if OPTIMIZE
+AGENT_LDFLAGS << " -flto" if LTO
 AGENT_LDFLAGS << " #{PlatformInfo.dmalloc_ldflags}" if USE_DMALLOC
 AGENT_LDFLAGS << " #{PlatformInfo.electric_fence_ldflags}" if USE_EFENCE
 AGENT_LDFLAGS << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN

data/build/common_library.rb

@@ -36,66 +36,44 @@ def define_libboost_oxt_task(namespace, output_dir, extra_compiler_flags = nil)
   output_file = "#{output_dir}.a"
   flags = "-Iext #{extra_compiler_flags} #{EXTRA_CXXFLAGS}"
 
-  if false && boolean_option('RELEASE')
-    # Disable RELEASE support. Passenger Standalone wants to link to the
-    # common library but does not know whether it was compiled with RELEASE
-    # or not. See http://code.google.com/p/phusion-passenger/issues/detail?id=808
-    sources = Dir['ext/boost/libs/**/*.cpp'] + Dir['ext/oxt/*.cpp']
-    sources.sort!
-
-    aggregate_source = "#{output_dir}/aggregate.cpp"
-    aggregate_object = "#{output_dir}/aggregate.o"
-    object_files     = [aggregate_object]
-
-    file(aggregate_object => sources) do
-      sh "mkdir -p #{output_dir}" if !File.directory?(output_dir)
-      aggregate_content = %Q{
-        #ifndef _GNU_SOURCE
-          #define _GNU_SOURCE
-        #endif
-      }
-      sources.each do |source_file|
-        name = source_file.sub(/^ext\//, '')
-        aggregate_content << "#include \"#{name}\"\n"
-      end
-      File.open(aggregate_source, 'w') do |f|
-        f.write(aggregate_content)
-      end
-      compile_cxx(aggregate_source, "#{flags} -o #{aggregate_object}")
-    end
-  else
-    # Define compilation targets for .cpp files in ext/boost/src/pthread.
-    boost_object_files = []
-    Dir['ext/boost/libs/**/*.cpp'].each do |source_file|
-      object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
-      boost_output_dir  = "#{output_dir}/boost"
-      object_file = "#{boost_output_dir}/#{object_name}"
-      boost_object_files << object_file
-
-      file object_file => source_file do
-        sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
-        compile_cxx(source_file, "#{flags} -o #{object_file}")
-      end
+  if OPTIMIZE
+    optimize = "-O2"
+    if LTO
+      optimize << " -flto"
     end
+  end
 
-    # Define compilation targets for .cpp files in ext/oxt.
-    oxt_object_files = []
-    oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
-    Dir['ext/oxt/*.cpp'].each do |source_file|
-      object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
-      oxt_output_dir  = "#{output_dir}/oxt"
-      object_file = "#{oxt_output_dir}/#{object_name}"
-      oxt_object_files << object_file
-
-      file object_file => [source_file, *oxt_dependency_files] do
-        sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
-        compile_cxx(source_file, "-O2 #{flags} -o #{object_file}".strip)
-      end
+  # Define compilation targets for .cpp files in ext/boost/src/pthread.
+  boost_object_files = []
+  Dir['ext/boost/libs/**/*.cpp'].each do |source_file|
+    object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+    boost_output_dir  = "#{output_dir}/boost"
+    object_file = "#{boost_output_dir}/#{object_name}"
+    boost_object_files << object_file
+
+    file object_file => source_file do
+      sh "mkdir -p #{boost_output_dir}" if !File.directory?(boost_output_dir)
+      compile_cxx(source_file, "#{optimize} #{flags} -o #{object_file}")
     end
+  end
 
-    object_files = boost_object_files + oxt_object_files
+  # Define compilation targets for .cpp files in ext/oxt.
+  oxt_object_files = []
+  oxt_dependency_files = Dir["ext/oxt/*.hpp"] + Dir["ext/oxt/detail/*.hpp"]
+  Dir['ext/oxt/*.cpp'].each do |source_file|
+    object_name = File.basename(source_file.sub(/\.cpp$/, '.o'))
+    oxt_output_dir  = "#{output_dir}/oxt"
+    object_file = "#{oxt_output_dir}/#{object_name}"
+    oxt_object_files << object_file
+
+    file object_file => [source_file, *oxt_dependency_files] do
+      sh "mkdir -p #{oxt_output_dir}" if !File.directory?(oxt_output_dir)
+      compile_cxx(source_file, "#{optimize} #{flags} -o #{object_file}".strip)
+    end
   end
 
+  object_files = boost_object_files + oxt_object_files
+
   file(output_file => object_files) do
     sh "mkdir -p #{output_dir}"
     create_static_library(output_file, object_files.join(' '))
@@ -238,5 +216,5 @@ libboost_oxt_cflags = ""
 libboost_oxt_cflags << " #{PlatformInfo.adress_sanitizer_flag}" if USE_ASAN
 libboost_oxt_cflags.strip!
 LIBBOOST_OXT = define_libboost_oxt_task("common", COMMON_OUTPUT_DIR + "libboost_oxt", libboost_oxt_cflags)
-COMMON_LIBRARY.enable_optimizations! if OPTIMIZE
+COMMON_LIBRARY.enable_optimizations!(LTO) if OPTIMIZE
 COMMON_LIBRARY.define_tasks(libboost_oxt_cflags)

data/build/debian.rb

@@ -102,8 +102,7 @@ task 'debian:dev' do
     sh "cd #{PKG_DIR}/#{distribution} && dpkg-checkbuilddeps"
   end
   distributions.each do |distribution|
-    sh "cd #{PKG_DIR}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-F " +
-      "debuild -e CCACHE_* -us -uc"
+    sh "cd #{PKG_DIR}/#{distribution} && debuild -e CCACHE_* -us -uc -F"
   end
 end
 
@@ -147,8 +146,7 @@ task 'debian:source_packages' => 'debian:orig_tarball' do
     create_debian_package_dir(distribution, pkg_dir)
   end
   ALL_DISTRIBUTIONS.each do |distribution|
-    sh "cd #{pkg_dir}/#{distribution} && env DEBUILD_DPKG_BUILDPACKAGE_OPTS=-S " +
-      "debuild -us -uc"
+    sh "cd #{pkg_dir}/#{distribution} && debuild -us -uc -S"
   end
 end
 

data/build/packaging.rb

@@ -1,5 +1,5 @@
 #  Phusion Passenger - https://www.phusionpassenger.com/
-#  Copyright (c) 2010-2014 Phusion
+#  Copyright (c) 2010-2015 Phusion
 #
 #  "Phusion Passenger" is a trademark of Hongli Lai & Ninh Bui.
 #
@@ -34,8 +34,8 @@ def recursive_copy_files(files, destination_dir, preprocess = false, variables =
       FileUtils.mkdir_p("#{destination_dir}/#{dir}")
     end
     if !File.directory?(filename)
-      if preprocess && filename =~ /\.template$/
-        real_filename = filename.sub(/\.template$/, '')
+      if preprocess && filename =~ /\.erb$/
+        real_filename = filename.sub(/\.erb$/, '')
         FileUtils.install(filename, "#{destination_dir}/#{real_filename}", :preserve => true)
         Preprocessor.new.start(filename, "#{destination_dir}/#{real_filename}",
           variables)

data/build/preprocessor.rb

@@ -22,43 +22,9 @@
 #  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 #  THE SOFTWARE.
 
-# Implements a simple preprocessor language which combines elements in the C
-# preprocessor with ERB:
-#
-#     Today
-#     #if @today == :fine
-#         is a fine day.
-#     #elif @today == :good
-#         is a good day.
-#     #else
-#         is a sad day.
-#     #endif
-#     Let's go walking.
-#     Today is <%= Time.now %>.
-#
-# When run with...
-#
-#     Preprocessor.new.start('input.txt', 'output.txt', :today => :fine)
-#
-# ...will produce:
-#
-#     Today
-#     is a fine day.
-#     Let's go walking.
-#     Today is 2013-08-11 22:37:06 +0200.
-#
-# Highlights:
-#
-#  * #if blocks can be nested.
-#  * Expressions are Ruby expressions, evaluated within the binding of a
-#    Preprocessor::Evaluator object.
-#  * Text inside #if/#elif/#else are automatically unindented.
-#  * ERB compatible.
 class Preprocessor
   def initialize
     require 'erb' if !defined?(ERB)
-    @indentation_size = 4
-    @debug = boolean_option('DEBUG')
   end
 
   def start(filename, output_filename, variables = {})
@@ -69,99 +35,10 @@ class Preprocessor
       output = STDOUT
     end
     the_binding  = create_binding(variables)
-    context      = []
-    @filename    = filename
-    @lineno      = 1
-    @indentation = 0
-
-    each_line(filename, the_binding) do |line|
-      debug("context=#{context.inspect}, line=#{line.inspect}")
-
-      name, args_string, cmd_indentation = recognize_command(line)
-      case name
-      when "if"
-        case context.last
-        when nil, :if_true, :else_true
-          check_indentation(cmd_indentation)
-          result = the_binding.eval(args_string, filename, @lineno)
-          context.push(result ? :if_true : :if_false)
-          inc_indentation
-        when :if_false, :else_false, :if_ignore
-          check_indentation(cmd_indentation)
-          inc_indentation
-          context.push(:if_ignore)
-        else
-          terminate "#if is not allowed in this context"
-        end
-      when "elif"
-        case context.last
-        when :if_true
-          dec_indentation
-          check_indentation(cmd_indentation)
-          inc_indentation
-          context[-1] = :if_false
-        when :if_false
-          dec_indentation
-          check_indentation(cmd_indentation)
-          inc_indentation
-          result = the_binding.eval(args_string, filename, @lineno)
-          context[-1] = result ? :if_true : :if_false
-        when :else_true, :else_false
-          terminate "#elif is not allowed after #else"
-        when :if_ignore
-          dec_indentation
-          check_indentation(cmd_indentation)
-          inc_indentation
-        else
-          terminate "#elif is not allowed outside #if block"
-        end
-      when "else"
-        case context.last
-        when :if_true
-          dec_indentation
-          check_indentation(cmd_indentation)
-          inc_indentation
-          context[-1] = :else_false
-        when :if_false
-          dec_indentation
-          check_indentation(cmd_indentation)
-          inc_indentation
-          context[-1] = :else_true
-        when :else_true, :else_false
-          terminate "it is not allowed to have multiple #else clauses in one #if block"
-        when :if_ignore
-          dec_indentation
-          check_indentation(cmd_indentation)
-          inc_indentation
-        else
-          terminate "#else is not allowed outside #if block"
-        end
-      when "endif"
-        case context.last
-        when :if_true, :if_false, :else_true, :else_false, :if_ignore
-          dec_indentation
-          check_indentation(cmd_indentation)
-          context.pop
-        else
-          terminate "#endif is not allowed outside #if block"
-        end
-      when "DEBHELPER"
-        output.puts(line)
-      when "", nil
-        # Either a comment or not a preprocessor command.
-        case context.last
-        when nil, :if_true, :else_true
-          output.puts(unindent(line))
-        else
-          # Check indentation but do not output.
-          unindent(line)
-        end
-      else
-        terminate "Unrecognized preprocessor command ##{name.inspect}"
-      end
 
-      @lineno += 1
-    end
+    erb = ERB.new(File.read(filename), nil, "-")
+    erb.filename = filename
+    output.write(erb.result(the_binding))
   ensure
     if output_filename && output
       output.close
@@ -251,37 +128,6 @@ private
     end
   end
 
-  def each_line(filename, the_binding)
-    data = File.open(filename, 'r') do |f|
-      erb = ERB.new(f.read, nil, "-")
-      erb.filename = filename
-      erb.result(the_binding)
-    end
-    data.each_line do |line|
-      yield line.chomp
-    end
-  end
-
-  def recognize_command(line)
-    if line =~ /^([\s\t]*)#(.+)/
-      indentation_str = $1
-      command = $2
-
-      # Declare tabs as equivalent to 4 spaces. This is necessary for
-      # Makefiles in which the use of tabs is required.
-      indentation_str.gsub!("\t", "    ")
-
-      name = command.scan(/^\w+/).first
-      # Ignore shebangs and comments.
-      return if name.nil?
-
-      args_string = command.sub(/^#{Regexp.escape(name)}[\s\t]*/, '')
-      return [name, args_string, indentation_str.to_s.size]
-    else
-      return nil
-    end
-  end
-
   def create_binding(variables)
     object = Evaluator.new
     variables.each_pair do |key, val|
@@ -291,51 +137,4 @@ private
       binding
     end
   end
-
-  def inc_indentation
-    @indentation += @indentation_size
-  end
-
-  def dec_indentation
-    @indentation -= @indentation_size
-  end
-
-  def check_indentation(expected)
-    if expected != @indentation
-      terminate "wrong indentation: found #{expected} characters, should be #{@indentation}"
-    end
-  end
-
-  def unindent(line)
-    line =~ /^([\s\t]*)/
-    # Declare tabs as equivalent to 4 spaces. This is necessary for
-    # Makefiles in which the use of tabs is required.
-    found = $1.to_s.gsub("\t", "    ").size
-
-    if found >= @indentation
-      # Tab-friendly way to remove indentation.
-      remaining = @indentation
-      line = line.dup
-      while remaining > 0
-        if line[0..0] == " "
-          remaining -= 1
-        else
-          # This is a tab.
-          remaining -= 4
-        end
-        line.slice!(0, 1)
-      end
-      return line
-    else
-      terminate "wrong indentation: found #{found} characters, should be at least #{@indentation}"
-    end
-  end
-
-  def debug(message)
-    puts "DEBUG:#{@lineno}: #{message}" if @debug
-  end
-
-  def terminate(message)
-    abort "*** ERROR: #{@filename} line #{@lineno}: #{message}"
-  end
 end