refactor NGINX port extraction; closes #49; thanks @anpin

and make it compatible with NGINX >= 1.27.0 Signed-off-by: Hans Zandbelt <[email protected]>
OpenIDC · May 31, 2024 · 851aa6a · 851aa6a
1 parent 4f458d7
commit 851aa6a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 12 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -12,3 +12,4 @@ reporting bugs, providing fixes, suggesting useful features or other:
 	Mikael Broadfoot <https://github.com/broadfootmi>
 	Robert Title <https://github.com/rtitle>
 	may-day <https://github.com/may-day>
+    Pavel Anpin <https://github.com/anpin>
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,6 @@
+05/31/2024
+- refactor NGINX port extraction so it works with NGINX >= 1.27.0; closes #49; thanks @anpin
+
 03/11/2024
 - release 1.6.1
 

diff --git a/Makefile.am b/Makefile.am
@@ -89,7 +89,7 @@ noinst_LTLIBRARIES = liboauth2_cache.la
 liboauth2_la_LIBADD += liboauth2_cache.la
 liboauth2_cache_la_SOURCES = src/cache.c
 liboauth2_cache_la_CPPFLAGS = $(AM_CPPFLAGS)
-liboauth2_cache_la_CFLAGS = @CURL_CFLAGS@ @CJOSE_CFLAGS@
+liboauth2_cache_la_CFLAGS = @CURL_CFLAGS@ @CJOSE_CFLAGS@ @PCRE2_CFLAGS@
 
 if HAVE_LIBMEMCACHE
 liboauth2_cache_la_CPPFLAGS += -DHAVE_LIBMEMCACHE
@@ -120,7 +120,7 @@ liboauth2_apache_la_pkgconfigdir = $(libdir)/pkgconfig
 liboauth2_apache_la_pkgconfig_DATA = liboauth2_apache.pc
 
 liboauth2_apache_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_APACHE
-liboauth2_apache_la_CFLAGS = @APACHE_CFLAGS@
+liboauth2_apache_la_CFLAGS = @APACHE_CFLAGS@ @PCRE2_CFLAGS@
 liboauth2_apache_la_LIBADD = liboauth2.la @APR_LIBS@ @JANSSON_LIBS@
 
 includesub_HEADERS += \
@@ -141,7 +141,7 @@ liboauth2_nginx_la_pkgconfigdir = $(libdir)/pkgconfig
 liboauth2_nginx_la_pkgconfig_DATA = liboauth2_nginx.pc
 
 liboauth2_nginx_la_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_NGINX
-liboauth2_nginx_la_CFLAGS = @NGINX_CFLAGS@
+liboauth2_nginx_la_CFLAGS = @NGINX_CFLAGS@ @PCRE2_CFLAGS@
 liboauth2_nginx_la_LIBADD = liboauth2.la @NGINX_LIBS@ @JANSSON_LIBS@
 
 includesub_HEADERS += \

diff --git a/configure.ac b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([liboauth2],[1.6.1],[[email protected]])
+AC_INIT([liboauth2],[1.6.2dev],[[email protected]])
 
 AM_INIT_AUTOMAKE([foreign no-define subdir-objects])
 AC_CONFIG_MACRO_DIR([m4])

diff --git a/src/server/nginx.c b/src/server/nginx.c
@@ -99,14 +99,8 @@ static void _oauth2_nginx_host_copy(oauth2_nginx_request_context_t *ctx)
 
 static void _oauth2_nginx_port_copy(oauth2_nginx_request_context_t *ctx)
 {
-	char *v = NULL;
-	int len = ctx->r->port_end - ctx->r->port_start;
-	if (len > 0) {
-		v = oauth2_strndup((const char *)ctx->r->port_start, len);
-		oauth2_http_request_port_set(ctx->log, ctx->request,
-					     oauth2_parse_uint(NULL, v, 0));
-		oauth2_mem_free(v);
-	}
+	in_port_t port = ngx_inet_get_port(ctx->r->connection->sockaddr);
+	oauth2_http_request_port_set(ctx->log, ctx->request, (unsigned long)port);
 }
 
 static void _oauth2_nginx_path_copy(oauth2_nginx_request_context_t *ctx)