head	1.2;
access;
symbols
	pkgsrc-2026Q1:1.2.0.66
	pkgsrc-2026Q1-base:1.2
	pkgsrc-2025Q4:1.2.0.64
	pkgsrc-2025Q4-base:1.2
	pkgsrc-2025Q3:1.2.0.62
	pkgsrc-2025Q3-base:1.2
	pkgsrc-2025Q2:1.2.0.60
	pkgsrc-2025Q2-base:1.2
	pkgsrc-2025Q1:1.2.0.58
	pkgsrc-2025Q1-base:1.2
	pkgsrc-2024Q4:1.2.0.56
	pkgsrc-2024Q4-base:1.2
	pkgsrc-2024Q3:1.2.0.54
	pkgsrc-2024Q3-base:1.2
	pkgsrc-2024Q2:1.2.0.52
	pkgsrc-2024Q2-base:1.2
	pkgsrc-2024Q1:1.2.0.50
	pkgsrc-2024Q1-base:1.2
	pkgsrc-2023Q4:1.2.0.48
	pkgsrc-2023Q4-base:1.2
	pkgsrc-2023Q3:1.2.0.46
	pkgsrc-2023Q3-base:1.2
	pkgsrc-2023Q2:1.2.0.44
	pkgsrc-2023Q2-base:1.2
	pkgsrc-2023Q1:1.2.0.42
	pkgsrc-2023Q1-base:1.2
	pkgsrc-2022Q4:1.2.0.40
	pkgsrc-2022Q4-base:1.2
	pkgsrc-2022Q3:1.2.0.38
	pkgsrc-2022Q3-base:1.2
	pkgsrc-2022Q2:1.2.0.36
	pkgsrc-2022Q2-base:1.2
	pkgsrc-2022Q1:1.2.0.34
	pkgsrc-2022Q1-base:1.2
	pkgsrc-2021Q4:1.2.0.32
	pkgsrc-2021Q4-base:1.2
	pkgsrc-2021Q3:1.2.0.30
	pkgsrc-2021Q3-base:1.2
	pkgsrc-2021Q2:1.2.0.28
	pkgsrc-2021Q2-base:1.2
	pkgsrc-2021Q1:1.2.0.26
	pkgsrc-2021Q1-base:1.2
	pkgsrc-2020Q4:1.2.0.24
	pkgsrc-2020Q4-base:1.2
	pkgsrc-2020Q3:1.2.0.22
	pkgsrc-2020Q3-base:1.2
	pkgsrc-2020Q2:1.2.0.20
	pkgsrc-2020Q2-base:1.2
	pkgsrc-2020Q1:1.2.0.16
	pkgsrc-2020Q1-base:1.2
	pkgsrc-2019Q4:1.2.0.18
	pkgsrc-2019Q4-base:1.2
	pkgsrc-2019Q3:1.2.0.14
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.12
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.10
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.8
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.6
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.4
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.2
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.1.0.18
	pkgsrc-2017Q4-base:1.1
	pkgsrc-2017Q3:1.1.0.16
	pkgsrc-2017Q3-base:1.1
	pkgsrc-2017Q2:1.1.0.12
	pkgsrc-2017Q2-base:1.1
	pkgsrc-2017Q1:1.1.0.10
	pkgsrc-2017Q1-base:1.1
	pkgsrc-2016Q4:1.1.0.8
	pkgsrc-2016Q4-base:1.1
	pkgsrc-2016Q3:1.1.0.6
	pkgsrc-2016Q3-base:1.1
	pkgsrc-2016Q2:1.1.0.4
	pkgsrc-2016Q2-base:1.1
	pkgsrc-2016Q1:1.1.0.2
	pkgsrc-2016Q1-base:1.1;
locks; strict;
comment	@# @;


1.2
date	2018.01.13.08.59.44;	author jperkin;	state Exp;
branches;
next	1.1;
commitid	xjWXdJdqkv4F3HmA;

1.1
date	2016.04.06.09.02.07;	author manu;	state Exp;
branches;
next	;
commitid	QXlPHnMVkJItRx1z;


desc
@@


1.2
log
@ap24-authnz-external: Fix RCSID.
@
text
@$NetBSD$

- Build fix for apache 2.4
- Add HTTP method in environement

Submitted upstream as https://github.com/phokz/mod-auth-external/issues/24

--- mod_authnz_external.c.orig	2011-10-12 16:55:14.000000000 +0200
+++ mod_authnz_external.c	2016-04-04 09:51:14.000000000 +0200
@@@@ -91,9 +91,12 @@@@
 #define ENV_USER	"USER"
 #define ENV_PASS	"PASS"
 #define ENV_GROUP	"GROUP"
 #define ENV_URI		"URI"
+#define ENV_METHOD	"METHOD"
 #define ENV_IP		"IP"
+#define ENV_CLIENT_IP	"CLIENT_IP"
+#define ENV_USERAGENT_IP "USERAGENT_IP"
 #define ENV_HOST	"HOST"		/* Remote Host */
 #define ENV_HTTP_HOST	"HTTP_HOST"	/* Local Host */
 #define ENV_CONTEXT	"CONTEXT"	/* Arbitrary Data from Config */
 /* Undefine this if you do not want cookies passed to the script */
@@@@ -442,14 +445,25 @@@@
 	remote_host= ap_get_remote_host(c, r->per_dir_config, REMOTE_HOST,NULL);
 	if (remote_host != NULL)
 	    child_env[i++]= apr_pstrcat(p, ENV_HOST"=", remote_host,NULL);
 
-	if (c->remote_ip)
-	    child_env[i++]= apr_pstrcat(p, ENV_IP"=", c->remote_ip, NULL);
+	if (c->client_ip) {
+	    child_env[i++]= apr_pstrcat(p, ENV_CLIENT_IP"=",
+	        c->client_ip, NULL);
+	    child_env[i++]= apr_pstrcat(p, ENV_IP"=", c->client_ip, NULL);
+	}
+
+	if (r->useragent_ip)
+	    child_env[i++]= apr_pstrcat(p, ENV_USERAGENT_IP"=",
+	        r->useragent_ip, NULL);
 
 	if (r->uri)
 	    child_env[i++]= apr_pstrcat(p, ENV_URI"=", r->uri, NULL);
 
+	if (r->method)
+	    child_env[i++]= apr_pstrcat(r->pool, ENV_METHOD"=",
+		r->method, NULL);
+
 	if ((host= apr_table_get(r->headers_in, "Host")) != NULL)
 	    child_env[i++]= apr_pstrcat(p, ENV_HTTP_HOST"=", host, NULL);
 
 	if (dir->context)
@


1.1
log
@Add ap24-authnz-external

This is a newer version of the ap22-authnz-external package that
adds support for apache 2.4 and drops support for apache 2.2

Approved by wiz@@
@
text
@d1 1
a1 1
$NetBSD
@