httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Rainer Jung <rainer.j...@kippdata.de>
Subject Re: svn commit: r1612653 - /httpd/httpd/trunk/server/util_pcre.c
Date Tue, 22 Jul 2014 21:01:27 GMT
On 22.07.2014 22:20, Christophe JAILLET wrote:
> Hi,
>
> shouldn't the #error just a few lines below be updated as well, to be
> more explicit than "too old" ?

You are right. But what about instead changing the configure pcre 
version test:

Index: configure.in
===================================================================
--- configure.in        (revision 1611600)
+++ configure.in        (working copy)
@@ -236,7 +236,9 @@
    fi
    case `$PCRE_CONFIG --version` in
    [[1-5].*])
-    AC_MSG_ERROR([Need at least pcre version 6.0])
+    AC_MSG_ERROR([Need at least pcre version 6.7])
+  [6.[0-6]*])
+    AC_MSG_ERROR([Need at least pcre version 6.7])
      ;;
    esac
    AC_MSG_NOTICE([Using external PCRE library from $PCRE_CONFIG])

documenting the requirement PCRE >= 6.7 and dropping the check (and 
error message) for PCRE_DUPNAMES from server/util_pcre.c.

I got the version number from looking and the old PCRE tags.

Regards,

Rainer

> Le 22/07/2014 21:29, rjung@apache.org a écrit :
>> Author: rjung
>> Date: Tue Jul 22 19:29:08 2014
>> New Revision: 1612653
>>
>> URL: http://svn.apache.org/r1612653
>> Log:
>> Clarify comment.
>>
>> Modified:
>>      httpd/httpd/trunk/server/util_pcre.c
>>
>> Modified: httpd/httpd/trunk/server/util_pcre.c
>> URL:
>> http://svn.apache.org/viewvc/httpd/httpd/trunk/server/util_pcre.c?rev=1612653&r1=1612652&r2=1612653&view=diff
>>
>> ==============================================================================
>>
>> --- httpd/httpd/trunk/server/util_pcre.c (original)
>> +++ httpd/httpd/trunk/server/util_pcre.c Tue Jul 22 19:29:08 2014
>> @@ -125,7 +125,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t *
>>       const char *errorptr;
>>       int erroffset;
>>       int errcode = 0;
>> -    /* PCRE_DUPNAMES is only present in more recent versions of PCRE */
>> +    /* PCRE_DUPNAMES is only present since version 6.7 of PCRE */
>>   #ifdef PCRE_DUPNAMES
>>       int options = PCRE_DUPNAMES;
>>   #else

Mime
View raw message