From 873d7ab52f571c2ffe0691732cee968e2f94908f Mon Sep 17 00:00:00 2001 From: Jakub Marcowski <01158831@pw.edu.pl> Date: Tue, 13 Feb 2024 15:38:30 +0100 Subject: [PATCH] miniupnpc: Update to version 2.2.6 (cherry picked from commit 72b80b3cdfb90dbaad3ebe445eb7a3002f97471a) --- COPYRIGHT.txt | 2 +- thirdparty/README.md | 4 ++-- thirdparty/miniupnpc/LICENSE | 2 +- thirdparty/miniupnpc/include/miniupnpc.h | 4 ++-- thirdparty/miniupnpc/src/minisoap.c | 10 +++++++--- thirdparty/miniupnpc/src/minissdpc.c | 2 +- thirdparty/miniupnpc/src/miniupnpcstrings.h | 2 +- thirdparty/miniupnpc/src/miniwget.c | 6 +++--- 8 files changed, 18 insertions(+), 14 deletions(-) diff --git a/COPYRIGHT.txt b/COPYRIGHT.txt index 15b0d5be88a..4794ca61f2b 100644 --- a/COPYRIGHT.txt +++ b/COPYRIGHT.txt @@ -269,7 +269,7 @@ License: CC0-1.0 Files: ./thirdparty/miniupnpc/ Comment: MiniUPnP Project -Copyright: 2005-2023, Thomas Bernard +Copyright: 2005-2024, Thomas Bernard License: BSD-3-clause Files: ./thirdparty/minizip/ diff --git a/thirdparty/README.md b/thirdparty/README.md index 35357596f51..5b7666794fe 100644 --- a/thirdparty/README.md +++ b/thirdparty/README.md @@ -310,14 +310,14 @@ Files extracted from upstream repository: ## miniupnpc - Upstream: https://github.com/miniupnp/miniupnp -- Version: 2.2.5 (58837ef586278d18cbebee50be758835ed4be79a, 2023) +- Version: 2.2.6 (faad29d7300f1bfa9dc7795031993c04c5191f59, 2024) - License: BSD-3-Clause Files extracted from upstream source: - Copy `miniupnpc/src` and `miniupnpc/include` to `thirdparty/miniupnpc` - Remove the following test or sample files: - `listdevices.c minihttptestserver.c miniupnpcmodule.c upnpc.c upnperrors.* test*` + `listdevices.c,minihttptestserver.c,miniupnpcmodule.c,upnpc.c,upnperrors.*,test*` - `LICENSE` The only modified file is `src/miniupnpcstrings.h`, which was created for Godot diff --git a/thirdparty/miniupnpc/LICENSE b/thirdparty/miniupnpc/LICENSE index 6eff8d2683e..2755844d49c 100644 --- a/thirdparty/miniupnpc/LICENSE +++ b/thirdparty/miniupnpc/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2005-2023, Thomas BERNARD +Copyright (c) 2005-2024, Thomas BERNARD All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/thirdparty/miniupnpc/include/miniupnpc.h b/thirdparty/miniupnpc/include/miniupnpc.h index 721819583fc..808c6ad975f 100644 --- a/thirdparty/miniupnpc/include/miniupnpc.h +++ b/thirdparty/miniupnpc/include/miniupnpc.h @@ -1,4 +1,4 @@ -/* $Id: miniupnpc.h,v 1.62 2023/06/11 23:25:46 nanard Exp $ */ +/* $Id: miniupnpc.h,v 1.63 2024/01/04 00:45:17 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project: miniupnp * http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ @@ -20,7 +20,7 @@ #define UPNPDISCOVER_MEMORY_ERROR (-102) /* versions : */ -#define MINIUPNPC_VERSION "2.2.5" +#define MINIUPNPC_VERSION "2.2.6" #define MINIUPNPC_API_VERSION 17 /* Source port: diff --git a/thirdparty/miniupnpc/src/minisoap.c b/thirdparty/miniupnpc/src/minisoap.c index 78606672d54..903ac5ffc61 100644 --- a/thirdparty/miniupnpc/src/minisoap.c +++ b/thirdparty/miniupnpc/src/minisoap.c @@ -1,8 +1,8 @@ -/* $Id: minisoap.c,v 1.30 2020/11/09 19:27:42 nanard Exp $ */ +/* $Id: minisoap.c,v 1.32 2023/07/05 22:43:50 nanard Exp $ */ /* vim: tabstop=4 shiftwidth=4 noexpandtab * Project : miniupnp * Author : Thomas Bernard - * Copyright (c) 2005-2020 Thomas Bernard + * Copyright (c) 2005-2023 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. * @@ -90,9 +90,13 @@ int soapPostSubmit(SOCKET fd, headerssize = snprintf(headerbuf, sizeof(headerbuf), "POST %s HTTP/%s\r\n" "Host: %s%s\r\n" - "User-Agent: " OS_STRING ", " UPNP_VERSION_STRING ", MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n" + "User-Agent: " OS_STRING " " UPNP_VERSION_STRING " MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n" "Content-Length: %d\r\n" +#if (UPNP_VERSION_MAJOR == 1) && (UPNP_VERSION_MINOR == 0) "Content-Type: text/xml\r\n" +#else + "Content-Type: text/xml; charset=\"utf-8\"\r\n" +#endif "SOAPAction: \"%s\"\r\n" "Connection: Close\r\n" "Cache-Control: no-cache\r\n" /* ??? */ diff --git a/thirdparty/miniupnpc/src/minissdpc.c b/thirdparty/miniupnpc/src/minissdpc.c index edebb1600a0..98c5b37463f 100644 --- a/thirdparty/miniupnpc/src/minissdpc.c +++ b/thirdparty/miniupnpc/src/minissdpc.c @@ -338,7 +338,7 @@ receiveDevicesFromMiniSSDPD(int s, int * error) #ifdef DEBUG printf(" usnsize=%u\n", usnsize); #endif /* DEBUG */ - tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize+usnsize); + tmp = (struct UPNPDev *)malloc(sizeof(struct UPNPDev)+urlsize+stsize+usnsize+3); if(tmp == NULL) { if (error) *error = MINISSDPC_MEMORY_ERROR; diff --git a/thirdparty/miniupnpc/src/miniupnpcstrings.h b/thirdparty/miniupnpc/src/miniupnpcstrings.h index 5ad694754fd..bd4dd317c1e 100644 --- a/thirdparty/miniupnpc/src/miniupnpcstrings.h +++ b/thirdparty/miniupnpc/src/miniupnpcstrings.h @@ -2,7 +2,7 @@ #define MINIUPNPCSTRINGS_H_INCLUDED #define OS_STRING "Godot Engine/1.0" -#define MINIUPNPC_VERSION_STRING "2.2.5" +#define MINIUPNPC_VERSION_STRING "2.2.6" #if 0 /* according to "UPnP Device Architecture 1.0" */ diff --git a/thirdparty/miniupnpc/src/miniwget.c b/thirdparty/miniupnpc/src/miniwget.c index d5b79706320..e76a5e516b4 100644 --- a/thirdparty/miniupnpc/src/miniwget.c +++ b/thirdparty/miniupnpc/src/miniwget.c @@ -1,8 +1,8 @@ -/* $Id: miniwget.c,v 1.82 2020/05/29 21:14:22 nanard Exp $ */ +/* $Id: miniwget.c,v 1.85 2023/06/15 21:47:50 nanard Exp $ */ /* Project : miniupnp * Website : http://miniupnp.free.fr/ or https://miniupnp.tuxfamily.org/ * Author : Thomas Bernard - * Copyright (c) 2005-2020 Thomas Bernard + * Copyright (c) 2005-2023 Thomas Bernard * This software is subject to the conditions detailed in the * LICENCE file provided in this distribution. */ @@ -444,7 +444,7 @@ miniwget3(const char * host, "GET %s HTTP/%s\r\n" "Host: %s:%d\r\n" "Connection: Close\r\n" - "User-Agent: " OS_STRING ", " UPNP_VERSION_STRING ", MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n" + "User-Agent: " OS_STRING " " UPNP_VERSION_STRING " MiniUPnPc/" MINIUPNPC_VERSION_STRING "\r\n" "\r\n", path, httpversion, host, port);