[PATCH] auto/lib/conf: fix PCRE condition WRT the http and http_rewrite options

Maxim Dounin mdounin at mdounin.ru
Fri Jul 14 10:25:13 UTC 2017


Hello!

On Fri, Jul 14, 2017 at 12:08:45PM +0200, Samuel Martin wrote:

> http_rewrite module cannot be selected when http server is disabled, so
> fix the PCRE check condition to avoid irrelevant check failure.
> 
> Fixes:
>   http://autobuild.buildroot.net/results/bc7/bc7458b97a88785653845afd30fe9d5f3a69905b/build-end.log
> 
> Signed-off-by: Samuel Martin <s.martin49 at gmail.com>
> ---
>  auto/lib/conf | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/auto/lib/conf b/auto/lib/conf
> index 0b8545a3..2c7af104 100644
> --- a/auto/lib/conf
> +++ b/auto/lib/conf
> @@ -7,7 +7,7 @@ if [ $USE_PCRE = YES -o $PCRE != NONE ]; then
>      . auto/lib/pcre/conf
>  
>  else
> -    if [ $USE_PCRE = DISABLED -a $HTTP_REWRITE = YES ]; then
> +    if [ $USE_PCRE = DISABLED -a $HTTP = YES -a $HTTP_REWRITE = YES ]; then
>  
>  cat << END
>  

Seems to be a regression from 4d874b4d82ed (1.11.11), 
http://hg.nginx.org/nginx/rev/4d874b4d82ed.

Ruslan, please take a look.

-- 
Maxim Dounin
http://nginx.org/


More information about the nginx-devel mailing list