Skip to content

Commit

Permalink
Require no-pool-nginx to be explicitly required instead of implicit v…
Browse files Browse the repository at this point in the history
…ia --without
  • Loading branch information
marcqualie committed Mar 27, 2014
1 parent 3f90627 commit 14ab265
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions nginx-full.rb
Expand Up @@ -72,7 +72,7 @@ def self.third_party_modules
depends_on 'libxml2' if build.with? 'xslt'
depends_on 'libxslt' if build.with? 'xslt'
depends_on 'gd' if build.with? 'image-filter'
depends_on "valgrind" if build.without? 'pool-nginx'
depends_on "valgrind" if build.with? 'no-pool-nginx'

# register third party flags
self.third_party_modules.each { | name, desc |
Expand All @@ -87,7 +87,7 @@ def options_array
["with-#{name}-module", nil, desc]
} + [
['with-passenger', nil, 'Compile with support for Phusion Passenger module'],
['without-pool-nginx', nil, 'Disable nginx-pool, valgrind detect memory issues'],
['with-no-pool-nginx', nil, 'Disable nginx-pool, valgrind detect memory issues'],
# Internal modules
['with-webdav', 'with-http_dav_module', 'Compile with support for WebDAV module'],
['with-debug', 'with-debug', 'Compile with support for debug log'],
Expand Down Expand Up @@ -132,7 +132,7 @@ def patches
# replaces nginx's pool machanism
# with plain malloc & free to help tools like valgrind's memcheck to detect
# memory issues more reliably.
if build.without? 'pool-nginx'
if build.with? 'no-pool-nginx'
patches[:p1] = 'https://raw.github.com/shrimp/no-pool-nginx/master/nginx-1.4.3-no_pool.patch' if build.stable?
patches[:p1] = 'https://raw.github.com/shrimp/no-pool-nginx/master/nginx-1.5.8-no_pool.patch' if build.devel?
end
Expand Down

0 comments on commit 14ab265

Please sign in to comment.