godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #88285 from Chubercik/miniupnpc-2.2.6 

miniupnpc: Update to version 2.2.6
This commit is contained in:
Rémi Verschelde 2024-02-13 17:24:38 +01:00
parent e0c24eb554 72b80b3cdf
commit e92d55bbf4
No known key found for this signature in database
GPG Key ID: C3336907360768E1
8 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYRIGHT.txt
View File

@ -350,7 +350,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/

4
thirdparty/README.md vendored
View File

@ -584,14 +584,14 @@ to solve some MSVC warnings. See the patches in the `patches` directory.
## 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

2
thirdparty/miniupnpc/LICENSE vendored
View File

@ -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

4
thirdparty/miniupnpc/include/miniupnpc.h vendored
View File

@ -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:

10
thirdparty/miniupnpc/src/minisoap.c vendored
View File

@ -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" /* ??? */

2
thirdparty/miniupnpc/src/minissdpc.c vendored
View File

@ -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;

2
thirdparty/miniupnpc/src/miniupnpcstrings.h vendored
View File

@ -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" */

6
thirdparty/miniupnpc/src/miniwget.c vendored
View File

@ -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);