progs.patch

   1 --- passenger-release-3.0.19/lib/phusion_passenger/platform_info/apache.rb~     2012-12-20 14:23:00.000000000 +0200
   2 +++ passenger-release-3.0.19/lib/phusion_passenger/platform_info/apache.rb      2013-05-01 22:05:55.625131364 +0300
   3 @@ -58,6 +58,9 @@
   4         # The absolute path to the 'apachectl' or 'apache2ctl' binary, or nil if
   5         # not found.
   6         def self.apache2ctl
   7 +               if env_defined?("APACHECTL")
   8 +                       return ENV["APACHECTL"]
   9 +               end
  10                 return find_apache2_executable('apache2ctl', 'apachectl2', 'apachectl')
  11         end
  12         memoize :apache2ctl
  13 @@ -83,6 +86,9 @@
  14
  15         # The Apache version, or nil if Apache is not found.
  16         def self.httpd_version
  17 +               if env_defined?("HTTPD_VERSION")
  18 +                       return ENV["HTTPD_VERSION"]
  19 +               end
  20                 if httpd
  21                         `#{httpd} -v` =~ %r{Apache/([\d\.]+)}
  22                         return $1