Return-Path: X-Original-To: apmail-httpd-dev-archive@www.apache.org Delivered-To: apmail-httpd-dev-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0BD6911594 for ; Fri, 25 Apr 2014 11:22:58 +0000 (UTC) Received: (qmail 64079 invoked by uid 500); 25 Apr 2014 11:22:54 -0000 Delivered-To: apmail-httpd-dev-archive@httpd.apache.org Received: (qmail 63728 invoked by uid 500); 25 Apr 2014 11:22:54 -0000 Mailing-List: contact dev-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list dev@httpd.apache.org Received: (qmail 63717 invoked by uid 99); 25 Apr 2014 11:22:53 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2014 11:22:53 +0000 X-ASF-Spam-Status: No, hits=2.2 required=5.0 tests=HTML_MESSAGE,SPF_HELO_PASS,SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (nike.apache.org: domain of minfrin@sharp.fm designates 174.143.229.200 as permitted sender) Received: from [174.143.229.200] (HELO chandler.sharp.fm) (174.143.229.200) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 25 Apr 2014 11:22:47 +0000 Received: from chandler.sharp.fm (localhost [127.0.0.1]) by chandler.sharp.fm (Postfix) with ESMTP id 8A0CEF808E; Fri, 25 Apr 2014 06:22:23 -0500 (CDT) Received: from [192.168.88.249] (pepperpotdsl.claranet.co.uk [217.158.253.219]) (using TLSv1 with cipher AES128-SHA (128/128 bits)) (Client did not present a certificate) (Authenticated sender: minfrin@sharp.fm) by chandler.sharp.fm (Postfix) with ESMTP id B6F46C8312; Fri, 25 Apr 2014 06:22:22 -0500 (CDT) Content-Type: multipart/alternative; boundary="Apple-Mail=_BA1E9BCD-FD23-409F-9CC8-96E258E84F50" Mime-Version: 1.0 (Mac OS X Mail 6.6 \(1510\)) 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 From: Graham Leggett In-Reply-To: Date: Fri, 25 Apr 2014 13:22:20 +0200 Cc: cvs@httpd.apache.org Message-Id: <8B96E02A-5083-46A5-987E-6D1384708AF1@sharp.fm> References: <20140425105505.72B912388860@eris.apache.org> To: dev@httpd.apache.org X-Mailer: Apple Mail (2.1510) X-Virus-Scanned: ClamAV using ClamSMTP X-Virus-Checked: Checked by ClamAV on apache.org --Apple-Mail=_BA1E9BCD-FD23-409F-9CC8-96E258E84F50 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=us-ascii On 25 Apr 2014, at 1:04 PM, Jeff Trawick wrote: > Unless httpd trunk as a whole already prereqs 1.5.x, please ifdef this = based on version of apr: > =20 > +#include "apr_escape.h" >=20 > #include /* for INT_MAX */ >=20 > @@ -1061,6 +1062,12 @@ static const char *md5_func(ap_expr_eval > return ap_md5(ctx->p, (const unsigned char *)arg); > } >=20 > Please ifdef this based on version of apr: > =20 > +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); > +} > + >=20 > #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 }, >=20 > Same: > =20 > + { ldap_func, "ldap", NULL, 0 }, > { NULL, NULL, NULL} > }; >=20 >=20 >=20 Done in r1589995. Regards, Graham -- --Apple-Mail=_BA1E9BCD-FD23-409F-9CC8-96E258E84F50 Content-Transfer-Encoding: 7bit Content-Type: text/html; charset=us-ascii
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
--

--Apple-Mail=_BA1E9BCD-FD23-409F-9CC8-96E258E84F50--