httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ruediger Pluem <rpl...@apache.org>
Subject Re: svn commit: r1554300 - in /httpd/httpd/trunk: CHANGES include/ap_mmn.h include/ap_regex.h include/http_core.h modules/proxy/mod_proxy.c modules/proxy/mod_proxy.h server/core.c server/request.c server/util_pcre.c
Date Fri, 10 Jan 2014 08:17:21 GMT


minfrin@apache.org wrote:
> Author: minfrin
> Date: Mon Dec 30 19:50:52 2013
> New Revision: 1554300
> 
> URL: http://svn.apache.org/r1554300
> Log:
> core: Support named groups and backreferences within the LocationMatch,
> DirectoryMatch, FilesMatch and ProxyMatch directives.
> 
> Modified:
>     httpd/httpd/trunk/CHANGES
>     httpd/httpd/trunk/include/ap_mmn.h
>     httpd/httpd/trunk/include/ap_regex.h
>     httpd/httpd/trunk/include/http_core.h
>     httpd/httpd/trunk/modules/proxy/mod_proxy.c
>     httpd/httpd/trunk/modules/proxy/mod_proxy.h
>     httpd/httpd/trunk/server/core.c
>     httpd/httpd/trunk/server/request.c
>     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=1554300&r1=1554299&r2=1554300&view=diff
> ==============================================================================
> --- httpd/httpd/trunk/server/util_pcre.c (original)
> +++ httpd/httpd/trunk/server/util_pcre.c Mon Dec 30 19:50:52 2013
>  #define APR_WANT_STRFUNC
> @@ -124,7 +125,7 @@ AP_DECLARE(int) ap_regcomp(ap_regex_t * 
>      const char *errorptr;
>      int erroffset;
>      int errcode = 0;
> -    int options = 0;
> +    int options = PCRE_DUPNAMES;

This fails to compile on older PCRE versions that do not know PCRE_DUPNAMES, like 6.6
on RHEL 5.

How about

Index: util_pcre.c
===================================================================
--- util_pcre.c (revision 1556947)
+++ util_pcre.c (working copy)
@@ -125,7 +125,12 @@
     const char *errorptr;
     int erroffset;
     int errcode = 0;
+    /* PCRE_DUPNAMES is only present in more recent versions of PCRE */
+#ifdef PCRE_DUPNAMES
     int options = PCRE_DUPNAMES;
+#else
+    int options = 0;
+#endif

     if ((cflags & AP_REG_ICASE) != 0)
         options |= PCRE_CASELESS;


instead?

>  
>      if ((cflags & AP_REG_ICASE) != 0)
>          options |= PCRE_CASELESS;

Regards

RĂ¼diger

Mime
View raw message