httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Graham Leggett <minf...@sharp.fm>
Subject Re: svn commit: r1589986 - in /httpd/httpd/trunk: CHANGES docs/manual/expr.xml docs/manual/mod/mod_authnz_ldap.xml server/util_expr_eval.c
Date Fri, 25 Apr 2014 11:22:20 GMT
On 25 Apr 2014, at 1:04 PM, Jeff Trawick <trawick@gmail.com> wrote:

> Unless httpd trunk as a whole already prereqs 1.5.x, please ifdef this based on version
of apr:
>  
> +#include "apr_escape.h"
> 
>  #include <limits.h>     /* for INT_MAX */
> 
> @@ -1061,6 +1062,12 @@ static const char *md5_func(ap_expr_eval
>         return ap_md5(ctx->p, (const unsigned char *)arg);
>  }
> 
> Please ifdef this based on version of apr:
>  
> +static const char *ldap_func(ap_expr_eval_ctx_t *ctx, const void *data,
> +                               const char *arg)
> +{
> +        return apr_pescape_ldap(ctx->p, arg, APR_ESCAPE_STRING, APR_ESCAPE_LDAP_ALL);
> +}
> +
> 
>  #define MAX_FILE_SIZE 10*1024*1024
>  static const char *file_func(ap_expr_eval_ctx_t *ctx, const void *data,
> @@ -1645,6 +1652,7 @@ static const struct expr_provider_single
>      { unbase64_func,        "unbase64",       NULL, 0 },
>      { sha1_func,            "sha1",           NULL, 0 },
>      { md5_func,             "md5",            NULL, 0 },
> 
> Same:
>  
> +    { ldap_func,            "ldap",           NULL, 0 },
>      { NULL, NULL, NULL}
>  };
> 
> 
> 

Done in r1589995.

Regards,
Graham
--


Mime
View raw message